mailgun-ruby 1.4.1 → 1.4.2

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
 
@@ -68,8 +71,9 @@ module Mailgun
     # 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 +86,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 +100,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 +114,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 +128,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.2'
 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)

data/lib/mailgun.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # require ruby dependencies
 require 'json'
 require 'openssl'
@@ -16,7 +18,7 @@ require 'mailgun/exceptions/exceptions'
 require 'mailgun/helpers/api_version_checker'
 
 # load zeitwerk
-Zeitwerk::Loader.for_gem.tap do |loader| # rubocop:disable Style/SymbolProc
+Zeitwerk::Loader.for_gem.tap do |loader|
   loader.ignore("#{__dir__}/mailgun-ruby.rb")
   loader.ignore("#{__dir__}/railgun.rb")
   loader.ignore("#{__dir__}/railgun")
@@ -41,7 +43,6 @@ end
 #
 # See the Github documentation for full examples.
 module Mailgun
-
   class << self
     attr_accessor :api_host,
                   :api_key,
@@ -56,7 +57,6 @@ module Mailgun
       yield self
       true
     end
-    alias_method :config, :configure
+    alias config configure
   end
-
 end

data/lib/railgun/attachment.rb

@@ -1,7 +1,7 @@
-module Railgun
+# frozen_string_literal: true
 
+module Railgun
   class Attachment < StringIO
-
     attr_reader :filename, :content_type, :path,
                 :original_filename, :overwritten_filename
 
@@ -9,17 +9,15 @@ module Railgun
       @path = ''
       @inline = args.detect { |opt| opt[:inline] }
 
-      if @inline
-        @filename = attachment.cid
-      else
-        @filename = attachment.filename
-      end
+      @filename = if @inline
+                    attachment.cid
+                  else
+                    attachment.filename
+                  end
 
       @original_filename = @filename
 
-      if args.detect { |opt| opt[:filename] }
-        @filename = opt[:filename]
-      end
+      @filename = opt[:filename] if args.detect { |opt| opt[:filename] }
 
       @overwritten_filename = @filename
 
@@ -41,9 +39,7 @@ module Railgun
     end
 
     def attach_to_message!(mb)
-      if mb.nil?
-        nil
-      end
+      nil if mb.nil?
 
       if inline?
         mb.add_inline_image self, @filename
@@ -51,6 +47,5 @@ module Railgun
         mb.add_attachment self, @filename
       end
     end
-
   end
 end

data/lib/railgun/errors.rb

@@ -1,7 +1,7 @@
-module Railgun
+# frozen_string_literal: true
 
+module Railgun
   class Error < StandardError
-
     attr_reader :object
 
     def initialize(message = nil, object = nil)
@@ -15,7 +15,6 @@ module Railgun
   end
 
   class InternalError < Error
-
     attr_reader :source_exception
 
     def initialize(source_exc, message = nil, object = nil)

data/lib/railgun/mailer.rb

@@ -1,11 +1,11 @@
-module Railgun
+# frozen_string_literal: true
 
+module Railgun
   # Railgun::Mailer is an ActionMailer provider for sending mail through
   # Mailgun.
   class Mailer
-
     # List of the headers that will be ignored when copying headers from `mail.header_fields`
-    IGNORED_HEADERS = %w[ to from subject reply-to mime-version template ]
+    IGNORED_HEADERS = %w[to from subject reply-to mime-version template].freeze
 
     # [Hash] config ->
     #   Requires *at least* `api_key` and `domain` keys.
@@ -17,15 +17,15 @@ module Railgun
     def initialize(config)
       @config = config
 
-      [:api_key, :domain].each do |k|
-        raise Railgun::ConfigurationError.new("Config requires `#{k}` key", @config) unless @config.has_key?(k)
+      %i[api_key domain].each do |k|
+        raise Railgun::ConfigurationError.new("Config requires `#{k}` key", @config) unless @config.key?(k)
       end
 
       @mg_client = Mailgun::Client.new(
         config[:api_key],
         config[:api_host] || 'api.mailgun.net',
         config[:api_version] || 'v3',
-        config[:api_ssl].nil? ? true : config[:api_ssl],
+        config[:api_ssl].nil? || config[:api_ssl],
         false,
         config[:timeout]
       )
@@ -34,10 +34,10 @@ module Railgun
       # To avoid exception in mail gem v2.6
       @settings = { return_response: true }
 
-      if (@config[:fake_message_send] || false)
-        Rails.logger.info "NOTE: fake message sending has been enabled for mailgun-ruby!"
-        @mg_client.enable_test_mode!
-      end
+      return unless @config[:fake_message_send] || false
+
+      Rails.logger.info 'NOTE: fake message sending has been enabled for mailgun-ruby!'
+      @mg_client.enable_test_mode!
     end
 
     def deliver!(mail)
