actionmailbox 6.1.7.8 → 7.0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c90809181adbe1f694e87e9b1640725d1789f9594fa0ed2a707dce15aba7299
-  data.tar.gz: 0e4d633f7cf306512b4958523b1ae3cde2106f570de8d9cfaebef15e89475e1e
+  metadata.gz: 23efdbd3b90be259dd58527560d3caaaaffb6fb1b63f8c92807f1991b7b6e8a4
+  data.tar.gz: a176f2143a3317bdc719453ab1f7d7284103a2101663b66543164dbd2c1a5ec9
 SHA512:
-  metadata.gz: bd833e1c59cf4a1ea0c99cd7b72e0c9956ad19ba2fbcfd9f442343469fbcaebf56f098a10bd35a6003350690e4799c5e4ad56b8fb86d605b914ccac7d7e4f35f
-  data.tar.gz: 6752fbc23193c01e98d43cdd855cd6a5d6d40121c2d0c4ea85267e14b564ca228d4f670784b70b7c29cf8771c93152244bfc36d46b33471d403212f501775106
+  metadata.gz: 1f62a0f450f41b47001d60bd71d29e0779e2b02343e252ba8d762102d37d1bceef8918506d6207951232397cf159652a82a4ff4ac507ccadf6a052568839f71e
+  data.tar.gz: d4adf49ece702130dfc0ac23b5ffd3f753944bbe6f6859c065eee4cc7788d99b572d6fea3d4d796b043768da3d267f79adc6642b3e29ed45f335b368ada65c5c

data/CHANGELOG.md

@@ -1,186 +1,185 @@
-## Rails 6.1.7.8 (June 04, 2024) ##
+## Rails 7.0.8.4 (June 04, 2024) ##
 
 *   No changes.
 
 
-## Rails 6.1.7.7 (February 21, 2024) ##
+## Rails 7.0.8.3 (May 17, 2024) ##
 
 *   No changes.
 
 
-## Rails 6.1.7.6 (August 22, 2023) ##
+## Rails 7.0.8.2 (May 16, 2024) ##
 
 *   No changes.
 
 
-## Rails 6.1.7.5 (August 22, 2023) ##
+## Rails 7.0.8.1 (February 21, 2024) ##
 
 *   No changes.
 
 
-## Rails 6.1.7.4 (June 26, 2023) ##
+## Rails 7.0.8 (September 09, 2023) ##
 
 *   No changes.
 
 
-## Rails 6.1.7.3 (March 13, 2023) ##
+## Rails 7.0.7.2 (August 22, 2023) ##
 
 *   No changes.
 
 
-## Rails 6.1.7.2 (January 24, 2023) ##
+## Rails 7.0.7.1 (August 22, 2023) ##
 
 *   No changes.
 
 
-## Rails 6.1.7.1 (January 17, 2023) ##
+## Rails 7.0.7 (August 09, 2023) ##
 
 *   No changes.
 
 
-## Rails 6.1.7 (September 09, 2022) ##
+## Rails 7.0.6 (June 29, 2023) ##
 
 *   No changes.
 
 
-## Rails 6.1.6.1 (July 12, 2022) ##
+## Rails 7.0.5.1 (June 26, 2023) ##
 
 *   No changes.
 
 
-## Rails 6.1.6 (May 09, 2022) ##
+## Rails 7.0.5 (May 24, 2023) ##
 
 *   No changes.
 
 
-## Rails 6.1.5.1 (April 26, 2022) ##
+## Rails 7.0.4.3 (March 13, 2023) ##
 
 *   No changes.
 
 
-## Rails 6.1.5 (March 09, 2022) ##
-
-*   Add `attachments` to the list of permitted parameters for inbound emails conductor.
-
-    When using the conductor to test inbound emails with attachments, this prevents an
-    unpermitted parameter warning in default configurations, and prevents errors for
-    applications that set:
-
-    ```ruby
-    config.action_controller.action_on_unpermitted_parameters = :raise
-    ```
-
-    *David Jones*, *Dana Henke*
-
-
-## Rails 6.1.4.7 (March 08, 2022) ##
+## Rails 7.0.4.2 (January 24, 2023) ##
 
 *   No changes.
 
 
