actionmailbox 6.0.0.beta3 → 6.0.2.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50a28970e03982d439be26d63aa1464d15507f55dcf9e771d7a3ba17124286a9
-  data.tar.gz: 4ebd425202cb53f006bea15af290cbf5936042277b160013d66c1b1bb9478b86
+  metadata.gz: 7b1e50f146cddc2c8d1e64d99c23731ddf07d0522baa434df35185993a48a4df
+  data.tar.gz: 4606dd543728bc0c31f9189875aae00c47d72cfb37004f6bfb15fda84a2afe7b
 SHA512:
-  metadata.gz: 95bd1e5e03444fc458933f744d427b16be8fbf65d750db18d3a7b972618e3c9ddb4646a616252fe6186d3203fb1f3b64f161a77005e36085272b2bf8b995e3e9
-  data.tar.gz: 3466d052111e887bd06d05046dddc37584ffd06d48171b4ffec59454ee14b3f6737dbbedd2eb2eebf7f9a3b2ce5909b24d0fca71b28e02c356534d980ef605c8
+  metadata.gz: c530f0b24dff31d51616e6d942b108105316de7d10ebaa26da4cbe7b389d5b6280859bd2c97592bb078a2d4618734f694e948bfa1ff75aab1c1cf1c05a587bf9
+  data.tar.gz: 25db6c477fc6f8685d762bb0be34f10383fa0672d8cd657cef3916dc5191035311389dd3f1dfa535cbf82d6433b0855aadd48537ac6901aa556b812551322e66

data/CHANGELOG.md

@@ -1,3 +1,30 @@
+## Rails 6.0.2.rc2 (December 09, 2019) ##
+
+*   No changes.
+
+
+## Rails 6.0.1 (November 5, 2019) ##
+
+*   No changes.
+
+
+## Rails 6.0.0 (August 16, 2019) ##
+
+*   Fix Bcc header not being included with emails from `create_inbound_email_from` test helpers.
+
+    *jduff*
+
+
+## Rails 6.0.0.rc2 (July 22, 2019) ##
+
+*   No changes.
+
+
+## Rails 6.0.0.rc1 (April 24, 2019) ##
+
+*   No changes.
+
+
 ## Rails 6.0.0.beta3 (March 11, 2019) ##
 
 *   No changes.
@@ -11,6 +38,7 @@
 
     *Pratik Naik*
 
+
 ## Rails 6.0.0.beta1 (January 18, 2019) ##
 
 *   Added to Rails.

data/README.md

@@ -1,6 +1,6 @@
 # Action Mailbox
 
-Action Mailbox routes incoming emails to controller-like mailboxes for processing in Rails. It ships with ingresses for Amazon SES, Mailgun, Mandrill, Postmark, and SendGrid. You can also handle inbound mails directly via the built-in Exim, Postfix, and Qmail ingresses.
+Action Mailbox routes incoming emails to controller-like mailboxes for processing in Rails. It ships with ingresses for Mailgun, Mandrill, Postmark, and SendGrid. You can also handle inbound mails directly via the built-in Exim, Postfix, and Qmail ingresses.
 
 The inbound emails are turned into `InboundEmail` records using Active Record and feature lifecycle tracking, storage of the original email on cloud storage via Active Storage, and responsible data handling with on-by-default incineration.
 

data/app/controllers/action_mailbox/base_controller.rb

@@ -3,14 +3,10 @@
 module ActionMailbox
   # The base class for all Action Mailbox ingress controllers.
   class BaseController < ActionController::Base
-    skip_forgery_protection
+    skip_forgery_protection if default_protect_from_forgery
 
     before_action :ensure_configured
 
-    def self.prepare
-      # Override in concrete controllers to run code on load.
-    end
-
     private
       def ensure_configured
         unless ActionMailbox.ingress == ingress_name

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

@@ -21,8 +21,9 @@ 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[:bcc]&.include_in_headers = true
           params[:mail][:attachments].to_a.each do |attachment|
-            mail.add_file(filename: attachment.path, content: attachment.read)
+            mail.add_file(filename: attachment.original_filename, content: attachment.read)
           end
         end
       end

