actionmailbox 6.0.6.1 → 6.1.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d00281a6983c176229ac802d85296f5c4e4b0f5d660f40b0691bb663d670e83
-  data.tar.gz: af54f053968f0641a2d6e6e5dae9551ba7897a03dff4abfa429cfd3628ee4109
+  metadata.gz: b570090bfd86e555b5122cebf8d0a47f2143a901277b6bc74a05225c4eaffa1b
+  data.tar.gz: 5163708ed18a936c80fb9fa3be0111e27cde6e421fc0176e88afd097df952704
 SHA512:
-  metadata.gz: f56a3f0e48b5c34335d49523ad6f2bdeacf8cafac042c19174a504bf2065b74f66c4b086aaff96780c61032855918a3bc0b914d3434ef5ad1e714e6268d9a5c8
-  data.tar.gz: db4dc8e66f36e674393335737d121c1746fafb0f0bde99034fad306c689d954fa394928a57d4957cde3eae606324a2879e9577598ec943b2fda268b4d185040b
+  metadata.gz: d97364c97debe528145cc6b5904aa4ac6b4bc1f3738069bbd7d0e5a66bec73f605ebc429cf0f647d10e5e0a0da47f5b3df8845bf92259bfe4a3020141c7f0613
+  data.tar.gz: 4d5bf08f3fd05d14e2493c86e6f381541d6d3efc83a38604d861e6e1427e729027902d7a3168651974977e70415ae31ac70b81f578b408af956e28932ef2c535

data/CHANGELOG.md

@@ -1,163 +1,176 @@
-## Rails 6.0.6.1 (January 17, 2023) ##
+## Rails 6.1.7.6 (August 22, 2023) ##
 
 *   No changes.
 
 
-## Rails 6.0.6 (September 09, 2022) ##
+## Rails 6.1.7.5 (August 22, 2023) ##
 
 *   No changes.
 
 
-## Rails 6.0.5.1 (July 12, 2022) ##
+## Rails 6.1.7.4 (June 26, 2023) ##
 
 *   No changes.
 
 
-## Rails 6.0.5 (May 09, 2022) ##
+## Rails 6.1.7.3 (March 13, 2023) ##
 
 *   No changes.
 
 
-## Rails 6.0.4.8 (April 26, 2022) ##
+## Rails 6.1.7.2 (January 24, 2023) ##
 
 *   No changes.
 
 
-## Rails 6.0.4.7 (March 08, 2022) ##
+## Rails 6.1.7.1 (January 17, 2023) ##
 
 *   No changes.
 
 
-## Rails 6.0.4.6 (February 11, 2022) ##
+## Rails 6.1.7 (September 09, 2022) ##
 
 *   No changes.
 
 
-## Rails 6.0.4.5 (February 11, 2022) ##
+## Rails 6.1.6.1 (July 12, 2022) ##
 
 *   No changes.
 
 
-## Rails 6.0.4.4 (December 15, 2021) ##
+## Rails 6.1.6 (May 09, 2022) ##
 
 *   No changes.
 
 
-## Rails 6.0.4.3 (December 14, 2021) ##
+## Rails 6.1.5.1 (April 26, 2022) ##
 
 *   No changes.
 
 
-## Rails 6.0.4.2 (December 14, 2021) ##
+## Rails 6.1.5 (March 09, 2022) ##
 
-*   No changes.
+*   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:
 
-## Rails 6.0.4.1 (August 19, 2021) ##
+    ```ruby
+    config.action_controller.action_on_unpermitted_parameters = :raise
+    ```
 
-*   No changes.
+    *David Jones*, *Dana Henke*
 
 
-## Rails 6.0.4 (June 15, 2021) ##
+## Rails 6.1.4.7 (March 08, 2022) ##
 
 *   No changes.
 
 
-## Rails 6.0.3.7 (May 05, 2021) ##
+## Rails 6.1.4.6 (February 11, 2022) ##
 
 *   No changes.
 
 
-## Rails 6.0.3.6 (March 26, 2021) ##
+## Rails 6.1.4.5 (February 11, 2022) ##
 
 *   No changes.
 
 
-## Rails 6.0.3.5 (February 10, 2021) ##
+## Rails 6.1.4.4 (December 15, 2021) ##
 
 *   No changes.
 
 
-## Rails 6.0.3.4 (October 07, 2020) ##
+## Rails 6.1.4.3 (December 14, 2021) ##
 
 *   No changes.
 
 
