mailgun-ruby 1.4.1 → 1.4.3

data/lib/mailgun/exceptions/exceptions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Mailgun
   module Exceptions
   end
@@ -6,7 +8,6 @@ module Mailgun
   # Inherits from StandardError (previously RuntimeError) as not all errors are
   # runtime errors.
   class Error < StandardError
-
     # Public: get an object an error is instantiated with
     attr_reader :object
 
@@ -35,7 +36,7 @@ module Mailgun
     attr_reader :status
 
     # Public: fallback if there is no response status on the object
-    NOCODE = 000
+    NOCODE = 0o00
     FORBIDDEN = 'Forbidden'
 
     # Public: initialization of new error given a message and/or object
@@ -46,10 +47,10 @@ module Mailgun
     def initialize(message = nil, response = nil)
       @response = response
       @status = if response.nil?
-                NOCODE
-              else
-                response[:status]
-              end
+                  NOCODE
+                else
+                  response[:status]
+                end
 
       begin
         json = JSON.parse(response[:body])
@@ -57,13 +58,13 @@ module Mailgun
       rescue JSON::ParserError
         api_message = response.response_body
       rescue NoMethodError
-        api_message = "Unknown API error"
-      rescue
+        api_message = 'Unknown API error'
+      rescue StandardError
         api_message = 'Unknown API error'
       end
 
-      message = message || ''
-      message = message + ': ' + (api_message || "")
+      message ||= ''
+      message = "#{message}: #{api_message || ''}"
 
       super(message, response)
     rescue NoMethodError, JSON::ParserError
@@ -78,7 +79,7 @@ module Mailgun
     CODE = 401
 
     def initialize(error_message, response)
-      error_message = error_message + ' - Invalid Domain or API key'
+      error_message += ' - Invalid Domain or API key'
       super(error_message, response)
     end
   end
@@ -87,9 +88,5 @@ module Mailgun
   # Inherits from Mailgun::CommunicationError
   class BadRequest < CommunicationError
     CODE = 400
-
-    def initialize(error_message, response)
-      super(error_message, response)
-    end
   end
 end

data/lib/mailgun/helpers/api_version_checker.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Mailgun
   module ApiVersionChecker
     def self.included(base)
@@ -35,7 +37,10 @@ module Mailgun
     end
 
     def require_api_version(expected_version)
-      fail(ParameterError, "Client api version must be #{expected_version}", caller) unless @client.api_version == expected_version
+      return if @client.api_version == expected_version
+
+      raise(ParameterError, "Client api version must be #{expected_version}",
+            caller)
     end
   end
 end

data/lib/mailgun/lists/opt_in_handler.rb

@@ -1,11 +1,11 @@
-module Mailgun
+# frozen_string_literal: true
 
+module Mailgun
   # Public: Provides methods for creating and handling opt-in URLs,
   #   particularlly for mailing lists.
   #
   # See: https://github.com/mailgun/mailgun-ruby/blob/master/OptInHandler.md
   class OptInHandler
-
     # Generates a hash that can be used to validate opt-in recipients. Encodes
     # all the necessary data in the URL.
     #
@@ -32,7 +32,8 @@ module Mailgun
     #
     # @param [String] secret_app_id A secret passphrase used as a constant for the hash.
     # @param [Hash] unique_hash The hash from the user. Likely via link click.
-    # @return [Hash or Boolean] A hash with 'recipient_address' and 'mailing_list', if validates. Otherwise, boolean false.
+    # @return [Hash or Boolean] A hash with 'recipient_address' and 'mailing_list', if validates.
+    #                           Otherwise, boolean false.
     def self.validate_hash(secret_app_id, unique_hash)
       outer_payload = JSON.parse(base64_decode(CGI.unescape(unique_hash)))
 
@@ -46,6 +47,7 @@ module Mailgun
       if generated_hash == hash_provided
         return { 'recipient_address' => inner_payload['r'], 'mailing_list' => inner_payload['l'] }
       end
+
       false
     end
 
@@ -56,15 +58,9 @@ module Mailgun
 
     # Equivalent to Base64.decode64
     def self.base64_decode(input)
-      # TODO: Condition can be droped if Ruby >= 2.4.0
-      if input.respond_to?(:unpack1)
-        input.unpack1('m')
-      else
-        input.unpack('m').first
-      end
+      input.unpack1('m')
     end
 
     private_class_method :base64_encode, :base64_decode
   end
-
 end