data/config/routes.rb

@@ -2,7 +2,6 @@
 
 Rails.application.routes.draw do
   scope "/rails/action_mailbox", module: "action_mailbox/ingresses" do
-    post "/amazon/inbound_emails"   => "amazon/inbound_emails#create",   as: :rails_amazon_inbound_emails
     post "/mandrill/inbound_emails" => "mandrill/inbound_emails#create", as: :rails_mandrill_inbound_emails
     post "/postmark/inbound_emails" => "postmark/inbound_emails#create", as: :rails_postmark_inbound_emails
     post "/relay/inbound_emails"    => "relay/inbound_emails#create",    as: :rails_relay_inbound_emails

data/lib/action_mailbox/engine.rb

@@ -26,16 +26,7 @@ module ActionMailbox
         ActionMailbox.incinerate = app.config.action_mailbox.incinerate.nil? ? true : app.config.action_mailbox.incinerate
         ActionMailbox.incinerate_after = app.config.action_mailbox.incinerate_after || 30.days
         ActionMailbox.queues = app.config.action_mailbox.queues || {}
-      end
-    end
-
-    initializer "action_mailbox.ingress" do |app|
-      config.to_prepare do
-        if ActionMailbox.ingress = app.config.action_mailbox.ingress.presence
-          if ingress_controller_class = "ActionMailbox::Ingresses::#{ActionMailbox.ingress.to_s.classify}::InboundEmailsController".safe_constantize
-            ingress_controller_class.prepare
-          end
-        end
+        ActionMailbox.ingress = app.config.action_mailbox.ingress
       end
     end
   end

data/lib/action_mailbox/gem_version.rb

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

data/lib/action_mailbox/test_helper.rb

@@ -14,7 +14,11 @@ module ActionMailbox
     #
     #   create_inbound_email_from_mail(from: "david@loudthinking.com", subject: "Hello!")
     def create_inbound_email_from_mail(status: :processing, **mail_options)
-      create_inbound_email_from_source Mail.new(mail_options).to_s, status: status
+      mail = Mail.new(mail_options)
+      # Bcc header is not encoded by default
+      mail[:bcc].include_in_headers = true if mail[:bcc]
+
+      create_inbound_email_from_source mail.to_s, status: status
     end
 
     # Create an +InboundEmail+ using the raw rfc822 +source+ as text.
@@ -29,16 +33,16 @@ module ActionMailbox
       create_inbound_email_from_fixture(*args).tap(&:route)
     end
 
-    # Create an +InboundEmail+ from fixture using the same arguments as +create_inbound_email_from_mail+
-    # and immediately route it to processing.
+    # 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)
     end
 
-    # Create an +InboundEmail+ from fixture using the same arguments as +create_inbound_email_from_source+
-    # and immediately route it to processing.
-    def receive_inbound_email_from_source(**kwargs)
-      create_inbound_email_from_source(**kwargs).tap(&:route)
+    # 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)
     end
   end
 end

data/lib/rails/generators/installer.rb

@@ -5,6 +5,6 @@ copy_file "#{__dir__}/mailbox/templates/application_mailbox.rb", "app/mailboxes/
 
 environment <<~end_of_config, env: "production"
   # Prepare the ingress controller used to receive mail
-  # config.action_mailbox.ingress = :amazon
+  # config.action_mailbox.ingress = :relay
 
 end_of_config

data/lib/rails/generators/test_unit/templates/mailbox_test.rb.tt

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require "test_helper"
 
 class <%= class_name %>MailboxTest < ActionMailbox::TestCase

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: actionmailbox
 version: !ruby/object:Gem::Version
