actionmailbox 6.0.0.beta1 → 6.0.1.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: beb8145f8e8da8e158c0811ec7522495e294d13727c4960ec1810654d17c1299
-  data.tar.gz: f01ffcc7f94e19ffac7f01c4036886d6ad8ee9e57292e12920a1c98b954a7ce4
+  metadata.gz: fa9acac3cac950102cb5612fc2b093021332c03d88b4a4bb8821ca4d4437971d
+  data.tar.gz: c692699865f256282048d88de47e1783e8bae27d9e212a7d2ace6456ef95f95e
 SHA512:
-  metadata.gz: 9219f0eb8d3f102068e9ea9b8c48e223e57ac79348d76c5418eb2e85ba797df68b3f8f8a0ee0f6881044c64ea38a3d0264d123550aef9aa5ac958e5f9d420d51
-  data.tar.gz: 32707b7b14716c46e76069a189275fd8f8ee064aa164cdbecccce869579719163a6e0ec33336dda9417363923a9e2d4958dffa916a0d9ad2e7ade9ae96e11c97
+  metadata.gz: 8289a08e3d4df08f9324f8eb18a67fec8a483ba99051a0938ee434f07b242f32a95a93454e818c7d20599c4283273c04d287bf47baff28de2094ae520108c757
+  data.tar.gz: ad714eac330be0048402d5f61f0ed089a41671a1ce3cd4c1f16bbcb107a57c0115db4f89afa8df673a6b30dbe56a7781939f63241ac6f27d1243f1b9ac592383

data/CHANGELOG.md

@@ -1,3 +1,39 @@
+## Rails 6.0.1.rc1 (October 31, 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.
+
+
+## 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.

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.attachments[attachment.original_filename] = { filename: attachment.path, content_type: attachment.content_type }
+            mail.add_file(filename: attachment.original_filename, content: attachment.read)
           end
         end
       end

data/app/jobs/action_mailbox/incineration_job.rb

@@ -6,6 +6,9 @@ module ActionMailbox
   #
   # Since this incineration is set for the future, it'll automatically ignore any <tt>InboundEmail</tt>s
   # that have already been deleted and discard itself if so.
+  #
+  # You can disable incinerating processed emails by setting +config.action_mailbox.incinerate+ or
+  # +ActionMailbox.incinerate+ to +false+.
   class IncinerationJob < ActiveJob::Base
     queue_as { ActionMailbox.queues[:incineration] }
 

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

@@ -7,7 +7,7 @@ module ActionMailbox::InboundEmail::Incineratable
   extend ActiveSupport::Concern
 
   included do
-    after_update_commit :incinerate_later, if: -> { status_previously_changed? && processed? }
+    after_update_commit :incinerate_later, if: -> { ActionMailbox.incinerate && status_previously_changed? && processed? }
   end
 
   def incinerate_later

data/app/views/layouts/rails/conductor.html.erb

@@ -4,4 +4,5 @@
 </head>
 <body>
 <%= yield %>
+</body>
 </html>

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/db/migrate/20180917164000_create_action_mailbox_tables.rb

@@ -5,11 +5,7 @@ class CreateActionMailboxTables < ActiveRecord::Migration[6.0]
       t.string  :message_id, null: false
       t.string  :message_checksum, null: false
 
-      if supports_datetime_with_precision?
-        t.timestamps precision: 6
-      else
-        t.timestamps
-      end
+      t.timestamps
 
       t.index [ :message_id, :message_checksum ], name: "index_action_mailbox_inbound_emails_uniqueness", unique: true
     end

data/lib/action_mailbox.rb

@@ -11,6 +11,7 @@ module ActionMailbox
 
   mattr_accessor :ingress
   mattr_accessor :logger
+  mattr_accessor :incinerate, default: true
   mattr_accessor :incinerate_after, default: 30.days
   mattr_accessor :queues, default: {}
 end

data/lib/action_mailbox/engine.rb

@@ -14,6 +14,7 @@ module ActionMailbox
     config.eager_load_namespaces << ActionMailbox
 
     config.action_mailbox = ActiveSupport::OrderedOptions.new
+    config.action_mailbox.incinerate = true
     config.action_mailbox.incinerate_after = 30.days
 
     config.action_mailbox.queues = ActiveSupport::InheritableOptions.new \
@@ -22,20 +23,10 @@ module ActionMailbox
     initializer "action_mailbox.config" do
       config.after_initialize do |app|
         ActionMailbox.logger = app.config.action_mailbox.logger || Rails.logger
+        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
-      config.after_initialize do |app|
-        if ActionMailbox.ingress = app.config.action_mailbox.ingress.presence
-          config.to_prepare do
-            if ingress_controller_class = "ActionMailbox::Ingresses::#{ActionMailbox.ingress.to_s.classify}::InboundEmailsController".safe_constantize
-              ingress_controller_class.prepare
-            end
-          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   = "beta1"
+    TINY  = 1
+    PRE   = "rc1"
 
     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.beta1
+  version: 6.0.1.rc1
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-18 00:00:00.000000000 Z
+date: 2019-10-31 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.beta1
+        version: 6.0.1.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.beta1
+        version: 6.0.1.rc1
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.beta1
+        version: 6.0.1.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.beta1
+        version: 6.0.1.rc1
 - !ruby/object:Gem::Dependency
   name: activestorage
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.beta1
+        version: 6.0.1.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.beta1
+        version: 6.0.1.rc1
 - !ruby/object:Gem::Dependency
   name: activejob
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.beta1
+        version: 6.0.1.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.beta1
+        version: 6.0.1.rc1
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.beta1
+        version: 6.0.1.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.beta1
+        version: 6.0.1.rc1
 - !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.beta1/actionmailbox
-  changelog_uri: https://github.com/rails/rails/blob/v6.0.0.beta1/actionmailbox/CHANGELOG.md
+  bug_tracker_uri: https://github.com/rails/rails/issues
+  changelog_uri: https://github.com/rails/rails/blob/v6.0.1.rc1/actionmailbox/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v6.0.1.rc1/
+  mailing_list_uri: https://groups.google.com/forum/#!forum/rubyonrails-talk
+  source_code_uri: https://github.com/rails/rails/tree/v6.0.1.rc1/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