data/lib/mailgun/logs/logs.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Mailgun
   # A Mailgun::Logs object is a simple interface to Mailgun Logs.
   # Uses Mailgun
@@ -30,8 +32,8 @@ module Mailgun
     #         limit - [Integer] The maximum number of items returned (100 max).
     #
     # Returns [Hash] Logs
-    def account_logs(options={})
-      @client.post('analytics/logs', options.to_json, { "Content-Type" => "application/json" }).to_h!
+    def account_logs(options = {})
+      @client.post('analytics/logs', options.to_json, { 'Content-Type' => 'application/json' }).to_h!
     end
   end
 end

data/lib/mailgun/messages/batch_message.rb

@@ -1,5 +1,6 @@
-module Mailgun
+# frozen_string_literal: true
 
+module Mailgun
   # A Mailgun::BatchMessage object is used to create a valid payload
   # for Batch Sending. Batch Sending can be difficult to implement, therefore
   # this code makes it dead simple to send millions of messages in batches of
@@ -18,7 +19,6 @@ module Mailgun
   #
   # See the Github documentation for full examples.
   class BatchMessage < MessageBuilder
-
     attr_reader :message_ids, :domain, :recipient_variables
 
     # Public: Creates a new BatchMessage object.
@@ -39,7 +39,8 @@ module Mailgun
     #
     # @param [String] recipient_type The type of recipient. "to".
     # @param [String] address The email address of the recipient to add to the message object.
-    # @param [Hash] variables A hash of the variables associated with the recipient. We recommend "first" and "last" at a minimum!
+    # @param [Hash] variables A hash of the variables associated with the recipient.
+    #                         We recommend "first" and "last" at a minimum!
     # @return [void]
     def add_recipient(recipient_type, address, variables = nil)
       # send the message when we have 1000, not before
@@ -68,9 +69,10 @@ module Mailgun
     #
     # @return [Boolean]
     def any_recipients_left?
-      return true if @counters[:recipients][:to] > 0
-      return true if @counters[:recipients][:cc] > 0
-      return true if @counters[:recipients][:bcc] > 0
+      return true if @counters[:recipients][:to].positive?
+      return true if @counters[:recipients][:cc].positive?
+      return true if @counters[:recipients][:bcc].positive?
+
       false
     end
 
@@ -86,7 +88,7 @@ module Mailgun
       @message[rkey] = @message[rkey].first if @message.key?(rkey)
 
       response = @client.send_message(@domain, @message).to_h!
-      message_id = response['id'].gsub(/\>|\</, '')
+      message_id = response['id'].gsub(/>|</, '')
       @message_ids[message_id] = count_recipients
       reset_message
     end
@@ -94,7 +96,7 @@ module Mailgun
     # This method stores recipient variables for each recipient added, if
     # variables exist.
     def store_recipient_variables(recipient_type, address, variables)
-      variables = { id: @counters[:recipients][recipient_type] } unless variables
+      variables ||= { id: @counters[:recipients][recipient_type] }
       @recipient_variables[address] = variables
     end
 
@@ -118,7 +120,5 @@ module Mailgun
       @counters[:recipients][:cc] = 0
       @counters[:recipients][:bcc] = 0
     end
-
   end
-
 end

data/lib/mailgun/messages/message_builder.rb

@@ -1,12 +1,12 @@
-module Mailgun
+# frozen_string_literal: true
 
+module Mailgun
   # A Mailgun::MessageBuilder object is used to create a valid payload
   # for the Mailgun API messages endpoint. If you prefer step by step message
   # generation through your code, this class is for you.
   #
   # See the Github documentation for full examples.
   class MessageBuilder
-
     attr_reader :message, :counters
 
     # Public: Creates a new MessageBuilder object.
@@ -25,16 +25,17 @@ module Mailgun
     #
     # @param [String] recipient_type The type of recipient. "to", "cc", "bcc" or "h:reply-to".
     # @param [String] address The email address of the recipient to add to the message object.
-    # @param [Hash] variables A hash of the variables associated with the recipient. We recommend "first" and "last" at a minimum!
+    # @param [Hash] variables A hash of the variables associated with the recipient.
+    #                         We recommend "first" and "last" at a minimum!
     # @return [void]
     def add_recipient(recipient_type, address, variables = nil)
