mailgun-ruby 1.4.1 → 1.4.3

data/lib/mailgun/suppressions.rb

@@ -1,9 +1,9 @@
-module Mailgun
+# frozen_string_literal: true
 
+module Mailgun
   # The Mailgun::Suppressions object makes it easy to manage "suppressions"
   # attached to an account. "Suppressions" means bounces, unsubscribes, and complaints.
   class Suppressions
-
     # @param [Mailgun::Client] client API client to use for requests
     # @param [String] domain Domain name to use for the suppression endpoints.
     def initialize(client, domain)
@@ -60,12 +60,12 @@ module Mailgun
     def create_bounces(data)
       # `data` should be a list of hashes, with each hash containing *at least* an `address` key.
       split_return = []
-      if data.length >= 1000 then
-        resp, resp_l = create_bounces data[999..-1]
+      if data.length >= 1000
+        resp, resp_l = create_bounces data[999..]
         split_return.push(resp)
         split_return.concat(resp_l)
         data = data[0..998]
-      elsif data.length == 0 then
+      elsif data.empty?
         return nil, []
       end
 
@@ -74,25 +74,21 @@ module Mailgun
       # NOTE: `data` could potentially be very large (1000 elements) so it is
       # more efficient to pop from data and push into a different array as
       # opposed to possibly copying the entire array to another array.
-      while not data.empty? do
+      until data.empty?
         bounce = data.pop
         # Bounces MUST contain a `address` key.
-        if not bounce.include? :address then
-          raise Mailgun::ParameterError.new "Bounce MUST include a :address key: #{bounce}"
-        end
+        raise Mailgun::ParameterError, "Bounce MUST include a :address key: #{bounce}" unless bounce.include? :address
 
         bounce.each do |k, v|
           # Hash values MUST be strings.
-          if not v.is_a? String then
-            bounce[k] = v.to_s
-          end
+          bounce[k] = v.to_s unless v.is_a? String
         end
 
         valid.push bounce
       end
 
-      response = @client.post("#{@domain}/bounces", valid.to_json, { "Content-Type" => "application/json" })
-      return response, split_return
+      response = @client.post("#{@domain}/bounces", valid.to_json, { 'Content-Type' => 'application/json' })
+      [response, split_return]
     end
 
     def delete_bounce(address)
@@ -133,22 +129,22 @@ module Mailgun
     def create_unsubscribes(data)
       # `data` should be a list of hashes, with each hash containing *at least* an `address` key.
       split_return = []
-      if data.length >= 1000 then
-        resp, resp_l = create_unsubscribes data[999..-1]
+      if data.length >= 1000
+        resp, resp_l = create_unsubscribes data[999..]
         split_return.push(resp)
         split_return.concat(resp_l)
         data = data[0..998]
-      elsif data.length == 0 then
+      elsif data.empty?
         return nil, []
       end
 
       valid = []
       # Validate the unsubscribes given
-      while not data.empty? do
+      until data.empty?
         unsubscribe = data.pop
         # unsubscribes MUST contain a `address` key.
-        if not unsubscribe.include? :address then
-          raise Mailgun::ParameterError.new "Unsubscribe MUST include a :address key: #{unsubscribe}"
+        unless unsubscribe.include? :address
+          raise Mailgun::ParameterError, "Unsubscribe MUST include a :address key: #{unsubscribe}"
         end
 
         unsubscribe.each do |k, v|
@@ -164,11 +160,11 @@ module Mailgun
         valid.push unsubscribe
       end
 
-      response = @client.post("#{@domain}/unsubscribes", valid.to_json, { "Content-Type" => "application/json" })
-      return response, split_return
+      response = @client.post("#{@domain}/unsubscribes", valid.to_json, { 'Content-Type' => 'application/json' })
+      [response, split_return]
     end
 
-    def delete_unsubscribe(address, params = {})
+    def delete_unsubscribe(address, _params = {})
       @client.delete("#{@domain}/unsubscribes/#{escape_address(address)}")
     end
 
