mailgun-ruby 1.3.10 → 1.4.1

data/lib/mailgun/domains/domains.rb

@@ -1,10 +1,9 @@
-require 'mailgun/exceptions/exceptions'
-
 module Mailgun
 
   # A Mailgun::Domains object is a simple CRUD interface to Mailgun Domains.
   # Uses Mailgun
   class Domains
+    include ApiVersionChecker
 
     # Public: creates a new Mailgun::Domains instance.
     #   Defaults to Mailgun::Client
@@ -12,6 +11,8 @@ module Mailgun
       @client = client
     end
 
+    # ==== Core Domains methods ====
+
     # Public: Get Domains
     #
     # limit - [Integer] Maximum number of records to return. (100 by default)
@@ -19,37 +20,8 @@ module Mailgun
     #
     # Returns [Array] A list of domains (hash)
     def list(options = {})
-      warn('WARN: Client api version must be v4') unless @client.api_version == 'v4'
       @client.get('domains', options).to_h['items']
     end
-    alias_method :get_domains, :list
-
-    # Public: Get domain information
-    #
-    # domain - [String] Domain name to lookup
-    #
-    # Returns [Hash] Information on the requested domains.
-    def info(domain)
-      warn('WARN: Client api version must be v4') unless @client.api_version == 'v4'
-      fail(ParameterError, 'No domain given to find on Mailgun', caller) unless domain
-      @client.get("domains/#{domain}").to_h!
-    end
-    alias_method :get, :info
-    alias_method :get_domain, :info
-
-    # Public: Verify domain, update domain records
-    #   Unknown status - this is not in the current Mailgun API
-    #   Do no rely on this being available in future releases.
-    #
-    # domain - [String] Domain name
-    #
-    # Returns [Hash] Information on the updated/verified domains
-    def verify(domain)
-      warn('WARN: Client api version must be v4') unless @client.api_version == 'v4'
-      fail(ParameterError, 'No domain given to verify on Mailgun', caller) unless domain
-      @client.put("domains/#{domain}/verify", nil).to_h!
-    end
-    alias_method :verify_domain, :verify
 
     # Public: Add domain
     #
@@ -64,27 +36,19 @@ module Mailgun
     #
     # Returns [Hash] of created domain
     def create(domain, options = {})
-      warn('WARN: Client api version must be v4') unless @client.api_version == 'v4'
-      fail(ParameterError, 'No domain given to add on Mailgun', caller) unless domain
       options = { smtp_password: nil, spam_action: 'disabled', wildcard: false }.merge(options)
       options[:name] = domain
       @client.post('domains', options).to_h
     end
-    alias_method :add, :create
-    alias_method :add_domain, :create
 
-    # Public: Delete Domain
+    # Public: Get domain information
     #
-    # domain - [String] domain name to delete (ex. domain.com)
+    # domain - [String] Domain name to lookup
     #
-    # Returns [Boolean] if successful or not
-    def remove(domain)
-      warn('WARN: Client api version must be v3') unless @client.api_version == 'v3'
-      fail(ParameterError, 'No domain given to remove on Mailgun', caller) unless domain
-      @client.delete("domains/#{domain}").to_h['message'] == 'Domain has been deleted'
+    # Returns [Hash] Information on the requested domains.
+    def get(domain)
+      @client.get("domains/#{domain}").to_h!
     end
-    alias_method :delete, :remove
-    alias_method :delete_domain, :remove
 
     # Public: Update domain
     #
@@ -100,115 +64,156 @@ module Mailgun
     #
     # Returns [Hash] of updated domain
     def update(domain, options = {})
-      warn('WARN: Client api version must be v4') unless @client.api_version == 'v4'
-      fail(ParameterError, 'No domain given to update on Mailgun', caller) unless domain
       @client.put("domains/#{domain}", options).to_h
     end
 
-    # Public: Creates a new set of SMTP credentials for the defined domain.
+
+    # Public: Verify domain
     #