-      if recipient_type == "h:reply-to"
+      if recipient_type == 'h:reply-to'
         warn 'DEPRECATION: "add_recipient("h:reply-to", ...)" is deprecated. Please use "reply_to" instead.'
         return reply_to(address, variables)
       end
 
       if (@counters[:recipients][recipient_type] || 0) >= Mailgun::Chains::MAX_RECIPIENTS
-        fail Mailgun::ParameterError, 'Too many recipients added to message.', address
+        raise Mailgun::ParameterError, 'Too many recipients added to message.', address
       end
 
       compiled_address = parse_address(address, variables)
@@ -46,7 +47,8 @@ module Mailgun
     # Sets the from address for the message
     #
     # @param [String] address The address of the sender.
-    # @param [Hash] variables A hash of the variables associated with the recipient. We recommend "first" and "last" at a minimum!
+    # @param [Hash] variables A hash of the variables associated with the recipient.
+    #                         We recommend "first" and "last" at a minimum!
     # @return [void]
     def from(address, vars = nil)
       add_recipient(:from, address, vars)
@@ -68,7 +70,7 @@ module Mailgun
     # @return [void]
     def reply_to(address, variables = nil)
       compiled_address = parse_address(address, variables)
-      header("reply-to", compiled_address)
+      header('reply-to', compiled_address)
     end
 
     # Set a subject for the message object
@@ -155,12 +157,6 @@ module Mailgun
       set_multi_simple('o:testmode', bool_lookup(mode))
     end
 
-    # Deprecated: 'set_test_mode' is depreciated. Please use 'test_mode' instead.
-    def set_test_mode(mode)
-      warn 'DEPRECATION: "set_test_mode" is deprecated. Please use "test_mode" instead.'
-      test_mode(mode)
-    end
-
     # Turn DKIM on or off per message
     #
     # @param [Boolean] mode The boolean or string value(will fix itself)
@@ -169,18 +165,15 @@ module Mailgun
       set_multi_simple('o:dkim', bool_lookup(mode))
     end
 
-    # Deprecated: 'set_dkim' is deprecated. Please use 'dkim' instead.
-    def set_dkim(mode)
-      warn 'DEPRECATION: "set_dkim" is deprecated. Please use "dkim" instead.'
-      dkim(mode)
-    end
-
     # Add campaign IDs to message. Limit of 3 per message.
     #
     # @param [String] campaign_id A defined campaign ID to add to the message.
     # @return [void]
     def add_campaign_id(campaign_id)
-      fail(Mailgun::ParameterError, 'Too many campaigns added to message.', campaign_id) if @counters[:attributes][:campaign_id] >= Mailgun::Chains::MAX_CAMPAIGN_IDS
+      if @counters[:attributes][:campaign_id] >= Mailgun::Chains::MAX_CAMPAIGN_IDS
+        raise(Mailgun::ParameterError, 'Too many campaigns added to message.',
+              campaign_id)
+      end
 
       set_multi_complex('o:campaign', campaign_id)
       @counters[:attributes][:campaign_id] += 1
@@ -192,8 +185,9 @@ module Mailgun
     # @return [void]
     def add_tag(tag)
       if @counters[:attributes][:tag] >= Mailgun::Chains::MAX_TAGS
-        fail Mailgun::ParameterError, 'Too many tags added to message.', tag
+        raise Mailgun::ParameterError, 'Too many tags added to message.', tag
       end
+
       set_multi_complex('o:tag', tag)
       @counters[:attributes][:tag] += 1
     end
@@ -208,12 +202,6 @@ module Mailgun
       set_multi_simple('o:tracking', value)
     end
 
-    # Deprecated: 'set_open_tracking' is deprecated. Please use 'track_opens' instead.
-    def set_open_tracking(tracking)
-      warn 'DEPRECATION: "set_open_tracking" is deprecated. Please use "track_opens" instead.'
-      track_opens(tracking)
-    end
-
     # Turn Click Tracking on and off, on a per message basis.
     #
     # @param [String] mode True, False, or HTML (for HTML only tracking)
@@ -224,12 +212,6 @@ module Mailgun
       set_multi_simple('o:tracking', value)
     end
 
-    # Depreciated: 'set_click_tracking. is deprecated. Please use 'track_clicks' instead.
-    def set_click_tracking(tracking)
-      warn 'DEPRECATION: "set_click_tracking" is deprecated. Please use "track_clicks" instead.'
-      track_clicks(tracking)
-    end
-
     # Enable Delivery delay on message. Specify an RFC2822 date, and Mailgun
     # will not deliver the message until that date/time. For conversion
     # options, see Ruby "Time". Example: "October 25, 2013 10:00PM CST" will