@@ -202,36 +198,34 @@ module Mailgun
     def create_complaints(data)
       # `data` should be a list of hashes, with each hash containing *at least* an `address` key.
       split_return = []
-      if data.length >= 1000 then
-        resp, resp_l = create_complaints data[999..-1]
+      if data.length >= 1000
+        resp, resp_l = create_complaints data[999..]
         split_return.push(resp)
         split_return.concat(resp_l)
         data = data[0..998]
-      elsif data.length == 0 then
+      elsif data.empty?
         return nil, []
       end
 
       valid = []
       # Validate the complaints given
-      while not data.empty? do
+      until data.empty?
         complaint = data.pop
         # complaints MUST contain a `address` key.
-        if not complaint.include? :address then
-          raise Mailgun::ParameterError.new "Complaint MUST include a :address key: #{complaint}"
+        unless complaint.include? :address
+          raise Mailgun::ParameterError, "Complaint MUST include a :address key: #{complaint}"
         end
 
         complaint.each do |k, v|
           # Hash values MUST be strings.
-          if not v.is_a? String then
-            complaint[k] = v.to_s
-          end
+          complaint[k] = v.to_s unless v.is_a? String
         end
 
         valid.push complaint
       end
 
-      response = @client.post("#{@domain}/complaints", valid.to_json, { "Content-Type" => "application/json" })
-      return response, split_return
+      response = @client.post("#{@domain}/complaints", valid.to_json, { 'Content-Type' => 'application/json' })
+      [response, split_return]
     end
 
     def delete_complaint(address)
@@ -250,24 +244,23 @@ module Mailgun
 
     def extract_paging(response)
       rhash = response.to_h
-      return nil unless rhash.include? "paging"
+      return nil unless rhash.include? 'paging'
 
-      page_info = rhash["paging"]
+      page_info = rhash['paging']
 
       # Build the `next` endpoint
-      page_next = URI.parse(page_info["next"])
+      page_next = URI.parse(page_info['next'])
       @paging_next = {
-        :path => page_next.path[/\/v[\d]\/(.+)/, 1],
-        :params => Hash[URI.decode_www_form page_next.query],
+        path: page_next.path[%r{/v\d/(.+)}, 1],
+        params: Hash[URI.decode_www_form page_next.query]
       }
 
       # Build the `prev` endpoint
-      page_prev = URI.parse(page_info["previous"])
+      page_prev = URI.parse(page_info['previous'])
       @paging_prev = {
-        :path => page_prev.path[/\/v[\d]\/(.+)/, 1],
-        :params => Hash[URI.decode_www_form page_prev.query],
+        path: page_prev.path[%r{/v\d/(.+)}, 1],
+        params: Hash[URI.decode_www_form page_prev.query]
       }
     end
-
   end
 end

data/lib/mailgun/tags/analytics_tags.rb

@@ -1,5 +1,6 @@
-module Mailgun
+# frozen_string_literal: true
 
+module Mailgun
   # A Mailgun::AnalyticsTags object is a simple CRUD interface to Mailgun Tags.
   # Uses Mailgun
   class AnalyticsTags
@@ -11,18 +12,52 @@ module Mailgun
       @client = client
     end
 
+    # Public: Update account tag
+    #
+    # tag - [String] The tag to update.
+    # description - [String] The updated tag description.
+    #
+    # Returns [Boolean] true or false
     def update(tag, description)
-      @client.put('analytics/tags', { tag: tag, description: description }, body_params: true ).to_h['message'] == 'Tag updated'
+      @client.put('analytics/tags', { tag: tag, description: description }.to_json,
+                  { 'Content-Type' => 'application/json' }).to_h['message'] == 'Tag updated'
     end
 