-## Rails 6.1.4.6 (February 11, 2022) ##
+## Rails 7.0.4.1 (January 17, 2023) ##
 
 *   No changes.
 
 
-## Rails 6.1.4.5 (February 11, 2022) ##
+## Rails 7.0.4 (September 09, 2022) ##
 
 *   No changes.
 
 
-## Rails 6.1.4.4 (December 15, 2021) ##
+## Rails 7.0.3.1 (July 12, 2022) ##
 
 *   No changes.
 
 
-## Rails 6.1.4.3 (December 14, 2021) ##
+## Rails 7.0.3 (May 09, 2022) ##
 
 *   No changes.
 
 
-## Rails 6.1.4.2 (December 14, 2021) ##
+## Rails 7.0.2.4 (April 26, 2022) ##
 
 *   No changes.
 
 
-## Rails 6.1.4.1 (August 19, 2021) ##
+## Rails 7.0.2.3 (March 08, 2022) ##
 
 *   No changes.
 
 
-## Rails 6.1.4 (June 24, 2021) ##
+## Rails 7.0.2.2 (February 11, 2022) ##
 
 *   No changes.
 
 
-## Rails 6.1.3.2 (May 05, 2021) ##
+## Rails 7.0.2.1 (February 11, 2022) ##
 
 *   No changes.
 
 
-## Rails 6.1.3.1 (March 26, 2021) ##
+## Rails 7.0.2 (February 08, 2022) ##
 
 *   No changes.
 
 
-## Rails 6.1.3 (February 17, 2021) ##
+## Rails 7.0.1 (January 06, 2022) ##
 
 *   No changes.
 
 
-## Rails 6.1.2.1 (February 10, 2021) ##
+## Rails 7.0.0 (December 15, 2021) ##
 
 *   No changes.
 
 
-## Rails 6.1.2 (February 09, 2021) ##
+## Rails 7.0.0.rc3 (December 14, 2021) ##
 
 *   No changes.
 
 
-## Rails 6.1.1 (January 07, 2021) ##
+## Rails 7.0.0.rc2 (December 14, 2021) ##
 
 *   No changes.
 
+## Rails 7.0.0.rc1 (December 06, 2021) ##
 
-## Rails 6.1.0 (December 09, 2020) ##
+*   Removed deprecated environment variable `MAILGUN_INGRESS_API_KEY`.
 
-*   Change default queue name of the incineration (`:action_mailbox_incineration`) and
-    routing (`:action_mailbox_routing`) jobs to be the job adapter's default (`:default`).
+    *Rafael Mendonça França*
+
+*   Removed deprecated `Rails.application.credentials.action_mailbox.mailgun_api_key`.
 
     *Rafael Mendonça França*
 
-*   Sendgrid ingress now passes through the envelope recipient as `X-Original-To`.
 
-    *Mark Haussmann*
+## Rails 7.0.0.alpha2 (September 15, 2021) ##
+
+*   No changes.
 
-*   Update Mandrill inbound email route to respond appropriately to HEAD requests for URL health checks from Mandrill.
 
-    *Bill Cromie*
+## Rails 7.0.0.alpha1 (September 15, 2021) ##
 
-*   Add way to deliver emails via source instead of filling out a form through the conductor interface.
+*   Add `attachments` to the list of permitted parameters for inbound emails conductor.
 
-    *DHH*
+    When using the conductor to test inbound emails with attachments, this prevents an
+    unpermitted parameter warning in default configurations, and prevents errors for
+    applications that set:
 
-*   Mailgun ingress now passes through the envelope recipient as `X-Original-To`.
+    ```ruby
+    config.action_controller.action_on_unpermitted_parameters = :raise
+    ```
 
-    *Rikki Pitt*
+    *David Jones*, *Dana Henke*
 