@@ -242,12 +224,6 @@ module Mailgun
       set_multi_simple('o:deliverytime', time_str.rfc2822)
     end
 
-    # Deprecated: 'set_delivery_time' is deprecated. Please use 'deliver_at' instead.
-    def set_delivery_time(timestamp)
-      warn 'DEPRECATION: "set_delivery_time" is deprecated. Please use "deliver_at" instead.'
-      deliver_at timestamp
-    end
-
     # Add custom data to the message. The data should be either a hash or JSON
     # encoded. The custom data will be added as a header to your message.
     #
@@ -255,7 +231,8 @@ module Mailgun
     # @param [Hash] data Either a hash or JSON string.
     # @return [void]
     def header(name, data)
-      fail(Mailgun::ParameterError, 'Header name for message must be specified') if name.to_s.empty?
+      raise(Mailgun::ParameterError, 'Header name for message must be specified') if name.to_s.empty?
+
       begin
         jsondata = make_json data
         set_single("h:#{name}", jsondata)
@@ -278,7 +255,8 @@ module Mailgun
     #                           can not be converted to JSON, ParameterError will be raised.
     # @return [void]
     def variable(name, data)
-      fail(Mailgun::ParameterError, 'Variable name must be specified') if name.to_s.empty?
+      raise(Mailgun::ParameterError, 'Variable name must be specified') if name.to_s.empty?
+
       begin
         jsondata = make_json data
         set_single("v:#{name}", jsondata)
@@ -308,6 +286,7 @@ module Mailgun
     def message_id(data = nil)
       key = 'h:Message-Id'
       return @message.delete(key) if data.to_s.empty?
+
       set_single(key, data)
     end
 
@@ -326,6 +305,7 @@ module Mailgun
     def template(template_name = nil)
       key = 'template'
       return @message.delete(key) if template_name.to_s.empty?
+
       set_single(key, template_name)
     end
 
@@ -337,6 +317,7 @@ module Mailgun
     def template_version(version = nil)
       key = 't:version'
       return @message.delete(key) if version.to_s.empty?
+
       set_single(key, version)
     end
 
@@ -358,7 +339,7 @@ module Mailgun
     # @param [String] value The value of the parameter.
     # @return [void]
     def set_single(parameter, value)
-      @message[parameter] = value ? value : ''
+      @message[parameter] = value || ''
     end
 
     # Sets values within the multidict, however, prevents
@@ -397,8 +378,9 @@ module Mailgun
     # @param [String] value The item to convert
     # @return [void]
     def bool_lookup(value)
-      return 'yes' if %w(true yes yep).include? value.to_s.downcase
-      return 'no' if %w(false no nope).include? value.to_s.downcase
+      return 'yes' if %w[true yes yep].include? value.to_s.downcase
+      return 'no' if %w[false no nope].include? value.to_s.downcase
+
       warn 'WARN: for bool type actions next values are preferred: true yes yep | false no nope | htmlonly'
       value
     end
@@ -409,7 +391,7 @@ module Mailgun
     # @return [void]
     def valid_json?(json_)
       JSON.parse(json_)
-      return true
+      true
     rescue JSON::ParserError
       false
     end
@@ -422,8 +404,9 @@ module Mailgun
     def make_json(obj)
       return JSON.parse(obj).to_json if obj.is_a?(String)
       return obj.to_json if obj.is_a?(Hash)
+
       JSON.generate(obj).to_json
-    rescue
+    rescue StandardError
       raise Mailgun::ParameterError, 'Provided data could not be made into JSON. Try a JSON string or Hash.', obj
     end
 
@@ -436,9 +419,9 @@ module Mailgun
     # @return [void]
     def parse_address(address, vars)
       return address unless vars.is_a? Hash
-      fail(Mailgun::ParameterError, 'Email address not specified') unless address.is_a? String
-      if vars['full_name'] != nil && (vars['first'] != nil || vars['last'] != nil)
-        fail(Mailgun::ParameterError, 'Must specify at most one of full_name or first/last. Vars passed: #{vars}')
+      raise(Mailgun::ParameterError, 'Email address not specified') unless address.is_a? String
+      if !vars['full_name'].nil? && (!vars['first'].nil? || !vars['last'].nil?)
+        raise(Mailgun::ParameterError, "Must specify at most one of full_name or first/last. Vars passed: #{vars}")
       end
 
       if vars['full_name']