+    # Public: Post query to list account tags or search for single tag
+    #
+    # options - [Hash] of
+    #     include_subaccounts  - [Boolean] Boolean indicating whether or not to include data from all subaccounts.
+    #                                      Default false.
+    #     include_metrics      - [Boolean] Boolean indicating whether or not to include metrics for tags.
+    #                                      Default false. When true max limit is 20.
+    #     tag                  - [String]  The tag or tag prefix.
+    #     pagination           - [Object]
+    #         sort          - [String]  Colon-separated value indicating column name and sort direction
+    #                                   e.g. 'timestamp:desc'.
+    #         skip          - [Integer] The number of items to skip over when satisfying the request.
+    #         limit         - [Integer] The maximum number of items returned (100 max).
+    #         total         - [Integer] The total number of tags matching the search criteria.
+    #         include_total - [Boolean] Boolean indicating whether or not to include total number of items.
+    #                                   Default false.
+
+    #
+    # Returns [Hash] Information on the requested tags.
     def list(options = {})
       @client.post('analytics/tags', options).to_h['items']
     end
 
+    # Public: Delete account tag
+    #
+    # tag - [String] The tag to delete.
+    #
+    # Returns [Boolean] true or false
     def remove(tag)
       @client.delete('analytics/tags', { tag: tag }, body_params: true).to_h['message'] == 'Tag deleted'
     end
 
+    # Public: Get account tag limit information
+    #
+    # Returns [Hash] Information on the tag limits.
     def limits
       @client.get('analytics/tags/limits').to_h
     end

data/lib/mailgun/tags/tags.rb

@@ -1,9 +1,9 @@
-module Mailgun
+# frozen_string_literal: true
 
+module Mailgun
   # A Mailgun::Tags object is a simple CRUD interface to Mailgun Tags.
   # Uses Mailgun
   class Tags
-
     # Public: creates a new Mailgun::Tags instance.
     # Defaults to Mailgun::Client
     def initialize(client = Mailgun::Client.new)
@@ -22,7 +22,8 @@ module Mailgun
     # Returns [Array] A list of tags (hash)
     def get_tags(domain, options = {})
       warn('This API is deprecated in favor of our new analytics Tags API')
-      fail(ParameterError, 'No domain given to store template on', caller) unless domain
+      raise(ParameterError, 'No domain given to store template on', caller) unless domain
+
       @client.get("#{domain}/tags", options).to_h['items']
     end
 
@@ -34,8 +35,9 @@ module Mailgun
     # Returns [Hash] Information on the requested tag.
     def get_tag(domain, tag)
       warn('This API is deprecated in favor of our new analytics Tags API')
-      fail(ParameterError, 'No domain given to find on Mailgun', caller) unless domain
-      fail(ParameterError, 'No tag name given to find on provided domain', caller) unless tag
+      raise(ParameterError, 'No domain given to find on Mailgun', caller) unless domain
+      raise(ParameterError, 'No tag name given to find on provided domain', caller) unless tag
+
       @client.get("#{domain}/tags/#{tag}").to_h!
     end
 
@@ -49,8 +51,9 @@ module Mailgun
     # Returns [Boolean] if successful or not
     def update(domain, tag, options = {})
       warn('This API is deprecated in favor of our new analytics Tags API')
-      fail(ParameterError, 'No domain given to find on Mailgun', caller) unless domain
-      fail(ParameterError, 'No tag name given to find on provided domain', caller) unless tag
+      raise(ParameterError, 'No domain given to find on Mailgun', caller) unless domain
+      raise(ParameterError, 'No tag name given to find on provided domain', caller) unless tag
+
       @client.put("#{domain}/tags/#{tag}", options).to_h['message'] == 'Tag updated'
     end
 
@@ -60,16 +63,19 @@ module Mailgun
     # tag    - [String] Tag name to lookup for
     # options - [Hash] of
     #     event - [String] The type of the event. Required. (ex. accepted, delivered, failed, opened)
