mailgun-ruby 1.2.15 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88449bde0909456b09f66ea57e253fbfe06f2de6fddb2640f9b5571479d9cedc
-  data.tar.gz: 3ed8f2ace6300271251bedab59ffc118acd3fb570a7a361b5c26d6c2a98352e8
+  metadata.gz: 8c3decbf9e3cc421d067f05661560a6677c8873792b2895f6ee04ef52aa81323
+  data.tar.gz: 86eda44ce14d19c5c52c8e48671210b36bb8b1d7989756679dad3e087a398690
 SHA512:
-  metadata.gz: 2159184a986dae450bec7069c8420671a860c7e06abe9ab660cf3a9af594ce62e67428c85782a25c242e99fc2bb250e172caa0e616e296332bf7f0f9fe7f8dc1
-  data.tar.gz: 2cf4aa439edfaf850e0151b43edbce7722701db5ec55ab087dbaffed70a64a1f8d99975cda71bc1e303284b5f6ce6865706a1414299fe554bbfdbc6f7e77669e
+  metadata.gz: 2af34e19834467ba23ebaf6052a9af8ef6e8e49106128cdcd47a1dc693792af2ea4a543dde46c1f5896df4cc13579cb2c470bd788f40ecd6652bdfa9ba1a9049
+  data.tar.gz: de3d99329bdd5427ef09557f8b4aaac8e285fdaafc196d76be84e4a61a3d67cfbb3bd3112d2b4f2b0fa35b2233ee2f6ffa6e517bcbec0cddb0116a8b1dcdfd6e

data/.gitignore

@@ -21,3 +21,4 @@ ruby
 .ruby-env.yml
 .rspec-local
 .tool-versions
+.idea

data/CHANGELOG.md

@@ -2,7 +2,57 @@
 
 All notable changes to this project will be documented in this file.
 