@@ -448,6 +431,7 @@ module Mailgun
       end
 
       return "'#{full_name}' <#{address}>" if full_name
+
       address
     end
 
@@ -461,24 +445,24 @@ module Mailgun
     # Returns nothing
     def add_file(disposition, filedata, filename)
       attachment = File.open(filedata, 'r') if filedata.is_a?(String)
-      attachment = filedata.dup unless attachment
+      attachment ||= filedata.dup
 
-      fail(Mailgun::ParameterError,
-        'Unable to access attachment file object.'
-      ) unless attachment.respond_to?(:read)
+      unless attachment.respond_to?(:read)
+        raise(Mailgun::ParameterError,
+              'Unable to access attachment file object.')
+      end
 
       if attachment.respond_to?(:path) && !attachment.respond_to?(:content_type)
         mime_types = MiniMime.lookup_by_filename(attachment.path)
         content_type = mime_types.nil? ? 'application/octet-stream' : mime_types.content_type
-        attachment.instance_eval "def content_type; '#{content_type}'; end"
+        attachment.instance_eval "def content_type; '#{content_type}'; end", __FILE__, __LINE__
       end
 
       unless filename.nil?
         attachment.instance_variable_set :@original_filename, filename
-        attachment.instance_eval 'def original_filename; @original_filename; end'
+        attachment.instance_eval 'def original_filename; @original_filename; end', __FILE__, __LINE__
       end
       add_faraday_attachment(disposition, attachment, filename)
     end
   end
-
 end

data/lib/mailgun/metrics/metrics.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Mailgun
   # A Mailgun::Metrics object is a simple interface to Mailgun Metrics.
   # Uses Mailgun
@@ -14,7 +16,9 @@ module Mailgun
     #     start - [String] A start date (default: 7 days before current time). Must be in RFC 2822 format.
     #     end - [String] An end date (default: current time). Must be in RFC 2822 format.
     #     resolution - [String] A resolution in the format of 'day' 'hour' 'month'. Default is day.
-    #     duration - [String] A duration in the format of '1d' '2h' '2m'. If duration is provided then it is calculated from the end date and overwrites the start date.
+    #     duration - [String] A duration in the format of '1d' '2h' '2m'.
+    #                         If duration is provided then it is calculated from the end date
+    #                         and overwrites the start date.
     #     dimensions - [Array] Attributes of the metric data such as 'subaccount'.
     #     metrics - [Array] Name of the metrics to receive the stats for such as 'processed_count'
     #     filter - [Object]
@@ -28,8 +32,8 @@ module Mailgun
     #     include_aggregates - [Boolean] Include top-level aggregate metrics.
     #
     # Returns [Hash] Metrics
-    def account_metrics(options={})
-      @client.post('analytics/metrics', options.to_json, { "Content-Type" => "application/json" }).to_h!
+    def account_metrics(options = {})
+      @client.post('analytics/metrics', options.to_json, { 'Content-Type' => 'application/json' }).to_h!
     end
 
     # Public: Post query to get account usage metrics
@@ -38,7 +42,9 @@ module Mailgun
     #     start - [String] A start date (default: 7 days before current time). Must be in RFC 2822 format.
     #     end - [String] An end date (default: current time). Must be in RFC 2822 format.
     #     resolution - [String] A resolution in the format of 'day' 'hour' 'month'. Default is day.
-    #     duration - [String] A duration in the format of '1d' '2h' '2m'. If duration is provided then it is calculated from the end date and overwrites the start date.
+    #     duration - [String] A duration in the format of '1d' '2h' '2m'.
+    #                         If duration is provided then it is calculated from the end date and
+    #                         overwrites the start date.
     #     dimensions - [Array] Attributes of the metric data such as 'subaccount'.
     #     metrics - [Array] Name of the metrics to receive the stats for such as 'processed_count'
     #     filter - [Object]
@@ -52,8 +58,8 @@ module Mailgun
     #     include_aggregates - [Boolean] Include top-level aggregate metrics.
     #
     # Returns [Hash] Metrics
-    def account_usage_metrics(options={})
-      @client.post('analytics/usage/metrics', options.to_json, { "Content-Type" => "application/json" }).to_h!
+    def account_usage_metrics(options = {})
+      @client.post('analytics/usage/metrics', options.to_json, { 'Content-Type' => 'application/json' }).to_h!
     end
   end
 end

