nuntius 1.3.21 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d75772fb2b03f8972790cc21ccc4bbffdc514e92e5020c2cfd3c1015a61550da
-  data.tar.gz: ee6a3397760d7f18ce525d40493894d0395b24861c3a6ca12f81f7c07cbb62ed
+  metadata.gz: 96231ee66f145c33c7c1fea7669be34a28d03c4c8f802cee010c984ad97f30c7
+  data.tar.gz: 98c827211fc8a8082710352838744ecb7b646ef4083493eb7078059b1627471b
 SHA512:
-  metadata.gz: c17b0f252f59e5ed8da3d37db297b78f197b23cd5e349e168c2bab960b0e7bbc5563a9d2330e7802cba2945ce855e30f9cfead383f6c56541954f225b9ce7acb
-  data.tar.gz: 5335902adaf5342c364c2e1219877c8855bdf5c00ebc83eaf41a282dd7b884cb94736029af0022fb8888619d4fba683546c47e7e33b80a0cd69a86e0e7c6ecd0
+  metadata.gz: d3c2ba2b4663c73fd4ac849b0a94878646b1f32c743be1c7f1db8f9529934920497abb54345f7d35b56f7cd682ecbc710944f3bd89c9a7444f7878b7967b79d4
+  data.tar.gz: d54a2dd92af1f92cc40886c4be3bdfea123bdcb9f451abca15b919258f010b2363bc404b3f6f0a7c1f78bf1fb417dc65f0328fca12d98e7c38e9f381a44c963d

data/README.md

@@ -64,6 +64,7 @@ class CarMessenger < Nuntius::BaseMessenger
     pdf = ApplicationController.renderer.new(http_host: object.account.hostname, https: true).render(template: "commercial_invoice/show", formats: [:pdf], assigns: {order: object})
 
     attachments << {content: StringIO.new(pdf), content_type: "application/pdf", filename: "commercial_invoice.pdf"}