-    # domain  - [String] Name of the domain (ex. domain.com)
+    # domain - [String] Domain name
+    #
+    # Returns [Hash] Information on the updated/verified domains
+    def verify(domain)
+      @client.put("domains/#{domain}/verify", nil).to_h!
+    end
+
+    # Public: Delete Domain
+    #
+    # domain - [String] domain name to delete (ex. domain.com)
+    #
+    # Returns [Boolean] if successful or not
+    def remove(domain)
+      @client.delete("domains/#{domain}").to_h['message'] == 'Domain has been deleted'
+    end
+
+    # ==== End of Core Domains methods ====
+
+    # ==== Domain::Keys methods ====
+
+    # Public: List keys for all domains
+    #
+
     # options - [Hash] of
-    #   login  - [String] The user name (ex. bob.bar)
-    #   password  - [String] A password for the SMTP credentials. (Length Min 5, Max 32)
+    #   page - [String] Encoded paging information, provided via 'next', 'previous' links
+    #   limit - [Integer] Limits the number of items returned in a request
+    #   signing_domain  - [String] Filter by signing domain
+    #   selector - [String] Filter by selector
     #
     # Returns [Hash] with message key
-    def create_smtp_credentials(domain, options = {})
-      warn('WARN: Client api version must be v3') unless @client.api_version == 'v3'
-      fail(ParameterError, 'No domain given to create credentials on Mailgun', caller) unless domain
-      @client.post("domains/#{domain}/credentials", options).to_h
+    def list_domain_keys(options = {})
+      @client.get("dkim/keys", options).to_h
     end
 
-    # Public: Updates the specified SMTP credentials.
+    # Public: Create a domain key
     #
-    # domain  - [String] Name of the domain (ex. domain.com)
-    # login  - [String] The user name (ex. bob.bar)
     # options - [Hash] of
-    #   password  - [String] A password for the SMTP credentials. (Length Min 5, Max 32)
+    #   signing_domain  - [String] Name of the domain (ex. domain.com)
+    #   selector - [String] Selector to be used for the new domain key
+    #   bits - [Integer] Key size, can be 1024 or 2048
+    #   pem - [String] Private key PEM
     #
     # Returns [Hash] with message key
-    def update_smtp_credentials(domain, login, options = {})
-      warn('WARN: Client api version must be v3') unless @client.api_version == 'v3'
-      fail(ParameterError, 'No domain given to update credentials on Mailgun', caller) unless domain
-      fail(ParameterError, 'No login given to update credentials on Mailgun', caller) unless login
-      @client.put("domains/#{domain}/credentials/#{login}", options).to_h
+    def create_domain_key(options = {})
+      @client.post("dkim/keys", options).to_h
     end
 
-    # Public: Deletes the defined SMTP credentials.
+    # Public: Delete a domain key.
+    #
+    # options - [Hash] of
+    #   signing_domain - [Integer] Name of the domain (ex. domain.com)
+    #   selector - [String] Name of the selector
+    #
+    # Returns [Hash] with message key
+    def delete_domain_key(options = {})
+      @client.delete("dkim/keys", options).to_h
+    end
+
+    # Public: Activate a domain key for a specified authority and selector.
+    #
+    # domain    - [String] Name of the domain (ex. domain.com)
+    # selector  - [String] The selector you want to activate for the domain key
+    #
+    # Returns [Hash] with message key and autority + selector data
+    def activate_domain_key(domain, selector)
+      @client.put("domains/#{domain}/keys/#{selector}/activate", {}).to_h
+    end
+
+    # Public: Lists the domain keys for a specified signing domain / authority
     #
     # domain  - [String] Name of the domain (ex. domain.com)
-    # login  - [String] The user name (ex. bob.bar)
     #
