actionmailbox 6.1.4.7 → 6.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f0ad6651657442dfd1e59990420a29def775bcbf0adeb93c942d8dc6de413d7
-  data.tar.gz: 430adc3501018afb74fc204c5dd8960cf212120d45b06ba4cdfb22557ba280a1
+  metadata.gz: 1b573fd73df5c364ff88353f465888eb502be1452201716075790806c119ed0c
+  data.tar.gz: 8d33ca6ebeb6607d5dd7c6f44d1ad39c1a5d3b0b0e13a7bdf76ce5c39ced60dc
 SHA512:
-  metadata.gz: c0941e111fa6b5e76d63e99394bd0deac7dfab3dfb60fb86279b06b7240c39f2f288c4f01cbbbb7c751ebdeaaefbe51dddf739d03460d8ddb98befb2884a70f2
-  data.tar.gz: 2348775ca9b529bbca75ac0d842f8612ecd4bae9951ca38354ba4abf2ab3b72a9a46e7b84608ef7ddcb053f0667985286b1592dd7a6e06e82e672a983744c1f7
+  metadata.gz: a5e305b948dbf35003b16ede469de3800cb07781d117e71436055c7bb14eff226fb10c0c9e884ec609a2628e1f00c8ca6f93ff2b52ec4db1d0a6c598a2fc2300
+  data.tar.gz: 4b1c32c4cb12e023caffaaa8022cd2f927df6e6b8dd7556c30bf26277d829d5cb761e31c54458986ddd7ae7110ef9f79936b5274e42e462595aaa7244bde373b

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+## Rails 6.1.5.1 (April 26, 2022) ##
+
+*   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) ##
 
 *   No changes.

data/MIT-LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018-2020 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

@@ -79,13 +79,13 @@ module ActionMailbox
       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 6.2.
+            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 6.2.
+            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"]

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, :x_original_to, :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.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

data/lib/action_mailbox/gem_version.rb

@@ -9,8 +9,8 @@ module ActionMailbox
   module VERSION
     MAJOR = 6
     MINOR = 1
-    TINY  = 4
-    PRE   = "7"
+    TINY  = 6
+    PRE   = nil
 
     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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: actionmailbox
 version: !ruby/object:Gem::Version
-  version: 6.1.4.7
+  version: 6.1.6
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-08 00:00:00.000000000 Z
+date: 2022-05-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.1.4.7
+        version: 6.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.4.7
+        version: 6.1.6
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.4.7
+        version: 6.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.4.7
+        version: 6.1.6
 - !ruby/object:Gem::Dependency
   name: activestorage
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.4.7
+        version: 6.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.4.7
+        version: 6.1.6
 - !ruby/object:Gem::Dependency
   name: activejob
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.4.7
+        version: 6.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.4.7
+        version: 6.1.6
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.4.7
+        version: 6.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.4.7
+        version: 6.1.6
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
@@ -142,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
@@ -163,10 +164,11 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails/rails/issues
-  changelog_uri: https://github.com/rails/rails/blob/v6.1.4.7/actionmailbox/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v6.1.4.7/
+  changelog_uri: https://github.com/rails/rails/blob/v6.1.6/actionmailbox/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v6.1.6/
   mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v6.1.4.7/actionmailbox
+  source_code_uri: https://github.com/rails/rails/tree/v6.1.6/actionmailbox
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -182,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Inbound email handling framework.