-    #     start - [String] The starting time. Should be in RFC 282 or unix epoch format. Default: 7 days from the current time.
+    #     start - [String] The starting time. Should be in RFC 282 or unix epoch format.
+    #                      Default: 7 days from the current time.
     #     end   - [String] The ending date. Should be in RFC 2822 or unix epoch time in seconds. Default: current time.
     #     resolution   - [String] Can be either hour, day or month. Default: day
-    #     duration   - [String] Period of time with resolution encoded. If provided, overwrites the start date and resolution.
+    #     duration   - [String] Period of time with resolution encoded.
+    #                           If provided, overwrites the start date and resolution.
     #
     # Returns [Hash] of tag stats info
     def get_tag_stats(domain, tag, options = {})
       warn('This API is deprecated in favor of our new analytics Tags API')
-      fail(ParameterError, 'No domain given to find on Mailgun', caller) unless domain
-      fail(ParameterError, 'No tag name given to find on provided domain', caller) unless tag
+      raise(ParameterError, 'No domain given to find on Mailgun', caller) unless domain
+      raise(ParameterError, 'No tag name given to find on provided domain', caller) unless tag
+
       @client.get("#{domain}/tags/#{tag}/stats", options).to_h
     end
 
@@ -82,8 +88,9 @@ module Mailgun
     # Returns [Boolean] if successful or not
     def remove(domain, tag)
       warn('This API is deprecated in favor of our new analytics Tags API')
-      fail(ParameterError, 'No domain given to remove on Mailgun', caller) unless domain
-      fail(ParameterError, 'No template name given to find on provided domain', caller) unless tag
+      raise(ParameterError, 'No domain given to remove on Mailgun', caller) unless domain
+      raise(ParameterError, 'No template name given to find on provided domain', caller) unless tag
+
       @client.delete("#{domain}/tags/#{tag}").to_h['message'] == 'Tag deleted'
     end
 
@@ -95,8 +102,9 @@ module Mailgun
     # Returns [Hash] of countries of origin for a given domain
     def get_countries_aggregated_stats(domain, tag)
       warn('This API is deprecated in favor of our new analytics Tags API')
-      fail(ParameterError, 'No domain given to find on Mailgun', caller) unless domain
-      fail(ParameterError, 'No tag name given to find on provided domain', caller) unless tag
+      raise(ParameterError, 'No domain given to find on Mailgun', caller) unless domain
+      raise(ParameterError, 'No tag name given to find on provided domain', caller) unless tag
+
       @client.get("#{domain}/tags/#{tag}/stats/aggregates/countries").to_h
     end
 
@@ -108,8 +116,9 @@ module Mailgun
     # Returns [Hash] of email providers for a given domain
     def get_providers_aggregated_stats(domain, tag)
       warn('This API is deprecated in favor of our new analytics Tags API')
-      fail(ParameterError, 'No domain given to find on Mailgun', caller) unless domain
-      fail(ParameterError, 'No tag name given to find on provided domain', caller) unless tag
+      raise(ParameterError, 'No domain given to find on Mailgun', caller) unless domain
+      raise(ParameterError, 'No tag name given to find on provided domain', caller) unless tag
+
       @client.get("#{domain}/tags/#{tag}/stats/aggregates/providers").to_h
     end
 
@@ -121,8 +130,9 @@ module Mailgun
     # Returns [Hash] of devices for a given domain
     def get_devices_aggregated_stats(domain, tag)
       warn('This API is deprecated in favor of our new analytics Tags API')
-      fail(ParameterError, 'No domain given to find on Mailgun', caller) unless domain
-      fail(ParameterError, 'No tag name given to find on provided domain', caller) unless tag
+      raise(ParameterError, 'No domain given to find on Mailgun', caller) unless domain
+      raise(ParameterError, 'No tag name given to find on provided domain', caller) unless tag
+
       @client.get("#{domain}/tags/#{tag}/stats/aggregates/devices").to_h
     end
   end

data/lib/mailgun/templates/templates.rb