-    # Returns [Hash] with message and spec keys
-    def delete_smtp_credentials(domain, login)
-      warn('WARN: Client api version must be v3') unless @client.api_version == 'v3'
-      fail(ParameterError, 'No domain given to delete credentials on Mailgun', caller) unless domain
-      fail(ParameterError, 'No login given to delete credentials on Mailgun', caller) unless login
-      @client.delete("domains/#{domain}/credentials/#{login}").to_h
+    # Returns [Hash] with domain keys data
+    def get_domain_keys(domain)
+      @client.get("domains/#{domain}/keys").to_h
+    end
+
+    # Public: Deactivate a domain key for a specified authority and selector
+    #
+    # domain    - [String] Name of the domain (ex. domain.com)
+    # selector  - [String] The selector you want to activate for the domain key
+    #
+    # Returns [Hash] with message key and autority + selector data
+    def deactivate_domain_key(domain, selector)
+      @client.put("domains/#{domain}/keys/#{selector}/deactivate", {}).to_h
     end
 
-    # Public: Returns delivery connection settings for the defined domain.
+    # Public: Change the DKIM authority for a domain.
     #
     # domain  - [String] Name of the domain (ex. domain.com)
+    # options - [Hash] of
+    #   self  - [Boolean] true - the domain will be the DKIM authority for itself even
+    #           if the root domain is registered on the same mailgun account
     #
-    # Returns [Hash] Information on the delivery connection settings
-    def get_domain_connection_settings(domain)
-      warn('WARN: Client api version must be v3') unless @client.api_version == 'v3'
-      fail(ParameterError, 'No domain given to retrieve connections on Mailgun', caller) unless domain
-      @client.get("domains/#{domain}/connection").to_h
+    # Returns [Hash] Information on the DKIM authority
+    def update_domain_dkim_authority(domain, options = {})
+      @client.put("domains/#{domain}/dkim_authority", options).to_h
     end
 
-    # Public: Updates the specified delivery connection settings for the defined domain.d
+    # Public: Update the DKIM selector for a domains
     #
     # domain  - [String] Name of the domain (ex. domain.com)
     # options - [Hash] of
-    #   require_tls  - [Boolean] true or false. If true - requires the message only be sent over a TLS connection
-    #   skip_verification  - [Boolean] true or false. If true - the certificate and hostname will not be verified
-    #     when trying to establish a TLS connection
-    #
-    # Returns [Hash] Information on the delivery connection settings
-    def update_domain_connection_settings(domain, options = {})
-      warn('WARN: Client api version must be v3') unless @client.api_version == 'v3'
-      fail(ParameterError, 'No domain given to update connections on Mailgun', caller) unless domain
-      @client.put("domains/#{domain}/connection", options).to_h
+    #   dkim_selector  - [String] change the DKIM selector for a domain.
+    #
+    # Returns [Hash] with message key
+    def update_domain_dkim_selector(domain, options = {})
+      @client.put("domains/#{domain}/dkim_selector", options).to_h
     end
 
+    # ==== End of Domain::Keys methods ====
+
+    # ==== Domain::Tracking methods ====
+
     # Public: Returns tracking settings for the defined domain.
     #
     # domain  - [String] Name of the domain (ex. domain.com)
     #
     # Returns [Hash] Information on the tracking settings
     def get_domain_tracking_settings(domain)
-      warn('WARN: Client api version must be v3') unless @client.api_version == 'v3'
-      fail(ParameterError, 'No domain given to retrieve tracking settings on Mailgun', caller) unless domain
       @client.get("domains/#{domain}/tracking").to_h
     end
 
-    # Public: Updates the open tracking settings for a domain.
+    # Public: Updates the click tracking settings for a domain.
     #
     # domain  - [String] Name of the domain (ex. domain.com)
     # options - [Hash] of
-    #   active  - [Boolean] yes or no. If set to yes, a tracking pixel will be inserted below your HTML content.
-    #   place_at_the_top  - [Boolean] yes or no. If set to yes, tracking pixel will be moved to top of your HTML content.
+    #   active  - [Boolean] yes or no. If set to yes, links will be overwritten and pointed to our servers so we can track clicks.
     #