@@ -52,7 +52,7 @@ module Railgun
       mg_message = Railgun.transform_for_mailgun(mail)
       response = @mg_client.send_message(@mg_domain, mg_message)
 
-      if response.code == 200 then
+      if response.code == 200
         mg_id = response.to_h['id']
         mail.message_id = mg_id
       end
@@ -68,9 +68,9 @@ module Railgun
     # Set @mg_domain from mail[:domain] header if present, then remove it to prevent being sent.
     def set_mg_domain(mail)
       return mail[:domain].value if mail[:domain]
+
       domain
     end
-
   end
 
   module_function
@@ -102,7 +102,7 @@ module Railgun
     # note: this will filter out parameters such as `from`, `to`, and so forth
     #       as they are accepted as POST parameters on the message endpoint.
 
-    msg_headers = Hash.new
+    msg_headers = {}
 
     # h:* attributes (headers)
 
@@ -111,11 +111,11 @@ module Railgun
     mail.headers(mail.mailgun_headers || {})
     mail.header_fields.each do |field|
       header = field.name.downcase
-      if msg_headers.include? header
-        msg_headers[header] = [msg_headers[header], field.value].flatten
-      else
-        msg_headers[header] = field.value
-      end
+      msg_headers[header] = if msg_headers.include? header
+                              [msg_headers[header], field.value].flatten
+                            else
+                              field.value
+                            end
     end
 
     msg_headers.each do |k, v|
@@ -140,7 +140,7 @@ module Railgun
     message['recipient-variables'] = mail.mailgun_recipient_variables.to_json if mail.mailgun_recipient_variables
 
     # reject blank values
-    message.delete_if do |k, v|
+    message.delete_if do |_k, v|
       next true if v.nil?
 
       # if it's an array remove empty elements
@@ -149,7 +149,7 @@ module Railgun
       v.respond_to?(:empty?) && v.empty?
     end
 
-    return message
+    message
   end
 
   # Acts on a Rails/ActionMailer message object and uses Mailgun::MessageBuilder
@@ -169,7 +169,7 @@ module Railgun
     mb.body_text extract_body_text(mail)
     mb.amp_html extract_amp_html(mail)
 
-    [:to, :cc, :bcc].each do |rcpt_type|
+    %i[to cc bcc].each do |rcpt_type|
       addrs = mail[rcpt_type] || nil
       case addrs
       when String
@@ -196,7 +196,7 @@ module Railgun
       attach.attach_to_message! mb
     end
 
-    return mb.message
+    mb.message
   end
 
   # Returns the decoded HTML body from the Mail::Message object if available,
@@ -206,11 +206,9 @@ module Railgun
   #
   # @return [String]
   def extract_body_html(mail)
-    begin
-      retrieve_html_part(mail).body.decoded || nil
-    rescue
-      nil
-    end
+    retrieve_html_part(mail).body.decoded || nil
+  rescue StandardError
+    nil
   end
 
   # Returns the decoded text body from the Mail::Message object if it is available,
@@ -220,11 +218,9 @@ module Railgun
   #
   # @return [String]
   def extract_body_text(mail)
-    begin
-      retrieve_text_part(mail).body.decoded || nil
-    rescue
-      nil
-    end
+    retrieve_text_part(mail).body.decoded || nil
+  rescue StandardError
+    nil
   end
 
   # Returns the decoded AMP HTML from the Mail::Message object if it is available,
@@ -234,11 +230,9 @@ module Railgun
   #
   # @return [String]
   def extract_amp_html(mail)
-    begin
-      retrieve_amp_part(mail).body.decoded || nil
-    rescue
-      nil
-    end
+    retrieve_amp_part(mail).body.decoded || nil
+  rescue StandardError
+    nil
   end
 
   # Returns the mail object from the Mail::Message object if text part exists,
@@ -250,7 +244,8 @@ module Railgun
   # @return [Mail::Message] mail message with its content-type = text/plain
   def retrieve_text_part(mail)
     return mail.text_part if mail.multipart?
-    (mail.mime_type =~ /^text\/plain$/i) && mail
+
+    (mail.mime_type =~ %r{^text/plain$}i) && mail
   end
 
   # Returns the mail object from the Mail::Message object if html part exists,
@@ -262,7 +257,8 @@ module Railgun
   # @return [Mail::Message] mail message with its content-type = text/html
   def retrieve_html_part(mail)
     return mail.html_part if mail.multipart?
-    (mail.mime_type =~ /^text\/html$/i) && mail
+
+    (mail.mime_type =~ %r{^text/html$}i) && mail
   end
 
   # Returns the mail object from the Mail::Message object if AMP part exists,