-*   Deprecate `Rails.application.credentials.action_mailbox.api_key` and `MAILGUN_INGRESS_API_KEY` in favor of `Rails.application.credentials.action_mailbox.signing_key` and `MAILGUN_INGRESS_SIGNING_KEY`.
+*   Add ability to configure ActiveStorage service
+    for storing email raw source.
 
-    *Matthijs Vos*
+    ```yml
+    # config/storage.yml
+    incoming_emails:
+      service: Disk
+      root: /secure/dir/for/emails/only
+    ```
 
-*   Allow easier creation of multi-part emails from the `create_inbound_email_from_mail` and `receive_inbound_email_from_mail` test helpers.
+    ```ruby
+    config.action_mailbox.storage_service = :incoming_emails
+    ```
 
-    *Michael Herold*
+    *Yurii Rashkovskii*
 
-*   Fix Bcc header not being included with emails from `create_inbound_email_from` test helpers.
+*   Add ability to incinerate an inbound message through the conductor interface.
 
-    *jduff*
+    *Santiago Bartesaghi*
 
-*   Add `ApplicationMailbox.mailbox_for` to expose mailbox routing.
+*   OpenSSL constants are now used for Digest computations.
 
-    *James Dabbs*
+    *Dirkjan Bussink*
 
 
-Please check [6-0-stable](https://github.com/rails/rails/blob/6-0-stable/actionmailbox/CHANGELOG.md) for previous changes.
+Please check [6-1-stable](https://github.com/rails/rails/blob/6-1-stable/actionmailbox/CHANGELOG.md) for previous changes.

data/app/controllers/action_mailbox/base_controller.rb

@@ -3,7 +3,7 @@
 module ActionMailbox
   # The base class for all Action Mailbox ingress controllers.
   class BaseController < ActionController::Base
-    skip_forgery_protection if default_protect_from_forgery
+    skip_forgery_protection
 
     before_action :ensure_configured
 

data/app/controllers/action_mailbox/ingresses/mailgun/inbound_emails_controller.rb

@@ -77,21 +77,7 @@ module ActionMailbox
       end
 
       def key
-        if Rails.application.credentials.dig(:action_mailbox, :mailgun_api_key)
-          ActiveSupport::Deprecation.warn(<<-MSG.squish)
-            Rails.application.credentials.action_mailbox.api_key is deprecated and will be ignored in Rails 7.0.
-            Use Rails.application.credentials.action_mailbox.signing_key instead.
-          MSG
-          Rails.application.credentials.dig(:action_mailbox, :mailgun_api_key)
-        elsif ENV["MAILGUN_INGRESS_API_KEY"]
-          ActiveSupport::Deprecation.warn(<<-MSG.squish)
-            The MAILGUN_INGRESS_API_KEY environment variable is deprecated and will be ignored in Rails 7.0.
-            Use MAILGUN_INGRESS_SIGNING_KEY instead.
-          MSG
-          ENV["MAILGUN_INGRESS_API_KEY"]
-        else
-          Rails.application.credentials.dig(:action_mailbox, :mailgun_signing_key) || ENV["MAILGUN_INGRESS_SIGNING_KEY"]
-        end
+        Rails.application.credentials.dig(:action_mailbox, :mailgun_signing_key) || ENV["MAILGUN_INGRESS_SIGNING_KEY"]
       end
 
       class Authenticator

data/app/controllers/action_mailbox/ingresses/relay/inbound_emails_controller.rb

@@ -57,7 +57,7 @@ module ActionMailbox
 
     private
       def require_valid_rfc822_message
-        unless request.content_type == "message/rfc822"
+        unless request.media_type == "message/rfc822"
           head :unsupported_media_type
         end
       end

data/app/controllers/rails/conductor/action_mailbox/inbound_emails_controller.rb

@@ -22,7 +22,7 @@ module Rails
       def new_mail
         Mail.new(mail_params.except(:attachments).to_h).tap do |mail|
           mail[:bcc]&.include_in_headers = true
-          mail_params[:attachments].to_a.each do |attachment|
+          mail_params[:attachments]&.select(&:present?)&.each do |attachment|
             mail.add_file(filename: attachment.original_filename, content: attachment.read)
           end
         end

data/app/controllers/rails/conductor/action_mailbox/incinerates_controller.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Rails
+  # Incinerating will destroy an email that is due and has already been processed.
+  class Conductor::ActionMailbox::IncineratesController < Rails::Conductor::BaseController
+    def create
+      ActionMailbox::InboundEmail.find(params[:inbound_email_id]).incinerate
+
+      redirect_to main_app.rails_conductor_inbound_emails_url
+    end
+  end
+end

data/app/models/action_mailbox/inbound_email/message_id.rb

@@ -14,12 +14,11 @@ module ActionMailbox::InboundEmail::MessageId
     # attachment called +raw_email+. Before the upload, extract the Message-ID from the +source+ and set
     # it as an attribute on the new +InboundEmail+.
     def create_and_extract_message_id!(source, **options)
-      message_checksum = Digest::SHA1.hexdigest(source)
+      message_checksum = OpenSSL::Digest::SHA1.hexdigest(source)
       message_id = extract_message_id(source) || generate_missing_message_id(message_checksum)
 
-      create! options.merge(message_id: message_id, message_checksum: message_checksum) do |inbound_email|
-        inbound_email.raw_email.attach io: StringIO.new(source), filename: "message.eml", content_type: "message/rfc822"
-      end
+      create! raw_email: create_and_upload_raw_email!(source),
+        message_id: message_id, message_checksum: message_checksum, **options
     rescue ActiveRecord::RecordNotUnique
       nil
     end
@@ -34,5 +33,10 @@ module ActionMailbox::InboundEmail::MessageId
           logger.warn "Message-ID couldn't be parsed or is missing. Generated a new Message-ID: #{message_id}"
         end
       end
+
+      def create_and_upload_raw_email!(source)
+        ActiveStorage::Blob.create_and_upload! io: StringIO.new(source), filename: "message.eml", content_type: "message/rfc822",
+                                               service_name: ActionMailbox.storage_service
+      end
   end
 end

data/app/models/action_mailbox/inbound_email.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "action_mailbox/mail_with_error_handling"
+require "mail"
 
 module ActionMailbox
   # The +InboundEmail+ is an Active Record that keeps a reference to the raw email stored in Active Storage
@@ -29,7 +29,7 @@ module ActionMailbox
 
     include Incineratable, MessageId, Routable
 
-    has_one_attached :raw_email
+    has_one_attached :raw_email, service: ActionMailbox.storage_service
     enum status: %i[ pending processing delivered failed bounced ]
 
     def mail

data/app/models/action_mailbox/record.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module ActionMailbox
-  class Record < ActiveRecord::Base #:nodoc:
+  class Record < ActiveRecord::Base # :nodoc:
     self.abstract_class = true
   end
 end

data/app/views/rails/conductor/action_mailbox/inbound_emails/show.html.erb

@@ -4,7 +4,7 @@
 
 <ul>
   <li><%= button_to "Route again", main_app.rails_conductor_inbound_email_reroute_path(@inbound_email), method: :post %></li>
-  <li>Incinerate</li>
+  <li><%= button_to "Incinerate", main_app.rails_conductor_inbound_email_incinerate_path(@inbound_email), method: :post %></li>
 </ul>
 
 <details>

data/config/routes.rb

@@ -21,5 +21,6 @@ Rails.application.routes.draw do
     post "inbound_emails/sources", to: "inbound_emails/sources#create", as: :rails_conductor_inbound_email_sources
 
     post ":inbound_email_id/reroute" => "reroutes#create", as: :rails_conductor_inbound_email_reroute
+    post ":inbound_email_id/incinerate" => "incinerates#create", as: :rails_conductor_inbound_email_incinerate
   end
 end

data/lib/action_mailbox/base.rb

@@ -27,7 +27,7 @@ module ActionMailbox
   #     routing :all => :backstop
   #   end
   #
-  # Application mailboxes need to overwrite the +#process+ method, which is invoked by the framework after
+  # Application mailboxes need to override the #process method, which is invoked by the framework after
   # callbacks have been run. The callbacks available are: +before_processing+, +after_processing+, and
   # +around_processing+. The primary use case is ensure certain preconditions to processing are fulfilled
   # using +before_processing+ callbacks.
@@ -35,7 +35,7 @@ module ActionMailbox
   # If a precondition fails to be met, you can halt the processing using the +#bounced!+ method,
   # which will silently prevent any further processing, but not actually send out any bounce notice. You
   # can also pair this behavior with the invocation of an Action Mailer class responsible for sending out
-  # an actual bounce email. This is done using the +#bounce_with+ method, which takes the mail object returned
+  # an actual bounce email. This is done using the #bounce_with method, which takes the mail object returned
   # by an Action Mailer method, like so:
   #
   #   class ForwardsMailbox < ApplicationMailbox
@@ -51,11 +51,12 @@ module ActionMailbox
   #
   # During the processing of the inbound email, the status will be tracked. Before processing begins,
   # the email will normally have the +pending+ status. Once processing begins, just before callbacks
-  # and the +#process+ method is called, the status is changed to +processing+. If processing is allowed to
+  # and the #process method is called, the status is changed to +processing+. If processing is allowed to
   # complete, the status is changed to +delivered+. If a bounce is triggered, then +bounced+. If an unhandled
   # exception is bubbled up, then +failed+.
   #
-  # Exceptions can be handled at the class level using the familiar +Rescuable+ approach:
+  # Exceptions can be handled at the class level using the familiar
+  # ActiveSupport::Rescuable approach:
   #
   #   class ForwardsMailbox < ApplicationMailbox
   #     rescue_from(ApplicationSpecificVerificationError) { bounced! }
@@ -77,7 +78,7 @@ module ActionMailbox
       @inbound_email = inbound_email
     end
 
-    def perform_processing #:nodoc:
+    def perform_processing # :nodoc:
       track_status_of_inbound_email do
         run_callbacks :process do
           process
@@ -89,10 +90,10 @@ module ActionMailbox
     end
 
     def process
-      # Overwrite in subclasses
+      # Override in subclasses
     end
 
-    def finished_processing? #:nodoc:
+    def finished_processing? # :nodoc:
       inbound_email.delivered? || inbound_email.bounced?
     end
 

data/lib/action_mailbox/engine.rb

@@ -20,6 +20,8 @@ module ActionMailbox
     config.action_mailbox.queues = ActiveSupport::InheritableOptions.new \
       incineration: :action_mailbox_incineration, routing: :action_mailbox_routing
 
+    config.action_mailbox.storage_service = nil
+
     initializer "action_mailbox.config" do
       config.after_initialize do |app|
         ActionMailbox.logger = app.config.action_mailbox.logger || Rails.logger
@@ -27,6 +29,7 @@ module ActionMailbox
         ActionMailbox.incinerate_after = app.config.action_mailbox.incinerate_after || 30.days
         ActionMailbox.queues = app.config.action_mailbox.queues || {}
         ActionMailbox.ingress = app.config.action_mailbox.ingress
+        ActionMailbox.storage_service = app.config.action_mailbox.storage_service
       end
     end
   end

data/lib/action_mailbox/gem_version.rb

@@ -1,16 +1,16 @@
 # frozen_string_literal: true
 
 module ActionMailbox
-  # Returns the currently-loaded version of Action Mailbox as a <tt>Gem::Version</tt>.
+  # Returns the currently loaded version of Action Mailbox as a <tt>Gem::Version</tt>.
   def self.gem_version
     Gem::Version.new VERSION::STRING
   end
 
   module VERSION
-    MAJOR = 6
-    MINOR = 1
-    TINY  = 7
-    PRE   = "8"
+    MAJOR = 7
+    MINOR = 0
+    TINY  = 8
+    PRE   = "4"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/action_mailbox/mail_ext/addresses.rb

@@ -3,7 +3,7 @@
 module Mail
   class Message
     def from_address
-      header[:from]&.address_list&.addresses&.first
+      address_list(header[:from])&.addresses&.first
     end
 
     def recipients_addresses
@@ -11,19 +11,30 @@ module Mail
     end
 
     def to_addresses
-      Array(header[:to]&.address_list&.addresses)
+      Array(address_list(header[:to])&.addresses)
     end
 
     def cc_addresses
-      Array(header[:cc]&.address_list&.addresses)
+      Array(address_list(header[:cc])&.addresses)
     end
 
     def bcc_addresses
-      Array(header[:bcc]&.address_list&.addresses)
+      Array(address_list(header[:bcc])&.addresses)
     end
 
     def x_original_to_addresses
       Array(header[:x_original_to]).collect { |header| Mail::Address.new header.to_s }
     end
+
+    private
+      def address_list(obj)
+        if obj&.respond_to?(:element)
+          # Mail 2.8+
+          obj.element
+        else
+          # Mail <= 2.7.x
+          obj&.address_list
+        end
+      end
   end
 end

data/lib/action_mailbox/mail_ext.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "action_mailbox/mail_with_error_handling"
+require "mail"
 
 # The hope is to upstream most of these basic additions to the Mail gem's Mail object. But until then, here they lay!
 Dir["#{File.expand_path(File.dirname(__FILE__))}/mail_ext/*"].each { |path| require "action_mailbox/mail_ext/#{File.basename(path)}" }

data/lib/action_mailbox/router/route.rb

@@ -2,7 +2,7 @@
 
 module ActionMailbox
   # Encapsulates a route, which can then be matched against an inbound_email and provide a lookup of the matching
-  # mailbox class. See examples for the different route addresses and how to use them in the +ActionMailbox::Base+
+  # mailbox class. See examples for the different route addresses and how to use them in the ActionMailbox::Base
   # documentation.
   class Router::Route
     attr_reader :address, :mailbox_name

data/lib/action_mailbox/routing.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module ActionMailbox
-  # See +ActionMailbox::Base+ for how to specify routing.
+  # See ActionMailbox::Base for how to specify routing.
   module Routing
     extend ActiveSupport::Concern
 

data/lib/action_mailbox/test_helper.rb

@@ -4,18 +4,18 @@ require "mail"
 
 module ActionMailbox
   module TestHelper
-    # Create an +InboundEmail+ record using an eml fixture in the format of message/rfc822
+    # Create an InboundEmail record using an eml fixture in the format of message/rfc822
     # referenced with +fixture_name+ located in +test/fixtures/files/fixture_name+.
     def create_inbound_email_from_fixture(fixture_name, status: :processing)
       create_inbound_email_from_source file_fixture(fixture_name).read, status: status
     end
 
-    # Creates an +InboundEmail+ by specifying through options or a block.
+    # Creates an InboundEmail by specifying through options or a block.
     #
     # ==== Options
     #
-    # * <tt>:status</tt> - The +status+ to set for the created +InboundEmail+.
-    #   For possible statuses, see {its documentation}[rdoc-ref:ActionMailbox::InboundEmail].
+    # * <tt>:status</tt> - The +status+ to set for the created InboundEmail.
+    #   For possible statuses, see its documentation.
     #
     # ==== Creating a simple email
     #
@@ -68,26 +68,25 @@ module ActionMailbox
       create_inbound_email_from_source mail.to_s, status: status
     end
 
-    # Create an +InboundEmail+ using the raw rfc822 +source+ as text.
+    # Create an InboundEmail using the raw rfc822 +source+ as text.
     def create_inbound_email_from_source(source, status: :processing)
       ActionMailbox::InboundEmail.create_and_extract_message_id! source, status: status
     end
 
 
-    # Create an +InboundEmail+ from fixture using the same arguments as +create_inbound_email_from_fixture+
+    # Create an InboundEmail from fixture using the same arguments as create_inbound_email_from_fixture
     # and immediately route it to processing.
     def receive_inbound_email_from_fixture(*args)
       create_inbound_email_from_fixture(*args).tap(&:route)
     end
 
-    # Create an +InboundEmail+ using the same options or block as
-    # {create_inbound_email_from_mail}[rdoc-ref:#create_inbound_email_from_mail],
-    # then immediately route it for processing.
+    # Create an InboundEmail using the same options or block as
+    # create_inbound_email_from_mail, then immediately route it for processing.
     def receive_inbound_email_from_mail(**kwargs, &block)
       create_inbound_email_from_mail(**kwargs, &block).tap(&:route)
     end
 
-    # Create an +InboundEmail+ using the same arguments as +create_inbound_email_from_source+ and immediately route it
+    # Create an InboundEmail using the same arguments as create_inbound_email_from_source and immediately route it
     # to processing.
     def receive_inbound_email_from_source(*args)
       create_inbound_email_from_source(*args).tap(&:route)

data/lib/action_mailbox/version.rb

@@ -3,7 +3,7 @@
 require_relative "gem_version"
 
 module ActionMailbox
-  # Returns the currently-loaded version of Action Mailbox as a <tt>Gem::Version</tt>.
+  # Returns the currently loaded version of Action Mailbox as a <tt>Gem::Version</tt>.
   def self.version
     gem_version
   end

data/lib/action_mailbox.rb

@@ -14,4 +14,5 @@ module ActionMailbox
   mattr_accessor :incinerate, default: true
   mattr_accessor :incinerate_after, default: 30.days
   mattr_accessor :queues, default: {}
+  mattr_accessor :storage_service
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: actionmailbox
 version: !ruby/object:Gem::Version
-  version: 6.1.7.8
+  version: 7.0.8.4
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -17,70 +17,70 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.7.8
+        version: 7.0.8.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.7.8
+        version: 7.0.8.4
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.7.8
+        version: 7.0.8.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.7.8
+        version: 7.0.8.4
 - !ruby/object:Gem::Dependency
   name: activestorage
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.7.8
+        version: 7.0.8.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.7.8
+        version: 7.0.8.4
 - !ruby/object:Gem::Dependency
   name: activejob
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.7.8
+        version: 7.0.8.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.7.8
+        version: 7.0.8.4
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.7.8
+        version: 7.0.8.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.7.8
+        version: 7.0.8.4
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
@@ -95,6 +95,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.7.1
+- !ruby/object:Gem::Dependency
+  name: net-imap
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: net-pop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: net-smtp
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Receive and process incoming emails in Rails applications.
 email:
 - david@loudthinking.com
@@ -114,6 +156,7 @@ files:
 - app/controllers/action_mailbox/ingresses/sendgrid/inbound_emails_controller.rb
 - app/controllers/rails/conductor/action_mailbox/inbound_emails/sources_controller.rb
 - app/controllers/rails/conductor/action_mailbox/inbound_emails_controller.rb
+- app/controllers/rails/conductor/action_mailbox/incinerates_controller.rb
 - app/controllers/rails/conductor/action_mailbox/reroutes_controller.rb
 - app/controllers/rails/conductor/base_controller.rb
 - app/jobs/action_mailbox/incineration_job.rb
@@ -142,7 +185,6 @@ files:
 - lib/action_mailbox/mail_ext/addresses.rb
 - lib/action_mailbox/mail_ext/from_source.rb
 - lib/action_mailbox/mail_ext/recipients.rb
-- lib/action_mailbox/mail_with_error_handling.rb
 - lib/action_mailbox/relayer.rb
 - lib/action_mailbox/router.rb
 - lib/action_mailbox/router/route.rb
@@ -164,10 +206,10 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails/rails/issues
-  changelog_uri: https://github.com/rails/rails/blob/v6.1.7.8/actionmailbox/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v6.1.7.8/
+  changelog_uri: https://github.com/rails/rails/blob/v7.0.8.4/actionmailbox/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v7.0.8.4/
   mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v6.1.7.8/actionmailbox
+  source_code_uri: https://github.com/rails/rails/tree/v7.0.8.4/actionmailbox
   rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
@@ -177,7 +219,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/action_mailbox/mail_with_error_handling.rb

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-begin
-  require "mail"
-rescue LoadError => error
-  if error.message.match?(/net\/smtp/)
-    $stderr.puts "You don't have net-smtp installed in your application. Please add it to your Gemfile and run bundle install"
-    raise
-  end
-end