-    # Returns [Hash] Information on the tracking open settings
-    def update_domain_tracking_open_settings(domain, options = {})
-      warn('WARN: Client api version must be v3') unless @client.api_version == 'v3'
-      fail(ParameterError, 'No domain given to update tracking settings on Mailgun', caller) unless domain
-      @client.put("domains/#{domain}/tracking/open", options).to_h
+    # Returns [Hash] Information on the tracking click settings
+    def update_domain_tracking_click_settings(domain, options = {})
+      @client.put("domains/#{domain}/tracking/click", options).to_h
     end
 
-    # Public: Updates the click tracking settings for a domain.
+    # Public: Updates the open tracking settings for a domain.
     #
     # domain  - [String] Name of the domain (ex. domain.com)
     # options - [Hash] of
-    #   active  - [Boolean] yes or no. If set to yes, links will be overwritten and pointed to our servers so we can track clicks.
+    #   active  - [Boolean] yes or no. If set to yes, a tracking pixel will be inserted below your HTML content.
+    #   place_at_the_top  - [Boolean] yes or no. If set to yes, tracking pixel will be moved to top of your HTML content.
     #
-    # Returns [Hash] Information on the tracking click settings
-    def update_domain_tracking_click_settings(domain, options = {})
-      warn('WARN: Client api version must be v3') unless @client.api_version == 'v3'
-      fail(ParameterError, 'No domain given to update tracking settings on Mailgun', caller) unless domain
-      @client.put("domains/#{domain}/tracking/click", options).to_h
+    # Returns [Hash] Information on the tracking open settings
+    def update_domain_tracking_open_settings(domain, options = {})
+      @client.put("domains/#{domain}/tracking/open", options).to_h
     end
 
     # Public: Updates unsubscribe tracking settings for a domain.
@@ -221,114 +226,106 @@ module Mailgun
     #
     # Returns [Hash] Information on the tracking unsubscribe settings
     def update_domain_tracking_unsubscribe_settings(domain, options = {})
-      warn('WARN: Client api version must be v3') unless @client.api_version == 'v3'
-      fail(ParameterError, 'No domain given to update tracking settings on Mailgun', caller) unless domain
       @client.put("domains/#{domain}/tracking/unsubscribe", options).to_h
     end
 
-    # Public: Change the DKIM authority for a domain.
+    # Public: Tracking Certificate: Get certificate and status
     #
-    # domain  - [String] Name of the domain (ex. domain.com)
-    # options - [Hash] of
-    #   self  - [Boolean] true - the domain will be the DKIM authority for itself even
-    #           if the root domain is registered on the same mailgun account
+    # domain - [String] The tracking domain of the TLS certificate, formatted as web_prefix.domain_name
     #
-    # Returns [Hash] Information on the DKIM authority
-    def update_domain_dkim_authority(domain, options = {})
-      warn('WARN: Client api version must be v3') unless @client.api_version == 'v3'
-      fail(ParameterError, 'No domain given to update tracking settings on Mailgun', caller) unless domain
-      @client.put("domains/#{domain}/dkim_authority", options).to_h
+    # Returns [Hash] Status of certificate. Either 'expired' 'processing' 'active' or 'error'
+    def get_domain_tracking_certificate(domain)
+      @client.get("x509/#{domain}/status").to_h
     end
 
-    # Public: Update the DKIM selector for a domains
+    # Tracking Certificate: Regenerate expired certificate
     #
-    # domain  - [String] Name of the domain (ex. domain.com)
-    # options - [Hash] of
-    #   dkim_selector  - [String] change the DKIM selector for a domain.
+    # domain - [String] The tracking domain of the TLS certificate, formatted as web_prefix.domain_name
     #
-    # Returns [Hash] with message key
-    def update_domain_dkim_selector(domain, options = {})
-      warn('WARN: Client api version must be v3') unless @client.api_version == 'v3'
-      fail(ParameterError, 'No domain given to update tracking settings on Mailgun', caller) unless domain
-      @client.put("domains/#{domain}/dkim_selector", options).to_h
+    # Returns [Hash] A message indicating the status of the request.
+    def regenerate_domain_tracking_certificate(domain, options = {})
+      @client.put("x509/#{domain}", options).to_h
     end
 