@@ -1,9 +1,9 @@
-module Mailgun
+# frozen_string_literal: true
 
+module Mailgun
   # A Mailgun::Templates object is a simple CRUD interface to Mailgun Templates.
   # Uses Mailgun
   class Templates
-
     # Public: creates a new Mailgun::Templates instance.
     # Defaults to Mailgun::Client
     def initialize(client = Mailgun::Client.new)
@@ -24,7 +24,8 @@ module Mailgun
     #
     # Returns [Hash] of created template
     def create(domain, options = {})
-      fail(ParameterError, 'No domain given to store template on', caller) unless domain
+      raise(ParameterError, 'No domain given to store template on', caller) unless domain
+
       @client.post("#{domain}/templates", options).to_h
     end
 
@@ -38,8 +39,9 @@ module Mailgun
     #
     # Returns [Hash] Information on the requested template.
     def info(domain, template_name, options = {})
-      fail(ParameterError, 'No domain given to find on Mailgun', caller) unless domain
-      fail(ParameterError, 'No template name given to find on provided domain', caller) unless template_name
+      raise(ParameterError, 'No domain given to find on Mailgun', caller) unless domain
+      raise(ParameterError, 'No template name given to find on provided domain', caller) unless template_name
+
       @client.get("#{domain}/templates/#{template_name}", options).to_h!
     end
 
@@ -52,8 +54,9 @@ module Mailgun
     #
     # Returns [Hash] of updated domain
     def update(domain, template_name, options = {})
-      fail(ParameterError, 'No domain given to add on Mailgun', caller) unless domain
-      fail(ParameterError, 'No template name given to find on provided domain', caller) unless template_name
+      raise(ParameterError, 'No domain given to add on Mailgun', caller) unless domain
+      raise(ParameterError, 'No template name given to find on provided domain', caller) unless template_name
+
       @client.put("#{domain}/templates/#{template_name}", options).to_h
     end
 
@@ -65,12 +68,13 @@ module Mailgun
     #
     # Returns [Boolean] if successful or not
     def remove(domain, template_name)
-      fail(ParameterError, 'No domain given to remove on Mailgun', caller) unless domain
-      fail(ParameterError, 'No template name given to find on provided domain', caller) unless template_name
+      raise(ParameterError, 'No domain given to remove on Mailgun', caller) unless domain
+      raise(ParameterError, 'No template name given to find on provided domain', caller) unless template_name
+
       @client.delete("#{domain}/templates/#{template_name}").to_h['message'] == 'template has been deleted'
     end
-    alias_method :delete, :remove
-    alias_method :delete_template, :remove
+    alias delete remove
+    alias delete_template remove
 
     # Public: Get Templates
     #
@@ -81,10 +85,11 @@ module Mailgun
     #
     # Returns [Array] A list of templates (hash)
     def list(domain, options = {})
-      fail(ParameterError, 'No domain given.', caller) unless domain
+      raise(ParameterError, 'No domain given.', caller) unless domain
+
       @client.get("#{domain}/templates", options).to_h['items']
     end
-    alias_method :get_templates, :list
+    alias get_templates list
 
     # Public: Delete Templates
     # NOTE: This method deletes all stored templates for the domain.
@@ -93,10 +98,11 @@ module Mailgun
     #
     # Returns [Boolean] if successful or not
     def remove_all(domain)
-      fail(ParameterError, 'No domain given to remove on Mailgun', caller) unless domain
+      raise(ParameterError, 'No domain given to remove on Mailgun', caller) unless domain
+
       @client.delete("#{domain}/templates").to_h['message'] == 'templates have been deleted'
     end
-    alias_method :delete_templates, :remove_all
+    alias delete_templates remove_all
 
     # Public: Create a new version of a template
     #
@@ -112,8 +118,9 @@ module Mailgun
     #
     # Returns [Hash] of updated template
     def create_version(domain, template_name, options = {})