-## Rails 6.0.3.3 (September 09, 2020) ##
+## Rails 6.1.4.2 (December 14, 2021) ##
 
 *   No changes.
 
 
-## Rails 6.0.3.2 (June 17, 2020) ##
+## Rails 6.1.4.1 (August 19, 2021) ##
 
 *   No changes.
 
 
-## Rails 6.0.3.1 (May 18, 2020) ##
+## Rails 6.1.4 (June 24, 2021) ##
 
 *   No changes.
 
 
-## Rails 6.0.3 (May 06, 2020) ##
+## Rails 6.1.3.2 (May 05, 2021) ##
 
-*   Update Mandrill inbound email route to respond appropriately to HEAD requests for URL health checks from Mandrill.
+*   No changes.
 
-    *Bill Cromie*
 
+## Rails 6.1.3.1 (March 26, 2021) ##
 
-## Rails 6.0.2.2 (March 19, 2020) ##
+*   No changes.
+
+
+## Rails 6.1.3 (February 17, 2021) ##
 
 *   No changes.
 
 
-## Rails 6.0.2.1 (December 18, 2019) ##
+## Rails 6.1.2.1 (February 10, 2021) ##
 
 *   No changes.
 
 
-## Rails 6.0.2 (December 13, 2019) ##
+## Rails 6.1.2 (February 09, 2021) ##
 
 *   No changes.
 
 
-## Rails 6.0.1 (November 5, 2019) ##
+## Rails 6.1.1 (January 07, 2021) ##
 
 *   No changes.
 
 
-## Rails 6.0.0 (August 16, 2019) ##
+## Rails 6.1.0 (December 09, 2020) ##
 
-*   Fix Bcc header not being included with emails from `create_inbound_email_from` test helpers.
+*   Change default queue name of the incineration (`:action_mailbox_incineration`) and
+    routing (`:action_mailbox_routing`) jobs to be the job adapter's default (`:default`).
 
-    *jduff*
+    *Rafael Mendonça França*
 
+*   Sendgrid ingress now passes through the envelope recipient as `X-Original-To`.
 
-## Rails 6.0.0.rc2 (July 22, 2019) ##
+    *Mark Haussmann*
 
-*   No changes.
+*   Update Mandrill inbound email route to respond appropriately to HEAD requests for URL health checks from Mandrill.
 
+    *Bill Cromie*
 
-## Rails 6.0.0.rc1 (April 24, 2019) ##
+*   Add way to deliver emails via source instead of filling out a form through the conductor interface.
 
-*   No changes.
+    *DHH*
 
+*   Mailgun ingress now passes through the envelope recipient as `X-Original-To`.
 
-## Rails 6.0.0.beta3 (March 11, 2019) ##
+    *Rikki Pitt*
 