-    # Public: Update the CNAME used for tracking opens and clicks
+    # Public: Tracking Certificate: Generate
     #
-    # domain  - [String] Name of the domain (ex. domain.com)
-    # options - [Hash] of
-    #   web_prefix  - [String] change the tracking CNAME for a domain.
+    # domain - [String] The tracking domain of the TLS certificate, formatted as web_prefix.domain_name
     #
-    # Returns [Hash] with message key
-    def update_domain_web_prefix(domain, options = {})
-      warn('WARN: Client api version must be v3') unless @client.api_version == 'v3'
-      fail(ParameterError, 'No domain given to update tracking settings on Mailgun', caller) unless domain
-      @client.put("domains/#{domain}/web_prefix", options).to_h
+    # Returns [Hash] A message indicating the status of the request.
+    def generate_domain_tracking_certificate(domain, options = {})
+      @client.post("x509/#{domain}", options).to_h
     end
 
-    # Public: Lists the domain keys for a specified signing domain / authority
+    # ==== End of Domain::Tracking methods ====
+
+
+    # ==== Domain::DKIM_Security methods ====
+
+    # Public: Tracking Certificate: Generate
     #
-    # domain  - [String] Name of the domain (ex. domain.com)
+    # domain - [String] The Domain name
+    # rotation_enabled - [Boolean] If true, enables DKIM Auto-Rotation. If false, disables it
     #
-    # Returns [Hash] with domain keys data
-    def get_domain_keys(domain)
-      fail(ParameterError, 'Client api version must be v4', caller) unless @client.api_version == 'v4'
-      fail(ParameterError, 'No domain given to retrieve keys on Mailgun', caller) unless domain
-      @client.get("domains/#{domain}/keys").to_h
+    # options - [Hash] of
+    #   rotation_interval - [String] The interval at which to rotate keys. Example, '5d' for five days
+    #
+    # Returns [Hash] domain object
+    def dkim_rotation(domain, rotation_enabled, options = {})
+      options = { rotation_enabled: rotation_enabled }.merge(options)
+      @client.put("dkim_management/domains/#{domain}/rotation", options)
     end
 
-    # Public: Activate a domain key for a specified authority and selector.
+    # Public: Rotate Automatic Sender Security DKIM key for a domain
     #
-    # domain    - [String] Name of the domain (ex. domain.com)
-    # selector  - [String] The selector you want to activate for the domain key
+    # domain - [String] The Domain name
     #
-    # Returns [Hash] with message key and autority + selector data
-    def activate_domain_key(domain, selector)
-      fail(ParameterError, 'Client api version must be v4', caller) unless @client.api_version == 'v4'
-      fail(ParameterError, 'No domain given to update tracking settings on Mailgun', caller) unless domain
-      fail(ParameterError, 'No selector given to activate key on Mailgun', caller) unless selector
-      @client.put("domains/#{domain}/keys/#{selector}/activate", {}).to_h
+    # Returns [Hash] Response message
+    def dkim_rotate(domain)
+      @client.post("dkim_management/domains/#{domain}/rotate", {})
     end
 
-    # Public: Deactivate a domain key for a specified authority and selector
+    # ==== End of Domain::DKIM_Security methods ====
+
+    # ==== Credentials methods ====
+
+    # Public: Creates a new set of SMTP credentials for the defined domain.
     #
-    # domain    - [String] Name of the domain (ex. domain.com)
-    # selector  - [String] The selector you want to activate for the domain key
+    # domain  - [String] Name of the domain (ex. domain.com)
+    # options - [Hash] of
+    #   login  - [String] The user name (ex. bob.bar)
+    #   password  - [String] A password for the SMTP credentials. (Length Min 5, Max 32)
     #