-  version: 6.0.0.beta3
+  version: 6.0.2.rc2
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-13 00:00:00.000000000 Z
+date: 2019-12-09 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.0.beta3
+        version: 6.0.2.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.beta3
+        version: 6.0.2.rc2
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.beta3
+        version: 6.0.2.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.beta3
+        version: 6.0.2.rc2
 - !ruby/object:Gem::Dependency
   name: activestorage
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.beta3
+        version: 6.0.2.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.beta3
+        version: 6.0.2.rc2
 - !ruby/object:Gem::Dependency
   name: activejob
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.beta3
+        version: 6.0.2.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.beta3
+        version: 6.0.2.rc2
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.beta3
+        version: 6.0.2.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.beta3
+        version: 6.0.2.rc2
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
@@ -107,7 +107,6 @@ files:
 - MIT-LICENSE
 - README.md
 - app/controllers/action_mailbox/base_controller.rb
-- app/controllers/action_mailbox/ingresses/amazon/inbound_emails_controller.rb
 - app/controllers/action_mailbox/ingresses/mailgun/inbound_emails_controller.rb
 - app/controllers/action_mailbox/ingresses/mandrill/inbound_emails_controller.rb
 - app/controllers/action_mailbox/ingresses/postmark/inbound_emails_controller.rb
@@ -160,8 +159,11 @@ homepage: https://rubyonrails.org
 licenses:
 - MIT
 metadata:
-  source_code_uri: https://github.com/rails/rails/tree/v6.0.0.beta3/actionmailbox
-  changelog_uri: https://github.com/rails/rails/blob/v6.0.0.beta3/actionmailbox/CHANGELOG.md
+  bug_tracker_uri: https://github.com/rails/rails/issues
+  changelog_uri: https://github.com/rails/rails/blob/v6.0.2.rc2/actionmailbox/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v6.0.2.rc2/
+  mailing_list_uri: https://groups.google.com/forum/#!forum/rubyonrails-talk
+  source_code_uri: https://github.com/rails/rails/tree/v6.0.2.rc2/actionmailbox
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -177,7 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Inbound email handling framework.

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

@@ -1,54 +0,0 @@
-# frozen_string_literal: true
-
-module ActionMailbox
-  # Ingests inbound emails from Amazon's Simple Email Service (SES).
-  #
-  # Requires the full RFC 822 message in the +content+ parameter. Authenticates requests by validating their signatures.
-  #
-  # Returns:
-  #
-  # - <tt>204 No Content</tt> if an inbound email is successfully recorded and enqueued for routing to the appropriate mailbox
-  # - <tt>401 Unauthorized</tt> if the request's signature could not be validated
-  # - <tt>404 Not Found</tt> if Action Mailbox is not configured to accept inbound emails from SES
-  # - <tt>422 Unprocessable Entity</tt> if the request is missing the required +content+ parameter
-  # - <tt>500 Server Error</tt> if one of the Active Record database, the Active Storage service, or
-  #   the Active Job backend is misconfigured or unavailable
-  #
-  # == Usage
-  #
-  # 1. Install the {aws-sdk-sns}[https://rubygems.org/gems/aws-sdk-sns] gem:
-  #
-  #        # Gemfile
-  #        gem "aws-sdk-sns", ">= 1.9.0", require: false
-  #
-  # 2. Tell Action Mailbox to accept emails from SES:
-  #
-  #        # config/environments/production.rb
-  #        config.action_mailbox.ingress = :amazon
-  #
-  # 3. {Configure SES}[https://docs.aws.amazon.com/ses/latest/DeveloperGuide/receiving-email-notifications.html]
-  #    to deliver emails to your application via POST requests to +/rails/action_mailbox/amazon/inbound_emails+.
-  #    If your application lived at <tt>https://example.com</tt>, you would specify the fully-qualified URL
-  #    <tt>https://example.com/rails/action_mailbox/amazon/inbound_emails</tt>.
-  class Ingresses::Amazon::InboundEmailsController < BaseController
-    before_action :authenticate
-
-    cattr_accessor :verifier
-
-    def self.prepare
-      self.verifier ||= begin
-        require "aws-sdk-sns"
-        Aws::SNS::MessageVerifier.new
-      end
-    end
-
-    def create
-      ActionMailbox::InboundEmail.create_and_extract_message_id! params.require(:content)
-    end
-
-    private
-      def authenticate
-        head :unauthorized unless verifier.authentic?(request.body)
-      end
-  end
-end