6 files changed, 33 insertions, 24 deletions
diff --git a/actionmailbox/CHANGELOG.md b/actionmailbox/CHANGELOG.md
index f5fb573090..605a38b06b 100644
--- a/actionmailbox/CHANGELOG.md
+++ b/actionmailbox/CHANGELOG.md
@@ -1,19 +1,5 @@
-## Rails 6.0.0.beta3 (March 11, 2019) ##
+* Add `ApplicationMailbox.mailbox_for` to expose mailbox routing.
 
-*   No changes.
+  *James Dabbs*
 
-
-## Rails 6.0.0.beta2 (February 25, 2019) ##
-
-*   Allow skipping incineration of processed emails.
-
-    This can be done by setting `config.action_mailbox.incinerate` to `false`.
-
-    *Pratik Naik*
-
-
-## Rails 6.0.0.beta1 (January 18, 2019) ##
-
-*   Added to Rails.
-
-    *DHH*
+Please check [6-0-stable](https://github.com/rails/rails/blob/6-0-stable/actionmailbox/CHANGELOG.md) for previous changes.
diff --git a/actionmailbox/lib/action_mailbox/gem_version.rb b/actionmailbox/lib/action_mailbox/gem_version.rb
index a063553471..5ad2400451 100644
--- a/actionmailbox/lib/action_mailbox/gem_version.rb
+++ b/actionmailbox/lib/action_mailbox/gem_version.rb
@@ -8,9 +8,9 @@ module ActionMailbox
 
   module VERSION
     MAJOR = 6
-    MINOR = 0
+    MINOR = 1
     TINY  = 0
-    PRE   = "beta3"
+    PRE   = "alpha"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end
diff --git a/actionmailbox/lib/action_mailbox/router.rb b/actionmailbox/lib/action_mailbox/router.rb
index 71370e409d..54982eae21 100644
--- a/actionmailbox/lib/action_mailbox/router.rb
+++ b/actionmailbox/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) }.try(: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
 
diff --git a/actionmailbox/lib/action_mailbox/routing.rb b/actionmailbox/lib/action_mailbox/routing.rb
index 58462a44c6..8391bf9db0 100644
--- a/actionmailbox/lib/action_mailbox/routing.rb
+++ b/actionmailbox/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
diff --git a/actionmailbox/test/unit/mailbox/routing_test.rb b/actionmailbox/test/unit/mailbox/routing_test.rb
index d4ba702ac5..8302b1d5cc 100644
--- a/actionmailbox/test/unit/mailbox/routing_test.rb
+++ b/actionmailbox/test/unit/mailbox/routing_test.rb
@@ -28,4 +28,9 @@ class ActionMailbox::Base::RoutingTest < ActiveSupport::TestCase
       assert_equal "Discussion: Let's debate these attachments", $processed
     end
   end
+
+  test "mailbox_for" do
+    inbound_email = create_inbound_email_from_fixture "welcome.eml", status: :pending
+    assert_equal RepliesMailbox, ApplicationMailbox.mailbox_for(inbound_email)
+  end
 end
diff --git a/actionmailbox/test/unit/router_test.rb b/actionmailbox/test/unit/router_test.rb
index c5dce60856..4dd3730604 100644
--- a/actionmailbox/test/unit/router_test.rb
+++ b/actionmailbox/test/unit/router_test.rb
@@ -135,5 +135,19 @@ module ActionMailbox
         @router.add_route Array.new, to: :first
       end
     end
+
+    test "single string mailbox_for" do
+      @router.add_routes("first@example.com" => :first)
+
+      inbound_email = create_inbound_email_from_mail(to: "first@example.com", subject: "This is a reply")
+      assert_equal FirstMailbox, @router.mailbox_for(inbound_email)
+    end
+
+    test "mailbox_for with no matches" do
+      @router.add_routes("first@example.com" => :first)
+
+      inbound_email = create_inbound_email_from_mail(to: "second@example.com", subject: "This is a reply")
+      assert_nil @router.mailbox_for(inbound_email)
+    end
   end
 end