-*   No changes.
+*   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`.
 
+    *Matthijs Vos*
 
-## Rails 6.0.0.beta2 (February 25, 2019) ##
+*   Allow easier creation of multi-part emails from the `create_inbound_email_from_mail` and `receive_inbound_email_from_mail` test helpers.
 
-*   Allow skipping incineration of processed emails.
+    *Michael Herold*
 
-    This can be done by setting `config.action_mailbox.incinerate` to `false`.
+*   Fix Bcc header not being included with emails from `create_inbound_email_from` test helpers.
 
-    *Pratik Naik*
+    *jduff*
 
+*   Add `ApplicationMailbox.mailbox_for` to expose mailbox routing.
 
-## Rails 6.0.0.beta1 (January 18, 2019) ##
+    *James Dabbs*
 
-*   Added to Rails.
 
-    *DHH*
+Please check [6-0-stable](https://github.com/rails/rails/blob/6-0-stable/actionmailbox/CHANGELOG.md) for previous changes.

data/MIT-LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019 Basecamp, LLC
+Copyright (c) 2018-2022 Basecamp, LLC
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

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

@@ -6,7 +6,7 @@ module ActionMailbox
   # - +body-mime+: The full RFC 822 message
   # - +timestamp+: The current time according to Mailgun as the number of seconds passed since the UNIX epoch
   # - +token+: A randomly-generated, 50-character string
-  # - +signature+: A hexadecimal HMAC-SHA256 of the timestamp concatenated with the token, generated using the Mailgun API key
+  # - +signature+: A hexadecimal HMAC-SHA256 of the timestamp concatenated with the token, generated using the Mailgun Signing key
   #
   # Authenticates requests by validating their signatures.
   #
@@ -16,21 +16,21 @@ module ActionMailbox
   # - <tt>401 Unauthorized</tt> if the request's signature could not be validated, or if its timestamp is more than 2 minutes old
   # - <tt>404 Not Found</tt> if Action Mailbox is not configured to accept inbound emails from Mailgun
   # - <tt>422 Unprocessable Entity</tt> if the request is missing required parameters
-  # - <tt>500 Server Error</tt> if the Mailgun API key is missing, or one of the Active Record database,
+  # - <tt>500 Server Error</tt> if the Mailgun Signing key is missing, or one of the Active Record database,
   #   the Active Storage service, or the Active Job backend is misconfigured or unavailable
   #
   # == Usage
   #
-  # 1. Give Action Mailbox your {Mailgun API key}[https://help.mailgun.com/hc/en-us/articles/203380100-Where-can-I-find-my-API-key-and-SMTP-credentials-]
+  # 1. Give Action Mailbox your Mailgun Signing key (which you can find under Settings -> Security & Users -> API security in Mailgun)
   #    so it can authenticate requests to the Mailgun ingress.
   #
-  #    Use <tt>rails credentials:edit</tt> to add your API key to your application's encrypted credentials under
-  #    +action_mailbox.mailgun_api_key+, where Action Mailbox will automatically find it:
+  #    Use <tt>bin/rails credentials:edit</tt> to add your Signing key to your application's encrypted credentials under
+  #    +action_mailbox.mailgun_signing_key+, where Action Mailbox will automatically find it:
   #
   #        action_mailbox:
-  #          mailgun_api_key: ...
+  #          mailgun_signing_key: ...
   #
-  #    Alternatively, provide your API key in the +MAILGUN_INGRESS_API_KEY+ environment variable.
+  #    Alternatively, provide your Signing key in the +MAILGUN_INGRESS_SIGNING_KEY+ environment variable.
   #
   # 2. Tell Action Mailbox to accept emails from Mailgun:
   #
@@ -46,10 +46,16 @@ module ActionMailbox
     before_action :authenticate
 
     def create
-      ActionMailbox::InboundEmail.create_and_extract_message_id! params.require("body-mime")
+      ActionMailbox::InboundEmail.create_and_extract_message_id! mail
     end
 
     private
+      def mail
+        params.require("body-mime").tap do |raw_email|
+          raw_email.prepend("X-Original-To: ", params.require(:recipient), "\n") if params.key?(:recipient)
+        end
+      end
+
       def authenticate
         head :unauthorized unless authenticated?
       end
@@ -64,14 +70,28 @@ module ActionMailbox
           ).authenticated?
         else
           raise ArgumentError, <<~MESSAGE.squish
-            Missing required Mailgun API key. Set action_mailbox.mailgun_api_key in your application's
-            encrypted credentials or provide the MAILGUN_INGRESS_API_KEY environment variable.
+            Missing required Mailgun Signing key. Set action_mailbox.mailgun_signing_key in your application's
+            encrypted credentials or provide the MAILGUN_INGRESS_SIGNING_KEY environment variable.
           MESSAGE
         end
       end
 
       def key
-        Rails.application.credentials.dig(:action_mailbox, :mailgun_api_key) || ENV["MAILGUN_INGRESS_API_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
       end
 
       class Authenticator

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

@@ -27,7 +27,7 @@ module ActionMailbox
   #
   # 2. Generate a strong password that Action Mailbox can use to authenticate requests to the Postmark ingress.
   #
-  #    Use <tt>rails credentials:edit</tt> to add the password to your application's encrypted credentials under
+  #    Use <tt>bin/rails credentials:edit</tt> to add the password to your application's encrypted credentials under
   #    +action_mailbox.ingress_password+, where Action Mailbox will automatically find it:
   #
   #        action_mailbox:

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

@@ -27,7 +27,7 @@ module ActionMailbox
   #
   # 2. Generate a strong password that Action Mailbox can use to authenticate requests to the ingress.
   #
-  #    Use <tt>rails credentials:edit</tt> to add the password to your application's encrypted credentials under
+  #    Use <tt>bin/rails credentials:edit</tt> to add the password to your application's encrypted credentials under
   #    +action_mailbox.ingress_password+, where Action Mailbox will automatically find it:
   #
   #        action_mailbox:

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

@@ -27,7 +27,7 @@ module ActionMailbox
   #
   # 2. Generate a strong password that Action Mailbox can use to authenticate requests to the SendGrid ingress.
   #
-  #    Use <tt>rails credentials:edit</tt> to add the password to your application's encrypted credentials under
+  #    Use <tt>bin/rails credentials:edit</tt> to add the password to your application's encrypted credentials under
   #    +action_mailbox.ingress_password+, where Action Mailbox will automatically find it:
   #
   #        action_mailbox:
@@ -48,7 +48,21 @@ module ActionMailbox
     before_action :authenticate_by_password
 
     def create
-      ActionMailbox::InboundEmail.create_and_extract_message_id! params.require(:email)
+      ActionMailbox::InboundEmail.create_and_extract_message_id! mail
+    rescue JSON::ParserError => error
+      logger.error error.message
+      head :unprocessable_entity
     end
+
+    private
+      def mail
+        params.require(:email).tap do |raw_email|
+          envelope["to"].each { |to| raw_email.prepend("X-Original-To: ", to, "\n") } if params.key?(:envelope)
+        end
+      end
+
+      def envelope
+        JSON.parse(params.require(:envelope))
+      end
   end
 end

data/app/controllers/rails/conductor/action_mailbox/inbound_emails/sources_controller.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Rails
+  class Conductor::ActionMailbox::InboundEmails::SourcesController < Rails::Conductor::BaseController
+    def new
+    end
+
+    def create
+      inbound_email = ActionMailbox::InboundEmail.create_and_extract_message_id! params[:source]
+      redirect_to main_app.rails_conductor_inbound_email_url(inbound_email)
+    end
+  end
+end

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

@@ -20,14 +20,18 @@ module Rails
 
     private
       def new_mail
-        Mail.new(params.require(:mail).permit(:from, :to, :cc, :bcc, :in_reply_to, :subject, :body).to_h).tap do |mail|
+        Mail.new(mail_params.except(:attachments).to_h).tap do |mail|
           mail[:bcc]&.include_in_headers = true
-          params[:mail][:attachments].to_a.each do |attachment|
+          mail_params[:attachments].to_a.each do |attachment|
             mail.add_file(filename: attachment.original_filename, content: attachment.read)
           end
         end
       end
 
+      def mail_params
+        params.require(:mail).permit(:from, :to, :cc, :bcc, :x_original_to, :in_reply_to, :subject, :body, attachments: [])
+      end
+
       def create_inbound_email(mail)
         ActionMailbox::InboundEmail.create_and_extract_message_id!(mail.to_s)
       end

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

@@ -10,7 +10,7 @@ module ActionMailbox::InboundEmail::MessageId
   extend ActiveSupport::Concern
 
   class_methods do
-    # Create a new +InboundEmail+ from the raw +source+ of the email, which be uploaded as a Active Storage
+    # Create a new +InboundEmail+ from the raw +source+ of the email, which is uploaded as an Active Storage
     # 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)

data/app/models/action_mailbox/inbound_email.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "mail"
+require "action_mailbox/mail_with_error_handling"
 
 module ActionMailbox
   # The +InboundEmail+ is an Active Record that keeps a reference to the raw email stored in Active Storage
@@ -24,7 +24,7 @@ module ActionMailbox
   #
   #   inbound_email.mail.from # => 'david@loudthinking.com'
   #   inbound_email.source # Returns the full rfc822 source of the email as text
-  class InboundEmail < ActiveRecord::Base
+  class InboundEmail < Record
     self.table_name = "action_mailbox_inbound_emails"
 
     include Incineratable, MessageId, Routable

data/app/models/action_mailbox/record.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module ActionMailbox
+  class Record < ActiveRecord::Base #:nodoc:
+    self.abstract_class = true
+  end
+end
+
+ActiveSupport.run_load_hooks :action_mailbox_record, ActionMailbox::Record

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

@@ -12,4 +12,5 @@
   <% end %>
 </table>
 
-<%= link_to "Deliver new inbound email", main_app.new_rails_conductor_inbound_email_path %>
+<%= link_to "New inbound email by form", main_app.new_rails_conductor_inbound_email_path %> |
+<%= link_to "New inbound email by source", main_app.new_rails_conductor_inbound_email_source_path %>

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

@@ -5,37 +5,42 @@
 <%= form_with(url: main_app.rails_conductor_inbound_emails_path, scope: :mail, local: true) do |form| %>
   <div>
     <%= form.label :from, "From" %><br>
-    <%= form.text_field :from %>
+    <%= form.text_field :from, value: params[:from] %>
   </div>
 
   <div>
     <%= form.label :to, "To" %><br>
-    <%= form.text_field :to %>
+    <%= form.text_field :to, value: params[:to] %>
   </div>
 
   <div>
     <%= form.label :cc, "CC" %><br>
-    <%= form.text_field :cc %>
+    <%= form.text_field :cc, value: params[:cc] %>
   </div>
 
   <div>
     <%= form.label :bcc, "BCC" %><br>
-    <%= form.text_field :bcc %>
+    <%= form.text_field :bcc, value: params[:bcc] %>
+  </div>
+
+  <div>
+    <%= form.label :x_original_to, "X-Original-To" %><br>
+    <%= form.text_field :x_original_to, value: params[:x_original_to] %>
   </div>
 
   <div>
     <%= form.label :in_reply_to, "In-Reply-To" %><br>
-    <%= form.text_field :in_reply_to %>
+    <%= form.text_field :in_reply_to, value: params[:in_reply_to] %>
   </div>
 
   <div>
     <%= form.label :subject, "Subject" %><br>
-    <%= form.text_field :subject %>
+    <%= form.text_field :subject, value: params[:subject] %>
   </div>
 
   <div>
     <%= form.label :body, "Body" %><br>
-    <%= form.text_area :body, size: "40x20" %>
+    <%= form.text_area :body, size: "40x20", value: params[:body] %>
   </div>
 
   <div>

data/app/views/rails/conductor/action_mailbox/inbound_emails/sources/new.html.erb

@@ -0,0 +1,12 @@
+<% provide :title, "Deliver new inbound email by source" %>
+
+<h1>Deliver new inbound email by source</h1>
+
+<%= form_with(url: main_app.rails_conductor_inbound_email_sources_path, local: true) do |form| %>
+  <div>
+    <%= form.label :source, "Source" %><br>
+    <%= form.text_area :source, size: "80x60" %>
+  </div>
+
+  <%= form.submit "Deliver inbound email" %>
+<% end %>

data/config/routes.rb

@@ -17,6 +17,9 @@ Rails.application.routes.draw do
   # TODO: Should these be mounted within the engine only?
   scope "rails/conductor/action_mailbox/", module: "rails/conductor/action_mailbox" do
     resources :inbound_emails, as: :rails_conductor_inbound_emails
+    get  "inbound_emails/sources/new", to: "inbound_emails/sources#new", as: :new_rails_conductor_inbound_email_source
+    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
   end
 end

data/lib/action_mailbox/gem_version.rb

@@ -8,9 +8,9 @@ module ActionMailbox
 
   module VERSION
     MAJOR = 6
-    MINOR = 0
-    TINY  = 6
-    PRE   = "1"
+    MINOR = 1
+    TINY  = 7
+    PRE   = "6"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/action_mailbox/mail_ext.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "mail"
+require "action_mailbox/mail_with_error_handling"
 
 # 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/mail_with_error_handling.rb

@@ -0,0 +1,10 @@
+# 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

data/lib/action_mailbox/router.rb

@@ -21,7 +21,7 @@ module ActionMailbox
     end
 
     def route(inbound_email)
-      if mailbox = match_to_mailbox(inbound_email)
+      if mailbox = mailbox_for(inbound_email)
         mailbox.receive(inbound_email)
       else
         inbound_email.bounced!
@@ -30,12 +30,12 @@ module ActionMailbox
       end
     end
 
+    def mailbox_for(inbound_email)
+      routes.detect { |route| route.match?(inbound_email) }&.mailbox_class
+    end
+
     private
       attr_reader :routes
-
-      def match_to_mailbox(inbound_email)
-        routes.detect { |route| route.match?(inbound_email) }.try(:mailbox_class)
-      end
   end
 end
 

data/lib/action_mailbox/routing.rb

@@ -17,6 +17,10 @@ module ActionMailbox
       def route(inbound_email)
         router.route(inbound_email)
       end
+
+      def mailbox_for(inbound_email)
+        router.mailbox_for(inbound_email)
+      end
     end
   end
 end

data/lib/action_mailbox/test_helper.rb

@@ -10,11 +10,58 @@ module ActionMailbox
       create_inbound_email_from_source file_fixture(fixture_name).read, status: status
     end
 
-    # Create an +InboundEmail+ by specifying it using +Mail.new+ options. Example:
+    # 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].
+    #
+    # ==== Creating a simple email
+    #
+    # When you only need to set basic fields like +from+, +to+, +subject+, and
+    # +body+, you can pass them directly as options.
     #
     #   create_inbound_email_from_mail(from: "david@loudthinking.com", subject: "Hello!")
-    def create_inbound_email_from_mail(status: :processing, **mail_options)
-      mail = Mail.new(mail_options)
+    #
+    # ==== Creating a multi-part email
+    #
+    # When you need to create a more intricate email, like a multi-part email
+    # that contains both a plaintext version and an HTML version, you can pass a
+    # block.
+    #
+    #   create_inbound_email_from_mail do
+    #     to "David Heinemeier Hansson <david@loudthinking.com>"
+    #     from "Bilbo Baggins <bilbo@bagend.com>"
+    #     subject "Come down to the Shire!"
+    #
+    #     text_part do
+    #       body "Please join us for a party at Bag End"
+    #     end
+    #
+    #     html_part do
+    #       body "<h1>Please join us for a party at Bag End</h1>"
+    #     end
+    #   end
+    #
+    # As with +Mail.new+, you can also use a block parameter to define the parts
+    # of the message:
+    #
+    #   create_inbound_email_from_mail do |mail|
+    #     mail.to "David Heinemeier Hansson <david@loudthinking.com>"
+    #     mail.from "Bilbo Baggins <bilbo@bagend.com>"
+    #     mail.subject "Come down to the Shire!"
+    #
+    #     mail.text_part do |part|
+    #       part.body "Please join us for a party at Bag End"
+    #     end
+    #
+    #     mail.html_part do |part|
+    #       part.body "<h1>Please join us for a party at Bag End</h1>"
+    #     end
+    #   end
+    def create_inbound_email_from_mail(status: :processing, **mail_options, &block)
+      mail = Mail.new(mail_options, &block)
       # Bcc header is not encoded by default
       mail[:bcc].include_in_headers = true if mail[:bcc]
 
@@ -33,10 +80,11 @@ module ActionMailbox
       create_inbound_email_from_fixture(*args).tap(&:route)
     end
 
-    # Create an +InboundEmail+ using the same arguments as +create_inbound_email_from_mail+ and immediately route it to
-    # processing.
-    def receive_inbound_email_from_mail(**kwargs)
-      create_inbound_email_from_mail(**kwargs).tap(&:route)
+    # 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.
+    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

data/lib/generators/action_mailbox/install/install_generator.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require "rails/generators/mailbox/mailbox_generator"
+
+module ActionMailbox
+  module Generators
+    class InstallGenerator < ::Rails::Generators::Base
+      source_root Rails::Generators::MailboxGenerator.source_root
+
+      def create_action_mailbox_files
+        say "Copying application_mailbox.rb to app/mailboxes", :green
+        template "application_mailbox.rb", "app/mailboxes/application_mailbox.rb"
+      end
+
+      def add_action_mailbox_production_environment_config
+        environment <<~end_of_config, env: "production"
+          # Prepare the ingress controller used to receive mail
+          # config.action_mailbox.ingress = :relay
+
+        end_of_config
+      end
+
+      def create_migrations
+        rails_command "railties:install:migrations FROM=active_storage,action_mailbox", inline: true
+      end
+    end
+  end
+end

data/lib/rails/generators/mailbox/USAGE

@@ -1,12 +1,12 @@
 Description:
 ============
-    Stubs out a new mailbox class in app/mailboxes and invokes your template
+    Generates a new mailbox class in app/mailboxes and invokes your template
     engine and test framework generators.
 
 Example:
 ========
-    rails generate mailbox inbox
+    bin/rails generate mailbox inbox
 
-    creates a InboxMailbox class and test:
+    creates an InboxMailbox class and test:
         Mailbox:  app/mailboxes/inbox_mailbox.rb
         Test:     test/mailboxes/inbox_mailbox_test.rb

data/lib/tasks/install.rake

@@ -1,20 +1,6 @@
 # frozen_string_literal: true
 
-namespace :action_mailbox do
-  # Prevent migration installation task from showing up twice.
-  Rake::Task["install:migrations"].clear_comments
-
-  desc "Copy over the migration"
-  task install: %w[ environment run_installer copy_migrations ]
-
-  task :run_installer do
-    installer_template = File.expand_path("../rails/generators/installer.rb", __dir__)
-    system "#{RbConfig.ruby} ./bin/rails app:template LOCATION=#{installer_template}"
-  end
-
-  task :copy_migrations do
-    Rake::Task["active_storage:install:migrations"].invoke
-    Rake::Task["railties:install:migrations"].reenable # Otherwise you can't run 2 migration copy tasks in one invocation
-    Rake::Task["action_mailbox:install:migrations"].invoke
-  end
+desc "Installs Action Mailbox and its dependencies"
+task "action_mailbox:install" do
+  Rails::Command.invoke :generate, ["action_mailbox:install"]
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: actionmailbox
 version: !ruby/object:Gem::Version
-  version: 6.0.6.1
+  version: 6.1.7.6
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-17 00:00:00.000000000 Z
+date: 2023-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -17,70 +17,70 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.6.1
+        version: 6.1.7.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.6.1
+        version: 6.1.7.6
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.6.1
+        version: 6.1.7.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.6.1
+        version: 6.1.7.6
 - !ruby/object:Gem::Dependency
   name: activestorage
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.6.1
+        version: 6.1.7.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.6.1
+        version: 6.1.7.6
 - !ruby/object:Gem::Dependency
   name: activejob
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.6.1
+        version: 6.1.7.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.6.1
+        version: 6.1.7.6
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.6.1
+        version: 6.1.7.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.6.1
+        version: 6.1.7.6
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
@@ -112,6 +112,7 @@ files:
 - app/controllers/action_mailbox/ingresses/postmark/inbound_emails_controller.rb
 - app/controllers/action_mailbox/ingresses/relay/inbound_emails_controller.rb
 - 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/reroutes_controller.rb
 - app/controllers/rails/conductor/base_controller.rb
@@ -122,10 +123,12 @@ files:
 - app/models/action_mailbox/inbound_email/incineratable/incineration.rb
 - app/models/action_mailbox/inbound_email/message_id.rb
 - app/models/action_mailbox/inbound_email/routable.rb
+- app/models/action_mailbox/record.rb
 - app/views/layouts/rails/conductor.html.erb
 - app/views/rails/conductor/action_mailbox/inbound_emails/index.html.erb
 - app/views/rails/conductor/action_mailbox/inbound_emails/new.html.erb
 - app/views/rails/conductor/action_mailbox/inbound_emails/show.html.erb
+- app/views/rails/conductor/action_mailbox/inbound_emails/sources/new.html.erb
 - config/routes.rb
 - db/migrate/20180917164000_create_action_mailbox_tables.rb
 - lib/action_mailbox.rb
@@ -139,6 +142,7 @@ 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
@@ -146,7 +150,7 @@ files:
 - lib/action_mailbox/test_case.rb
 - lib/action_mailbox/test_helper.rb
 - lib/action_mailbox/version.rb
-- lib/rails/generators/installer.rb
+- lib/generators/action_mailbox/install/install_generator.rb
 - lib/rails/generators/mailbox/USAGE
 - lib/rails/generators/mailbox/mailbox_generator.rb
 - lib/rails/generators/mailbox/templates/application_mailbox.rb.tt
@@ -160,10 +164,10 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails/rails/issues
-  changelog_uri: https://github.com/rails/rails/blob/v6.0.6.1/actionmailbox/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v6.0.6.1/
+  changelog_uri: https://github.com/rails/rails/blob/v6.1.7.6/actionmailbox/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v6.1.7.6/
   mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v6.0.6.1/actionmailbox
+  source_code_uri: https://github.com/rails/rails/tree/v6.1.7.6/actionmailbox
   rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
@@ -180,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.3
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: Inbound email handling framework.

data/lib/rails/generators/installer.rb

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-say "Copying application_mailbox.rb to app/mailboxes"
-copy_file "#{__dir__}/mailbox/templates/application_mailbox.rb", "app/mailboxes/application_mailbox.rb"
-
-environment <<~end_of_config, env: "production"
-  # Prepare the ingress controller used to receive mail
-  # config.action_mailbox.ingress = :relay
-
-end_of_config