-## [Unreleased]
+## [1.3.5] - 2025-04-07
+
+### Fixed
+
+- Set attachment filename on upload IO (https://github.com/mailgun/mailgun-ruby/pull/351)
+
+## [1.3.4] - 2025-03-28
+
+### Added
+
+- Increase max tag limit to 10 per message (https://github.com/mailgun/mailgun-ruby/pull/350)
+
+## [1.3.3] - 2025-03-25
+
+### Fixed
+
+- Fix specs (https://github.com/mailgun/mailgun-ruby/pull/345)
+- Fix sending attachments via faraday (https://github.com/mailgun/mailgun-ruby/pull/347)
+
+## [1.3.2] - 2025-01-30
+
+### Fixed
+
+- Use Faraday::FlatParamsEncoder (https://github.com/mailgun/mailgun-ruby/pull/334)
+- Update Message Builder doc (https://github.com/mailgun/mailgun-ruby/pull/338)
+- Add Domain api version warnings (https://github.com/mailgun/mailgun-ruby/pull/339)
+
+## [1.3.1] - 2025-01-26
+
+### Fixed
+
+- Fix mock mailgun responds (https://github.com/mailgun/mailgun-ruby/pull/331)
+- Change mime-types to runtime dependency (https://github.com/mailgun/mailgun-ruby/pull/332)
+
+## [1.3.0] - 2025-01-26
+
+### Added
+
+- Faraday as http client (https://github.com/mailgun/mailgun-ruby/pull/330)
+
+### Fixed
+
+- Added documentation for updating webhook (https://github.com/mailgun/mailgun-ruby/pull/325)
+- Remove duplicated entry from CHANGELOG (https://github.com/mailgun/mailgun-ruby/pull/318)
+- Update template and metrics docs (https://github.com/mailgun/mailgun-ruby/pull/329)
+
+## [1.2.16] - 2024-11-29
+
+### Added
+
+- Metrics API support (https://github.com/mailgun/mailgun-ruby/pull/326)
 
 ## [1.2.15] - 2024-02-13
 
@@ -19,7 +69,6 @@ All notable changes to this project will be documented in this file.
 - Additional Domain Endpoints (https://github.com/mailgun/mailgun-ruby/pull/314)
 - Webhooks Update Method (https://github.com/mailgun/mailgun-ruby/pull/305)
 - Add support for AMP HTML (https://github.com/mailgun/mailgun-ruby/pull/304)
-- Add support for AMP HTML (https://github.com/mailgun/mailgun-ruby/pull/304)
 
 ### Fixed
 
@@ -40,4 +89,4 @@ All notable changes to this project will be documented in this file.
 ### Fixed
 
 - transform_for_mailgun block iteration issue (https://github.com/mailgun/mailgun-ruby/pull/298).
-- Typos in several files (https://github.com/mailgun/mailgun-ruby/pull/297).
+- Typos in several files (https://github.com/mailgun/mailgun-ruby/pull/297).

data/Gemfile

@@ -3,4 +3,5 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in mailgun.gemspec
 gemspec
 
+gem 'mime-types'
 gem 'json', '~> 2.1', platform: :mri_19

data/README.md

@@ -19,7 +19,7 @@ gem install mailgun-ruby
 Gemfile:
 
 ```ruby
-gem 'mailgun-ruby', '~>1.2.15'
+gem 'mailgun-ruby', '~>1.3.2'
 ```
 
 Usage
@@ -181,7 +181,6 @@ For usage examples on each API endpoint, head over to our official documentation
 pages. Or the [Snippets](docs/Snippets.md) file.
 
 This SDK includes the following components:
-- [Messages](docs/Messages.md)
 - [Message Builder](docs/MessageBuilder.md)
 - [Batch Message](docs/MessageBuilder.md#usage---batch-message)
 - [Opt-In Handler](docs/OptInHandler.md)
@@ -193,6 +192,7 @@ This SDK includes the following components:
 - [Suppressions](docs/Suppressions.md)
 - [Templates](docs/Templates.md)
 - [EmailValidation](docs/EmailValidation.md)
+- [Metrics](docs/Metrics.md)
 
 Message Builder allows you to quickly create the array of parameters, required
 to send a message, by calling a methods for each parameter.

data/docs/MessageBuilder.md

@@ -31,12 +31,18 @@ mb_obj.add_recipient(:to, "john.doe@example.com", {"first" => "John", "last" =>
 # Define a cc recipient.
 mb_obj.add_recipient(:cc, "sally.doe@example.com", {"first" => "Sally", "last" => "Doe"});
 
+# Define the reply-to address.
+mb_obj.reply_to("bob.doe@example.com", {"first" => "Bob", "last" => "Doe"});
+
 # Define the subject.
 mb_obj.subject("A message from the Ruby SDK using Message Builder!");
 
 # Define the body of the message.
 mb_obj.body_text("This is the text body of the message!");
 
+# Define the HTML text of the message
+mb_obj.body_html("<html><body><p>This is the text body of the message</p></body></html>");
+
 # Set the Message-Id header, provide a valid Message-Id.
 mb_obj.message_id("<20141014000000.11111.11111@example.com>")
 
@@ -63,6 +69,12 @@ mb_obj.add_inline_image "/path/to/file/header.png"
 # Schedule message in the future
 mb_obj.deliver_at("tomorrow 8:00AM PST");
 
+# Turn Click Tracking on
+mb_obj.track_clicks(true)
+
+# Turn Click Tracking off
+mb_obj.track_clicks(false)
+
 # Finally, send your message using the client
 result = mg_client.send_message("sending_domain.com", mb_obj)
 

data/docs/Metrics.md

@@ -0,0 +1,108 @@
+Mailgun - Metrics
+====================
+
+This is the Mailgun Ruby *Metrics* utilities.
+
+The below assumes you've already installed the Mailgun Ruby SDK in to your
+project. If not, go back to the master README for instructions. It currently supports
+all calls except credentials.
+
+---
+
+Mailgun collects many different events and generates event metrics which are available
+in your Control Panel. This data is also available via our analytics metrics API endpoint.
+
+You can view additional samples in the [metrics_spec.rb](/spec/integration/metrics_spec.rb)
+or the Metrics client API in [metrics.rb](/lib/metrics/metrics.rb).
+
+Usage
+-----
+
+To get an instance of the Metrics client:
+
+```ruby
+require 'mailgun'
+
+mg_client = Mailgun::Client.new('your-api-key', 'mailgun-api-host', 'v1')
+metrics = Mailgun::Metrics.new(mg_client)
+````
+---
+Get filtered metrics for an account:
+```ruby
+options = {
+  {
+    resolution: 'hour',
+    metrics: [
+      'accepted_count',
+      'delivered_count',
+      'clicked_rate',
+      'opened_rate'
+    ],
+    include_aggregates: true,
+    start: 'Tue, 26 Nov 2024 20:56:50 -0500',
+    duration: '1m',
+    filter: {
+      AND: [
+        {
+          attribute: 'domain',
+          comparator: '!=',
+          values: [
+            {
+              label: 'example.com',
+              value: 'example.com'
+            }
+          ]
+        }
+      ]
+    },
+    dimensions: ['time'],
+    end: 'Tue, 30 Nov 2024 20:56:50 -0500',
+    include_subaccounts: true
+  }
+}
+
+metrics.account_metrics(options)
+```
+---
+
+Get filtered usage metrics for an account:
+```ruby
+options = {
+  resolution: 'hour',
+  metrics: [
+    'accepted_count',
+    'delivered_count',
+    'clicked_rate',
+    'opened_rate'
+  ],
+  include_aggregates: true,
+  start: 'Tue, 26 Nov 2024 20:56:50 -0500',
+  duration: '1m',
+  filter: {
+    AND: [
+      {
+        attribute: 'domain',
+        comparator: '!=',
+        values: [
+          {
+            label: 'example.com',
+            value: 'example.com'
+          }
+        ]
+      }
+    ]
+  },
+  dimensions: ['time'],
+  end: 'Tue, 30 Nov 2024 20:56:50 -0500',
+  include_subaccounts: true
+}
+
+metrics.account_usage_metrics(options)
+```
+
+---
+
+More Documentation
+------------------
+See the official [Mailgun Domain Docs](https://documentation.mailgun.com/docs/mailgun/api-reference/openapi-final/tag/Metrics/)
+for more information

data/docs/Webhooks.md

@@ -4,8 +4,7 @@ Mailgun - Webhooks
 This is the Mailgun Ruby *Webhook* utilities.
 
 The below assumes you've already installed the Mailgun Ruby SDK in to your
-project. If not, go back to the master README for instructions. It currently supports
-all calls except updating webhooks.
+project. If not, go back to the master README for instructions.
 
 Usage - Webhooks
 -----------------------
@@ -27,6 +26,9 @@ hook.create_all 'my.perfect.domain', 'https://the.webhook.url/'
 # Add a url for a specific webhook
 hook.create 'my.perfect.domain', 'deliver', 'https://the.webhook.url/'
 
+# Update the url for a specific webhook
+hook.update 'my.perfect.domain', 'deliver', 'https://the.webhook.url/'
+
 # Remove a url for a specific webhook
 hook.remove 'my.perfect.domain', 'deliver'
 

data/lib/mailgun/chains.rb

@@ -7,7 +7,7 @@ module Mailgun
     MAX_CAMPAIGN_IDS = 3
 
     # maximum tags per message
-    MAX_TAGS = 3
+    MAX_TAGS = 10
 
     # maximum recipients per message or batch
     MAX_RECIPIENTS = 1000

data/lib/mailgun/client.rb

@@ -19,16 +19,28 @@ module Mailgun
                    timeout = nil,
                    proxy_url = Mailgun.proxy_url)
 
-      rest_client_params = {
-        user: 'api',
-        password: api_key,
-        user_agent: "mailgun-sdk-ruby/#{Mailgun::VERSION}"
+      endpoint = endpoint_generator(api_host, api_version, ssl)
+
+      request_options = {
+        url: endpoint,
+        proxy: Mailgun.proxy_url,
+        ssl: {verify: ssl},
+        headers: {
+                   'User-Agent' => "mailgun-sdk-ruby/#{Mailgun::VERSION}",
+                   'Accept' =>'*/*'
+                  }
       }
-      rest_client_params[:timeout] = timeout if timeout
+      request_options.merge!(request: {timeout: timeout}) if timeout
+
+      @http_client =  Faraday.new(request_options) do |conn|
+        conn.request :multipart
+        conn.request :authorization, :basic, 'api', api_key
+        conn.request :url_encoded
+        conn.response :raise_error, include_request: true
+        conn.adapter Faraday.default_adapter
+        conn.options.params_encoder = Faraday::FlatParamsEncoder
+      end
 
-      endpoint = endpoint_generator(api_host, api_version, ssl)
-      RestClient.proxy = proxy_url
-      @http_client = RestClient::Resource.new(endpoint, rest_client_params)
       @test_mode = test_mode
       @api_version = api_version
     end
@@ -49,17 +61,17 @@ module Mailgun
 
     # Change API key
     def set_api_key(api_key)
-      @http_client.options[:password] = api_key
+      @http_client.set_basic_auth('api', api_key)
     end
 
     # Add subaccount id to headers
     def set_subaccount(subaccount_id)
-      @http_client.options[:headers] = { SUBACCOUNT_HEADER => subaccount_id }
+      @http_client.headers = @http_client.headers.merge!({ SUBACCOUNT_HEADER => subaccount_id })
     end
 
     # Reset subaccount for primary usage
     def reset_subaccount
-      @http_client.options[:headers].delete(SUBACCOUNT_HEADER)
+      @http_client.headers.delete(SUBACCOUNT_HEADER)
     end
 
     # Client is in test mode?
@@ -95,7 +107,7 @@ module Mailgun
         return Response.from_hash(
           {
             :body => "{\"id\": \"test-mode-mail-#{SecureRandom.uuid}@localhost\", \"message\": \"Queued. Thank you.\"}",
-            :code => 200,
+            :status => 200,
           }
         )
       end
@@ -130,7 +142,7 @@ module Mailgun
     # @param [Hash] headers Additional headers to pass to the resource.
     # @return [Mailgun::Response] A Mailgun::Response object.
     def post(resource_path, data, headers = {})
-      response = @http_client[resource_path].post(data, headers)
+      response = @http_client.post(resource_path, data, headers)
       Response.new(response)
     rescue => err
       raise communication_error err
@@ -138,21 +150,19 @@ module Mailgun
 
     # Generic Mailgun GET Handler
     #
-    # @param [String] resource_path This is the API resource you wish to interact
-    # with. Be sure to include your domain, where necessary.
-    # @param [Hash] params This should be a standard Hash
-    # containing required parameters for the requested resource.
-    # @param [String] accept Acceptable Content-Type of the response body.
-    # @return [Mailgun::Response] A Mailgun::Response object.
-    def get(resource_path, params = nil, accept = '*/*')
-      if params
-        response = @http_client[resource_path].get(params: params, accept: accept)
-      else
-        response = @http_client[resource_path].get(accept: accept)
-      end
+    # @param [String] resource_path The API resource path to request, including the domain if required.
+    # @param [Hash] params Optional request parameters, including query parameters and headers.
+    #   - `:headers` [Hash] (optional) Custom headers for the request.
+    # @param [String] accept The expected Content-Type of the response. Defaults to '*/*'.
+    # @return [Mailgun::Response] A response object containing the API response data.
+    # @raise [CommunicationError] If the request fails, raises a communication error.
+    def get(resource_path, params = {}, accept = '*/*')
+      headers = (params[:headers] || {}).merge(accept: accept)
+      response = @http_client.get(resource_path, params, headers)
+
       Response.new(response)
     rescue => err
-      raise communication_error err
+      raise communication_error(err)
     end
 
     # Generic Mailgun PUT Handler
@@ -163,7 +173,7 @@ module Mailgun
     # containing required parameters for the requested resource.
     # @return [Mailgun::Response] A Mailgun::Response object.
     def put(resource_path, data)
-      response = @http_client[resource_path].put(data)
+      response = @http_client.put(resource_path, data)
       Response.new(response)
     rescue => err
       raise communication_error err
@@ -176,9 +186,9 @@ module Mailgun
     # @return [Mailgun::Response] A Mailgun::Response object.
     def delete(resource_path, params = nil)
       if params
-        response = @http_client[resource_path].delete(params: params)
+        response = @http_client.delete(resource_path, params: params)
       else
-        response = @http_client[resource_path].delete
+        response = @http_client.delete(resource_path)
       end
       Response.new(response)
     rescue => err
@@ -227,7 +237,7 @@ module Mailgun
     # @param [StandardException] e upstream exception object
     def communication_error(e)
       if e.respond_to?(:response) && e.response
-        return case e.response.code
+        return case e.response_status
         when Unauthorized::CODE
           Unauthorized.new(e.message, e.response)
         when BadRequest::CODE

data/lib/mailgun/domains/domains.rb

@@ -19,6 +19,7 @@ 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
@@ -29,6 +30,7 @@ module Mailgun
     #
     # 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
@@ -43,6 +45,7 @@ module Mailgun
     #
     # 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
@@ -61,6 +64,7 @@ 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
@@ -75,6 +79,7 @@ module Mailgun
     #
     # 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'
     end
@@ -95,6 +100,7 @@ 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
@@ -108,6 +114,7 @@ module Mailgun
     #
     # 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
     end
@@ -121,6 +128,7 @@ module Mailgun
     #
     # 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
@@ -133,6 +141,7 @@ module Mailgun
     #
     # 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
@@ -144,6 +153,7 @@ module Mailgun
     #
     # 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
     end
@@ -158,6 +168,7 @@ module Mailgun
     #
     # 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
     end
@@ -168,6 +179,7 @@ module Mailgun
     #
     # 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
@@ -181,6 +193,7 @@ module Mailgun
     #
     # 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
     end
@@ -193,6 +206,7 @@ module Mailgun
     #
     # 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
     end
@@ -207,6 +221,7 @@ 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
@@ -220,6 +235,7 @@ module Mailgun
     #
     # 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
     end
@@ -232,6 +248,7 @@ module Mailgun
     #
     # 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
     end
@@ -244,6 +261,7 @@ module Mailgun
     #
     # 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
     end
@@ -323,6 +341,7 @@ 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

data/lib/mailgun/events/events.rb

@@ -29,7 +29,7 @@ module Mailgun
     # params - a Hash of query options and/or filters.
     #
     # Returns a Mailgun::Response object.
-    def get(params = nil)
+    def get(params = {})
       self.next(params)
     end
 
@@ -40,7 +40,7 @@ module Mailgun
     # params - a Hash of query options and/or filters.
     #
     # Returns a Mailgun::Response object.
-    def next(params = nil)
+    def next(params = {})
       get_events(params, @paging_next)
     end
 
@@ -51,7 +51,7 @@ module Mailgun
     # params - a Hash of query options and/or filters.
     #
     # Returns Mailgun::Response object.
-    def previous(params = nil)
+    def previous(params = {})
       get_events(params, @paging_previous)
     end
 
@@ -75,7 +75,7 @@ module Mailgun
     # paging - the URL key used for previous/next requests
     #
     # Returns a Mailgun.Response object.
-    def get_events(params = nil, paging = nil)
+    def get_events(params = {}, paging = nil)
       response = @client.get(construct_url(paging), params)
       extract_paging(response)
       response

data/lib/mailgun/exceptions/exceptions.rb

@@ -29,10 +29,10 @@ module Mailgun
   # Public: Class for managing communications (eg http) response errors
   # Inherits from Mailgun::Error
   class CommunicationError < Error
-    # Public: gets HTTP status code
-    attr_reader :code
+    # Public: gets HTTP status status
+    attr_reader :status
 
-    # Public: fallback if there is no response code on the object
+    # Public: fallback if there is no response status on the object
     NOCODE = 000
     FORBIDDEN = 'Forbidden'
 
@@ -43,17 +43,17 @@ module Mailgun
     #
     def initialize(message = nil, response = nil)
       @response = response
-      @code = if response.nil?
+      @status = if response.nil?
                 NOCODE
               else
-                response.code
+                response.status
               end
 
       begin
         json = JSON.parse(response.body)
         api_message = json['message'] || json['Error'] || json['error']
       rescue JSON::ParserError
-        api_message = response.body
+        api_message = response.response_body
       rescue NoMethodError
         api_message = "Unknown API error"
       rescue
@@ -65,7 +65,7 @@ module Mailgun
 
       super(message, response)
     rescue NoMethodError, JSON::ParserError
-      @code = NOCODE
+      @status = NOCODE
       super(message, response)
     end
   end