data/lib/mailgun/response.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Mailgun
   # A Mailgun::Response object is instantiated for each response generated
   # by the Client request. The Response object supports deserialization of
@@ -11,9 +13,9 @@ module Mailgun
     attr_accessor :body, :status, :code
 
     ResponseHash = Struct.new(:body, :status)
-    def self.from_hash(h)
+    def self.from_hash(hash)
       # Create a "fake" response object with the data passed from h
-      self.new ResponseHash.new(h[:body], h[:status])
+      new ResponseHash.new(hash[:body], hash[:status])
     end
 
     def initialize(response)
@@ -28,8 +30,8 @@ module Mailgun
 
     def to_h
       JSON.parse(@body)
-    rescue => err
-      raise ParseError.new(err), err
+    rescue StandardError => e
+      raise ParseError.new(e), e
     end
 
     # Replace @body with Ruby Hash
@@ -37,8 +39,8 @@ module Mailgun
     # @return [Hash] A standard Ruby Hash containing the HTTP result.
     def to_h!
       @body = JSON.parse(@body)
-    rescue => err
-      raise ParseError.new(err), err
+    rescue StandardError => e
+      raise ParseError.new(e), e
     end
 
     # Return response as Yaml
@@ -46,8 +48,8 @@ module Mailgun
     # @return [String] A string containing response as YAML
     def to_yaml
       YAML.dump(to_h)
-    rescue => err
-      raise ParseError.new(err), err
+    rescue StandardError => e
+      raise ParseError.new(e), e
     end
 
     # Replace @body with YAML
@@ -55,8 +57,8 @@ module Mailgun
     # @return [String] A string containing response as YAML
     def to_yaml!
       @body = YAML.dump(to_h)
-    rescue => err
-      raise ParseError.new(err), err
+    rescue StandardError => e
+      raise ParseError.new(e), e
     end
 
     # Returns true if response status is 2xx

data/lib/mailgun/subaccounts/subaccounts.rb

@@ -1,5 +1,6 @@
-module Mailgun
+# frozen_string_literal: true
 
+module Mailgun
   # A Mailgun::Subaccounts object is a simple CRUD interface to Mailgun Subaccounts.
   # Uses Mailgun
   class Subaccounts
@@ -22,9 +23,9 @@ module Mailgun
     #
     # Returns [Array] A list of subaccounts (hash)
     def list(options = {})
-      client.get("accounts/subaccounts", options).to_h!
+      client.get('accounts/subaccounts', options).to_h!
     end
-    alias_method :get_subaccounts, :list
+    alias get_subaccounts list
 
     # Public: Get subaccount information
     #
@@ -35,7 +36,8 @@ module Mailgun
     #
     # Returns [Hash] Information on the requested subaccount.
     def info(subaccount_id, options = {})
-      fail(ParameterError, 'No Id of subaccount specified', caller) unless subaccount_id
+      raise(ParameterError, 'No Id of subaccount specified', caller) unless subaccount_id
+
       client.get("accounts/subaccounts/#{subaccount_id}", options).to_h!
     end
 
@@ -49,8 +51,9 @@ module Mailgun
     #
     # Returns [Hash] of created subaccount
     def create(name, options = {})
-      fail(ParameterError, 'No name given to create subaccount', caller) unless name
-      client.post("accounts/subaccounts", options.merge!(name: name)).to_h!
+      raise(ParameterError, 'No name given to create subaccount', caller) unless name
+
+      client.post('accounts/subaccounts', options.merge!(name: name)).to_h!
     end
 
     # Public: Disable a subaccount
@@ -62,7 +65,8 @@ module Mailgun
     #
     # Returns [Hash] Information on the requested subaccount.
     def disable(subaccount_id, options = {})
-      fail(ParameterError, 'No Id of subaccount specified', caller) unless subaccount_id
+      raise(ParameterError, 'No Id of subaccount specified', caller) unless subaccount_id
+
       client.post("accounts/subaccounts/#{subaccount_id}/disable", options).to_h!
     end
 
@@ -75,7 +79,8 @@ module Mailgun
     #
     # Returns [Hash] Information on the requested subaccount.
     def enable(subaccount_id, options = {})
-      fail(ParameterError, 'No Id of subaccount specified', caller) unless subaccount_id
+      raise(ParameterError, 'No Id of subaccount specified', caller) unless subaccount_id
+
       client.post("accounts/subaccounts/#{subaccount_id}/enable", options).to_h!
     end
   end