+    # Return false here if you don't want the message to be sent
   end
 end
 ```

data/app/jobs/nuntius/messenger_job.rb

@@ -9,7 +9,9 @@ module Nuntius
       messenger = Nuntius::BaseMessenger.messenger_for_obj(obj).new(obj, event, params)
       return unless messenger.is_a?(Nuntius::CustomMessenger) || messenger.respond_to?(event.to_sym)
 
-      messenger.call
+      result = messenger.call
+      return if result == false
+
       templates = messenger.templates
       messenger.dispatch(templates) if templates.present?
     end

data/app/messengers/nuntius/base_messenger.rb

@@ -9,24 +9,24 @@ module Nuntius
 
     define_callbacks :action, terminator: ->(_target, result_lambda) { result_lambda.call == false }
 
-    attr_reader :attachments, :headers, :event, :object, :params
-    attr_accessor :templates, :smtp_envelope_from
+    attr_reader :attachments, :event, :object, :params
+    attr_accessor :templates
 
     def initialize(object, event, params = {})
       @object = object
       @event = event
       @params = params
       @attachments = params.fetch(:attachments, [])
-      @headers = params.fetch(:headers, {})
-      @smtp_envelope_from = params[:smtp_envelope_from]
     end
 
     # Calls the event method on the messenger
     def call
       select_templates
+      result = nil
       run_callbacks(:action) do
-        send(@event.to_sym, @object, @params) if respond_to?(@event.to_sym)
+        result = send(@event.to_sym, @object, @params) if respond_to?(@event.to_sym)
       end
+      result
     end
 
     # Turns the templates in messages, and dispatches the messages to transports
@@ -37,7 +37,6 @@ module Nuntius
         @attachments.each do |attachment|
           msg.add_attachment(attachment)
         end
-        apply_mail_overrides(msg)
 
         transport = Nuntius::BaseTransport.class_from_name(template.transport).new
         transport.deliver(msg) if msg.to.present?
@@ -53,12 +52,6 @@ module Nuntius
       @attachments << attachment
     end
 
-    # Sets an extra header on the resulting message (currently applied by the
-    # mail transport). Useful for things like "Auto-Submitted" or "Precedence".
-    def header(key, value)
-      @headers[key.to_s] = value
-    end
-
     class << self
       #
       # Returns the variable name used in the liquid context
@@ -177,19 +170,6 @@ module Nuntius
 
     private
 
-    # Persists any messenger-provided mail overrides (extra headers and/or a
-    # custom SMTP envelope sender) onto the message so they survive the
-    # transport delivery job and can be applied by the provider.
-    def apply_mail_overrides(message)
-      return if @headers.blank? && @smtp_envelope_from.nil?
-
-      mail = {}
-      mail["headers"] = @headers if @headers.present?
-      mail["envelope_from"] = @smtp_envelope_from unless @smtp_envelope_from.nil?
-
-      message.metadata = (message.metadata || {}).merge("mail" => mail)
-    end
-
     # Returns the relevant templates for the object / event combination
     def select_templates
       return @templates if @templates
@@ -206,7 +186,7 @@ module Nuntius
 
     def liquid_context
       assigns = @params || {}
-      instance_variables.reject { |i| %w[@params @object @locale @templates @template_scope @headers @smtp_envelope_from].include? i.to_s }.each do |i|
+      instance_variables.reject { |i| %w[@params @object @locale @templates @template_scope].include? i.to_s }.each do |i|
         assigns[i.to_s[1..]] = instance_variable_get(i)
       end
 

data/app/providers/nuntius/smtp_mail_provider.rb

@@ -6,9 +6,6 @@ module Nuntius
   class SmtpMailProvider < BaseProvider
     transport :mail
 
-    # RFC 5321 null reverse-path, used for auto-generated/bounce notifications.
-    NULL_REVERSE_PATH = "<>"
-
     setting_reader :from_header, required: true, description: "From header (example: Nuntius Messenger <nuntius@entdec.com>)"
     setting_reader :host, required: true, description: "Host (example: smtp.soverin.net)"
     setting_reader :port, required: true, description: "Port (example: 578)"
@@ -27,14 +24,16 @@ module Nuntius
         Mail.new(from: from_header)
       end
 
-      null_sender = apply_mail_overrides(mail)
-
       if Rails.env.test?
         mail.delivery_method :test
-      elsif null_sender
-        mail.delivery_method Nuntius::NullSenderSmtp, smtp_settings
       else
-        mail.delivery_method :smtp, smtp_settings
+        mail.delivery_method :smtp,
+          address: host,
+          port: port,
+          user_name: username,
+          password: password,
+          return_response: true,
+          ssl: ssl
       end
 
       mail.to = message.to
@@ -84,45 +83,6 @@ module Nuntius
 
     private
 
-    def smtp_settings
-      {
-        address: host,
-        port: port,
-        user_name: username,
-        password: password,
-        return_response: true,
-        ssl: ssl
-      }
-    end
-
-    # Applies any messenger-provided overrides stored on the message: extra
-    # headers and/or a custom SMTP envelope sender. Returns true when a null
-    # reverse-path (+MAIL FROM:<>+) was requested, so the caller can pick the
-    # delivery method that can actually emit it.
-    def apply_mail_overrides(mail)
-      overrides = message.metadata&.dig("mail")
-      return false if overrides.blank?
-
-      (overrides["headers"] || {}).each do |key, value|
-        mail.header[key] = value
-      end
-
-      return false unless overrides.key?("envelope_from")
-
-      envelope_from = overrides["envelope_from"]
-      if null_reverse_path?(envelope_from)
-        mail.smtp_envelope_from = NULL_REVERSE_PATH
-        true
-      else
-        mail.smtp_envelope_from = envelope_from
-        false
-      end
-    end
-
-    def null_reverse_path?(value)
-      value.blank? || value == NULL_REVERSE_PATH
-    end
-
     def message_url(message)
       Nuntius::Engine.routes.url_helpers.message_url(message.id, host: Nuntius.config.host(message))
     end

data/lib/nuntius/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Nuntius
-  VERSION = "1.3.21"
+  VERSION = "1.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nuntius
 version: !ruby/object:Gem::Version
-  version: 1.3.21
+  version: 1.4.0
 platform: ruby
 authors:
 - Tom de Grunt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-06-29 00:00:00.000000000 Z
+date: 2025-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apnotic
@@ -497,7 +497,6 @@ files:
 - app/providers/nuntius/firebase_push_provider.rb
 - app/providers/nuntius/houston_push_provider.rb
 - app/providers/nuntius/message_bird_sms_provider.rb
-- app/providers/nuntius/null_sender_smtp.rb
 - app/providers/nuntius/slack_slack_provider.rb
 - app/providers/nuntius/smstools_sms_provider.rb
 - app/providers/nuntius/smtp_mail_provider.rb

data/app/providers/nuntius/null_sender_smtp.rb

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-require "mail"
-
-module Nuntius
-  # A Mail::SMTP delivery method that sends with a null reverse-path
-  # (+MAIL FROM:<>+).
-  #
-  # The stock Mail::SmtpEnvelope refuses to emit an empty reverse-path
-  # (it raises on a blank From), and Net::SMTP wraps the address in angle
-  # brackets, so setting +smtp_envelope_from+ to +"<>"+ would produce the
-  # invalid +MAIL FROM:<<>>+. This delivery method bypasses Mail::SmtpEnvelope
-  # and hands an empty reverse-path straight to Net::SMTP, yielding the
-  # RFC 5321 null sender used by auto-generated/bounce notifications.
-  class NullSenderSmtp < ::Mail::SMTP
-    def deliver!(mail)
-      response = start_smtp_session do |smtp|
-        smtp.sendmail(mail.encoded, "", mail.smtp_envelope_to)
-      end
-
-      settings[:return_response] ? response : self
-    end
-  end
-end