-    # Returns [Hash] with message key and autority + selector data
-    def deactivate_domain_key(domain, selector)
-      fail(ParameterError, 'Client api version must be v4', caller) unless @client.api_version == 'v4'
-      fail(ParameterError, 'No domain given to update tracking settings on Mailgun', caller) unless domain
-      fail(ParameterError, 'No selector given to activate key on Mailgun', caller) unless selector
-      @client.put("domains/#{domain}/keys/#{selector}/deactivate", {}).to_h
+    # Returns [Hash] with message key
+    def create_smtp_credentials(domain, options = {})
+      @client.post("domains/#{domain}/credentials", options).to_h
     end
 
-    # Public: Create a domain key
+    # Public: Updates the specified SMTP credentials.
     #
+    # domain  - [String] Name of the domain (ex. domain.com)
+    # login  - [String] The user name (ex. bob.bar)
     # options - [Hash] of
-    #   signing_domain  - [String] Name of the domain (ex. domain.com)
-    #   selector - [String] Selector to be used for the new domain key
-    #   bits - [Integer] Key size, can be 1024 or 2048
-    #   pem - [String] Private key PEM
+    #   password  - [String] A password for the SMTP credentials. (Length Min 5, Max 32)
     #
     # Returns [Hash] with message key
-    def create_domain_key(options = {})
-      fail(ParameterError, 'Client api version must be v1', caller) unless @client.api_version == 'v1'
-      @client.post("dkim/keys", options).to_h
+    def update_smtp_credentials(domain, login, options = {})
+      @client.put("domains/#{domain}/credentials/#{login}", options).to_h
     end
 
-    # Public: Delete a domain key.
+    # Public: Deletes the defined SMTP credentials.
     #
-    # options - [Hash] of
-    #   signing_domain - [Integer] Name of the domain (ex. domain.com)
-    #   selector - [String] Name of the selector
+    # domain  - [String] Name of the domain (ex. domain.com)
+    # login  - [String] The user name (ex. bob.bar)
     #
-    # Returns [Hash] with message key
-    def delete_domain_key(options = {})
-      fail(ParameterError, 'Client api version must be v1', caller) unless @client.api_version == 'v1'
-      @client.delete("dkim/keys", options).to_h
+    # Returns [Hash] with message and spec keys
+    def delete_smtp_credentials(domain, login)
+      @client.delete("domains/#{domain}/credentials/#{login}").to_h
     end
 
+    # ==== End of Credentials methods ====
+
+    # ==== Reporting::Stat methods ====
+
     # Public: Returns total stats for a given domains
     #
     # domain    - [String] Name of the domain (ex. domain.com)
@@ -341,9 +338,23 @@ module Mailgun
     #
     # Returns [Array] A list of domains (hash)
     def get_domain_stats(domain, options = {})
-      warn('WARN: Client api version must be v3') unless @client.api_version == 'v3'
       fail(ParameterError, 'No domain given to list stats on Mailgun', caller) unless domain
       @client.get("#{domain}/stats/total", options).to_h
     end
+
+    # ==== End of Reporting::Stats methods ====
+
+
+    enforces_api_version 'v1', :list_domain_keys, :create_domain_key, :delete_domain_key, :dkim_rotation,
+                         :dkim_rotate
+    enforces_api_version 'v2', :get_domain_tracking_certificate, :regenerate_domain_tracking_certificate,
+                         :generate_domain_tracking_certificate
+    enforces_api_version 'v3', :remove, :create_smtp_credentials, :update_smtp_credentials,
+                         :delete_smtp_credentials, :get_domain_tracking_settings,
+                         :update_domain_tracking_open_settings, :update_domain_tracking_click_settings,
+                         :update_domain_tracking_unsubscribe_settings, :update_domain_dkim_authority,
+                         :update_domain_dkim_selector, :get_domain_stats
+    enforces_api_version 'v4', :get_domain_keys, :activate_domain_key, :deactivate_domain_key,
+                         :list, :verify, :create, :update
   end
 end

data/lib/mailgun/events/events.rb

