ActionMailer 7.0 compatibility: ensure deliver callbacks are defined when prepended and patch MessageDelivery on load; avoid Rails <7.1 option

Author: ndbroadbent

lib/log_struct/integrations/action_mailer.rb

@@ -41,6 +41,7 @@ def self.setup(config)
         ActiveSupport.on_load(:action_mailer) { prepend LogStruct::Integrations::ActionMailer::EventLogging }
         ActiveSupport.on_load(:action_mailer) { prepend LogStruct::Integrations::ActionMailer::ErrorHandling }
         ActiveSupport.on_load(:action_mailer) { prepend LogStruct::Integrations::ActionMailer::Callbacks }
+        ActiveSupport.on_load(:action_mailer) { LogStruct::Integrations::ActionMailer::Callbacks.patch_message_delivery }
 
         true
       end

lib/log_struct/integrations/action_mailer/callbacks.rb

@@ -16,14 +16,25 @@ module Callbacks
         # This will be handled by ActiveSupport::Concern at runtime
         included do
           include ::ActiveSupport::Callbacks
-          # Rails < 7.1 does not support skip_after_callbacks_if_terminated option
           if defined?(::ActiveSupport) && ::ActiveSupport.gem_version >= Gem::Version.new("7.1.0")
             define_callbacks :deliver, skip_after_callbacks_if_terminated: true
           else
             define_callbacks :deliver
           end
         end
 
+        # When this module is prepended (our integration uses prepend), ensure callbacks are defined
+        if respond_to?(:prepended)
+          prepended do
+            include ::ActiveSupport::Callbacks
+            if defined?(::ActiveSupport) && ::ActiveSupport.gem_version >= Gem::Version.new("7.1.0")
+              define_callbacks :deliver, skip_after_callbacks_if_terminated: true
+            else
+              define_callbacks :deliver
+            end
+          end
+        end
+
         # Define class methods in a separate module
         module ClassMethods
           extend T::Sig