-      fail(ParameterError, 'No domain given.', caller) unless domain
-      fail(ParameterError, 'No template name given.', caller) unless template_name
+      raise(ParameterError, 'No domain given.', caller) unless domain
+      raise(ParameterError, 'No template name given.', caller) unless template_name
+
       @client.post("#{domain}/templates/#{template_name}/versions", options).to_h
     end
 
@@ -125,9 +132,10 @@ module Mailgun
     #
     # Returns [Hash] Information on the requested template + version.
     def info_version(domain, template_name, tag)
-      fail(ParameterError, 'No domain given to find on Mailgun', caller) unless domain
-      fail(ParameterError, 'No template name given to find on provided domain', caller) unless template_name
-      fail(ParameterError, 'No version tag given.', caller) unless tag
+      raise(ParameterError, 'No domain given to find on Mailgun', caller) unless domain
+      raise(ParameterError, 'No template name given to find on provided domain', caller) unless template_name
+      raise(ParameterError, 'No version tag given.', caller) unless tag
+
       @client.get("#{domain}/templates/#{template_name}/versions/#{tag}").to_h!
     end
 
@@ -145,9 +153,10 @@ module Mailgun
     #
     # Returns [Hash] of updated template's version
     def update_version(domain, template_name, tag, options = {})
-      fail(ParameterError, 'No domain given.', caller) unless domain
-      fail(ParameterError, 'No template name given to find on provided domain.', caller) unless template_name
-      fail(ParameterError, 'No version tag given.', caller) unless tag
+      raise(ParameterError, 'No domain given.', caller) unless domain
+      raise(ParameterError, 'No template name given to find on provided domain.', caller) unless template_name
+      raise(ParameterError, 'No version tag given.', caller) unless tag
+
       @client.put("#{domain}/templates/#{template_name}/versions/#{tag}", options).to_h
     end
 
@@ -159,11 +168,12 @@ module Mailgun
     #
     # Returns [Boolean] if successful or not
     def delete_version(domain, template_name, tag)
-      fail(ParameterError, 'No domain given.', caller) unless domain
-      fail(ParameterError, 'No template name given to find on provided domain.', caller) unless template_name
-      fail(ParameterError, 'No version tag given.', caller) unless tag
+      raise(ParameterError, 'No domain given.', caller) unless domain
+      raise(ParameterError, 'No template name given to find on provided domain.', caller) unless template_name
+      raise(ParameterError, 'No version tag given.', caller) unless tag
+
       @client.delete("#{domain}/templates/#{template_name}/versions/#{tag}")
-        .to_h['message'] == 'version has been deleted'
+             .to_h['message'] == 'version has been deleted'
     end
 
     # Public: Get Template's Versions list
@@ -177,8 +187,9 @@ module Mailgun
     #
     # Returns [Array] A list of template's versions (hash)
     def template_versions_list(domain, template_name, options = {})
-      fail(ParameterError, 'No domain given.', caller) unless domain
-      fail(ParameterError, 'No template name given to find on provided domain.', caller) unless template_name
+      raise(ParameterError, 'No domain given.', caller) unless domain
+      raise(ParameterError, 'No template name given to find on provided domain.', caller) unless template_name
+
       @client.get("#{domain}/templates/#{template_name}/versions", options).to_h
     end
   end

data/lib/mailgun/version.rb

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
+
 # It's the version. Yeay!
 module Mailgun
-  VERSION = '1.4.1'
+  VERSION = '1.4.3'
 end

data/lib/mailgun/webhooks/webhooks.rb

@@ -1,9 +1,10 @@
-module Mailgun
+# frozen_string_literal: true
 
+module Mailgun
   # A Mailgun::Webhooks object is a simple CRUD interface to Mailgun Webhooks.
   # Uses Mailgun
   class Webhooks
-    ACTIONS = %w(accepted clicked complained delivered opened permanent_fail temporary_fail unsubscribed).freeze
+    ACTIONS = %w[accepted clicked complained delivered opened permanent_fail temporary_fail unsubscribed].freeze
 
     # Public creates a new Mailgun::Webhooks instance.
     #   Defaults to Mailgun::Client
@@ -21,7 +22,7 @@ module Mailgun
       res = @client.get("domains/#{domain}/webhooks", options)
       res.to_h['webhooks']
     end
-    alias_method :get_webhooks, :list
+    alias get_webhooks list
 
     # Public: Get webook information for a specific action
     #
@@ -36,7 +37,7 @@ module Mailgun
     rescue NoMethodError
       ''
     end
-    alias_method :get_webhook_url, :info
+    alias get_webhook_url info
 
     # Public: Add webhook
     #
@@ -49,8 +50,8 @@ module Mailgun
       res = @client.post("domains/#{domain}/webhooks", id: action, url: url)
       res.to_h['webhook']['urls'].include?(url) && res.to_h['message'] == 'Webhook has been created'
     end
-    alias_method :add, :create
-    alias_method :add_webhook, :create
+    alias add create
+    alias add_webhook create
 
     # Public: Sets all webhooks to the same URL
     #
@@ -63,10 +64,10 @@ module Mailgun
         add_webhook domain, action, url
       end
       true
-    rescue
+    rescue StandardError
       false
     end
-    alias_method :add_all_webhooks, :create_all
+    alias add_all_webhooks create_all
 
     # Public: Update webhook
     #
@@ -76,12 +77,13 @@ module Mailgun
     #
     # Returns a Boolean of whether the webhook was updated
     def update(domain, action, url = '')
-      fail Mailgun::ParameterError('Domain not provided to update webhooks') unless domain
-      fail Mailgun::ParameterError('Action not provided to identify webhook to update') unless action
+      raise Mailgun::ParameterError('Domain not provided to update webhooks') unless domain
+      raise Mailgun::ParameterError('Action not provided to identify webhook to update') unless action
+
       res = @client.put("domains/#{domain}/webhooks/#{action}", id: action, url: url)
       res.to_h['webhook']['urls'] == url && res.to_h['message'] == 'Webhook has been updated'
     end
-    alias_method :update_webhook, :update
+    alias update_webhook update
 
     # Public: Delete a specific webhook
     #
@@ -90,14 +92,15 @@ module Mailgun
     #
     # Returns a Boolean of the success
     def remove(domain, action)
-      fail Mailgun::ParameterError('Domain not provided to remove webhook from') unless domain
-      fail Mailgun::ParameterError('Action not provided to identify webhook to remove') unless action
+      raise Mailgun::ParameterError('Domain not provided to remove webhook from') unless domain
+      raise Mailgun::ParameterError('Action not provided to identify webhook to remove') unless action
+
       @client.delete("domains/#{domain}/webhooks/#{action}").to_h['message'] == 'Webhook has been deleted'
     rescue Mailgun::CommunicationError
       false
     end
-    alias_method :delete, :remove
-    alias_method :delete_webhook, :remove
+    alias delete remove
+    alias delete_webhook remove
 
     # Public: Delete all webhooks for a domain
     #
@@ -105,13 +108,13 @@ module Mailgun
     #
     # Returns a Boolean on the success
     def remove_all(domain)
-      fail Mailgun::ParameterError('Domain not provided to remove webhooks from') unless domain
+      raise Mailgun::ParameterError('Domain not provided to remove webhooks from') unless domain
+
       ACTIONS.each do |action|
         delete_webhook domain, action
       end
     end
-    alias_method :delete_all, :remove_all
-    alias_method :delete_all_webooks, :remove_all
-
+    alias delete_all remove_all
+    alias delete_all_webooks remove_all
   end
 end

data/lib/mailgun-ruby.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 require_relative 'mailgun'
 require_relative 'railgun' if defined?(Rails) && defined?(ActionMailer)