@@ -1,5 +1,3 @@
-require 'mailgun/exceptions/exceptions'
-
 module Mailgun
 
   # A Mailgun::Events object makes it really simple to consume

data/lib/mailgun/exceptions/exceptions.rb

@@ -1,4 +1,6 @@
 module Mailgun
+  module Exceptions
+  end
 
   # Public: A basic class for mananging errors.
   # Inherits from StandardError (previously RuntimeError) as not all errors are

data/lib/mailgun/helpers/api_version_checker.rb

@@ -0,0 +1,41 @@
+module Mailgun
+  module ApiVersionChecker
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+
+    module ClassMethods
+      def requires_api_version(version, *method_names)
+        method_names.each do |method_name|
+          original_method = instance_method(method_name)
+
+          define_method(method_name) do |*args, &block|
+            warn_unless_api_version(version)
+            original_method.bind(self).call(*args, &block)
+          end
+        end
+      end
+
+      def enforces_api_version(version, *method_names)
+        method_names.each do |method_name|
+          original_method = instance_method(method_name)
+
+          define_method(method_name) do |*args, &block|
+            require_api_version(version)
+            original_method.bind(self).call(*args, &block)
+          end
+        end
+      end
+    end
+
+    private
+
+    def warn_unless_api_version(expected_version)
+      warn("WARN: Client api version must be #{expected_version}") unless @client.api_version == expected_version
+    end
+
+    def require_api_version(expected_version)
+      fail(ParameterError, "Client api version must be #{expected_version}", caller) unless @client.api_version == expected_version
+    end
+  end
+end

data/lib/mailgun/lists/opt_in_handler.rb

@@ -1,6 +1,3 @@
-require 'uri'
-require 'openssl'
-
 module Mailgun
 
   # Public: Provides methods for creating and handling opt-in URLs,

data/lib/mailgun/logs/logs.rb

@@ -1,5 +1,3 @@
-require 'mailgun/exceptions/exceptions'
-
 module Mailgun
   # A Mailgun::Logs object is a simple interface to Mailgun Logs.
   # Uses Mailgun

data/lib/mailgun/messages/batch_message.rb

@@ -1,5 +1,3 @@
-require 'mailgun/messages/message_builder'
-
 module Mailgun
 
   # A Mailgun::BatchMessage object is used to create a valid payload

data/lib/mailgun/messages/message_builder.rb

@@ -1,7 +1,3 @@
-require 'mini_mime'
-require 'time'
-require 'faraday/multipart'
-
 module Mailgun
 
   # A Mailgun::MessageBuilder object is used to create a valid payload

data/lib/mailgun/metrics/metrics.rb

@@ -1,5 +1,3 @@
-require 'mailgun/exceptions/exceptions'
-
 module Mailgun
   # A Mailgun::Metrics object is a simple interface to Mailgun Metrics.
   # Uses Mailgun

data/lib/mailgun/subaccounts/subaccounts.rb

@@ -1,5 +1,3 @@
-require 'mailgun/exceptions/exceptions'
-
 module Mailgun
 
   # A Mailgun::Subaccounts object is a simple CRUD interface to Mailgun Subaccounts.

data/lib/mailgun/suppressions.rb

@@ -1,7 +1,3 @@
-require 'uri'
-
-require 'mailgun/exceptions/exceptions'
-
 module Mailgun
 
   # The Mailgun::Suppressions object makes it easy to manage "suppressions"
@@ -45,7 +41,7 @@ module Mailgun
     end
 
     def get_bounce(address)
-      @client.get("#{@domain}/bounces/#{escape_address(address)}", nil)
+      @client.get("#{@domain}/bounces/#{escape_address(address)}")
     end
 
     def create_bounce(params = {})
@@ -187,7 +183,7 @@ module Mailgun
     end
 
     def get_complaint(address)
-      @client.get("#{@domain}/complaints/#{escape_address(address)}", nil)
+      @client.get("#{@domain}/complaints/#{escape_address(address)}")
     end
 
     def create_complaint(params = {})