actionmailer 8.1.0.beta1 → 8.1.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33226491c029ce11c633514799ee91adc191c4ca0e0ecd62f757f8739a391760
-  data.tar.gz: 79bdbc4be17dabd4cbbf04cd9f6290203f03dcffd84494cb3a90529cb1f331f0
+  metadata.gz: b0efbf96899cfb20369bd74bc03bd6b0126d56679906f5e15df90edae16ab15c
+  data.tar.gz: 92f132cfbf3573e6cb5bae1ac18f7e6c5156cea11b283f90854aa2310e5ffd48
 SHA512:
-  metadata.gz: 28a8c6237d1fdaad721c68938d34a72cab21fdc0053a3887a272a18b8206a83bb0582edcb13bf8f6fe43bda3acca9b413a872d4c0cedc4c8c8b6921c8df0523e
-  data.tar.gz: c1b4b1958b5d80a2e2251bb850d98672a33d15997679b4f9826e3e5f3589aa59f5c36e0ca7cd0957838a94b621252c188852ebed27ee547c8ba275022f2bafaa
+  metadata.gz: 86e8af8f9ac090f22ec8712d58397c9ed57ea732cd7fb221cf62bb732413514ba5d40211b8678ef5908d3d4dfd18b6ad55ece9cb3db6d8a5b396a73f132cb6ac
+  data.tar.gz: 4847e03c0c03c743471e06f8c44ef5baf93a55602f7cd1b87bb22d942e134258dc3540912706999bab991ee0f120a7f28ea39b180a96e93caeee46a2432ed8ba

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## Rails 8.1.0.rc1 (October 15, 2025) ##
+
+*   Add structured events for Action Mailer:
+    - `action_mailer.delivered`
+    - `action_mailer.processed`
+
+    *Gannon McGibbon*
+
 ## Rails 8.1.0.beta1 (September 04, 2025) ##
 
 *   Add `deliver_all_later` to enqueue multiple emails at once.

data/lib/action_mailer/base.rb

@@ -7,6 +7,7 @@ require "active_support/core_ext/hash/except"
 require "active_support/core_ext/module/anonymous"
 
 require "action_mailer/log_subscriber"
+require "action_mailer/structured_event_subscriber"
 require "action_mailer/rescuable"
 
 module ActionMailer

data/lib/action_mailer/gem_version.rb

@@ -10,7 +10,7 @@ module ActionMailer
     MAJOR = 8
     MINOR = 1
     TINY  = 0
-    PRE   = "beta1"
+    PRE   = "rc1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/action_mailer/log_subscriber.rb

@@ -3,11 +3,7 @@
 require "active_support/log_subscriber"
 
 module ActionMailer
-  # = Action Mailer \LogSubscriber
-  #
-  # Implements the ActiveSupport::LogSubscriber for logging notifications when
-  # email is delivered or received.
-  class LogSubscriber < ActiveSupport::LogSubscriber
+  class LogSubscriber < ActiveSupport::LogSubscriber # :nodoc:
     # An email was delivered.
     def deliver(event)
       info do

data/lib/action_mailer/message_delivery.rb

@@ -20,7 +20,7 @@ module ActionMailer
 
     private
       def _deliver_all_later(delivery_method, *deliveries, **options)
-        deliveries.flatten!
+        deliveries = deliveries.first if deliveries.first.is_a?(Array)
 
         jobs = deliveries.map do |delivery|
           mailer_class = delivery.mailer_class

data/lib/action_mailer/structured_event_subscriber.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require "active_support/structured_event_subscriber"
+
+module ActionMailer
+  class StructuredEventSubscriber < ActiveSupport::StructuredEventSubscriber # :nodoc:
+    # An email was delivered.
+    def deliver(event)
+      exception = event.payload[:exception_object]
+      payload = {
+        message_id: event.payload[:message_id],
+        duration_ms: event.duration.round(2),
+        mail: event.payload[:mail],
+        perform_deliveries: event.payload[:perform_deliveries],
+      }
+
+      if exception
+        payload[:exception_class] = exception.class.name
+        payload[:exception_message] = exception.message
+      end
+
+      emit_debug_event("action_mailer.delivered", payload)
+    end
+    debug_only :deliver
+
+    # An email was generated.
+    def process(event)
+      emit_debug_event("action_mailer.processed",
+        mailer: event.payload[:mailer],
+        action: event.payload[:action],
+        duration_ms: event.duration.round(2),
+      )
+    end
+    debug_only :process
+  end
+end
+
+ActionMailer::StructuredEventSubscriber.attach_to :action_mailer

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: actionmailer
 version: !ruby/object:Gem::Version
-  version: 8.1.0.beta1
+  version: 8.1.0.rc1
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -15,56 +15,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 8.1.0.beta1
+        version: 8.1.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 8.1.0.beta1
+        version: 8.1.0.rc1
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 8.1.0.beta1
+        version: 8.1.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 8.1.0.beta1
+        version: 8.1.0.rc1
 - !ruby/object:Gem::Dependency
   name: actionview
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 8.1.0.beta1
+        version: 8.1.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 8.1.0.beta1
+        version: 8.1.0.rc1
 - !ruby/object:Gem::Dependency
   name: activejob
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 8.1.0.beta1
+        version: 8.1.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 8.1.0.beta1
+        version: 8.1.0.rc1
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
@@ -121,6 +121,7 @@ files:
 - lib/action_mailer/queued_delivery.rb
 - lib/action_mailer/railtie.rb
 - lib/action_mailer/rescuable.rb
+- lib/action_mailer/structured_event_subscriber.rb
 - lib/action_mailer/test_case.rb
 - lib/action_mailer/test_helper.rb
 - lib/action_mailer/version.rb
@@ -133,10 +134,10 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails/rails/issues
-  changelog_uri: https://github.com/rails/rails/blob/v8.1.0.beta1/actionmailer/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v8.1.0.beta1/
+  changelog_uri: https://github.com/rails/rails/blob/v8.1.0.rc1/actionmailer/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v8.1.0.rc1/
   mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v8.1.0.beta1/actionmailer
+  source_code_uri: https://github.com/rails/rails/tree/v8.1.0.rc1/actionmailer
   rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths: