nuntius 1.4.12 → 1.4.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8ef496cc1318a53abc2466b813146bbe86f28cbfc2e2ec5e32956e1189007cb
-  data.tar.gz: 4bfdacc8786460d484f635a70dfb92add44d31928dc068f9e41664730352ec22
+  metadata.gz: 650cc4b129b084d4fb17dd3b3b21c2a44f9cf14fb6c10d0d3902baa67bfb66fb
+  data.tar.gz: 004110c56dc8b127dc38170a5249135ff1d71700f219aa460b8e62866cdc2107
 SHA512:
-  metadata.gz: abc30a1e3bad34fe6b7cbbc0a4b1cfef187ea0e9528039b248aebcee50dcf4c6604d85d855555227c8a35a2a0ba383a9924bbd0bb5f39d0211b78fd074627972
-  data.tar.gz: a539160365f1f8cfab219a8ad0b582241c8a2cfe1bb8b397d0b0050f805f9fd42c8d6ae5d43dc844c0da542af46c2c8858de7d4b63d7f8d35af4c22ab2ffb920
+  metadata.gz: 6f3601b35b149815c37e3056e003d0a6e6900bd20b7bdcd2b17f82b04170fd873ac6aebe85cf3da41f351f11080420e350f2dd554bfd6f026ea2c75c91d4e623
+  data.tar.gz: 9c48531460a4e2d1c5f8a7747ef17712e128ee00f1f57e78d6187a615d3bcd97485ee268b1dd33b445b1e29ab0b5e0ff280c01a7cfab13f9726f6a72cc6d5416

data/app/controllers/nuntius/subscribers_controller.rb

@@ -5,6 +5,7 @@ require_dependency "nuntius/application_controller"
 module Nuntius
   class SubscribersController < ApplicationController
     # skip_before_action :authenticate_user!, only: %i[show destroy]
+    skip_before_action :verify_authenticity_token, only: :unsubscribe
     layout "empty"
 
     def show

data/app/models/nuntius/message.rb

@@ -18,6 +18,8 @@ module Nuntius
     belongs_to :campaign, optional: true
     belongs_to :template, optional: true
     belongs_to :parent_message, class_name: "Message", optional: true
+    belongs_to :subscriber, optional: true
+
     has_many :child_messages, class_name: "Message", foreign_key: "parent_message_id", dependent: :destroy
     has_many :message_trackings, class_name: "MessageTracking", dependent: :destroy
 

data/app/models/nuntius/subscriber.rb

@@ -32,5 +32,15 @@ module Nuntius
 
       super
     end
+
+    def link(campaign, message, tag: true)
+      link_text = campaign.metadata["subscriber_url_text"] || I18n.t("subscriber_url_text")
+      url = Nuntius::Engine.routes.url_helpers.subscriber_url(self, host: Nuntius.config.host(message), protocol: "https")
+      tag ? "<a href=\"#{url}\" data-nuntius-tracking=\"false\">#{link_text}</a>" : url
+    end
+
+    def unsubscribe_link(campaign, message)
+      Nuntius::Engine.routes.url_helpers.unsubscribe_subscriber_url(self, host: Nuntius.config.host(message), protocol: "https")
+    end
   end
 end

data/app/providers/nuntius/smtp_mail_provider.rb

@@ -15,6 +15,7 @@ module Nuntius
     setting_reader :ssl, required: false, default: false, description: "Whether to use SSL or not"
 
     def deliver
+      return no_recipient if message.to.blank?
       return block unless MailAllowList.new(settings[:allow_list]).allowed?(message.to)
       return block if Nuntius::Message.where(status: %w[complaint bounced], to: message.to).count >= 1
 
@@ -24,6 +25,13 @@ module Nuntius
         Mail.new(from: from_header)
       end
 
+      mail.header["X-Nuntius-Message-Id"] = message.id
+
+      if message.campaign.present? && message.subscriber.present?
+        mail.header["List-Unsubscribe"] = "<" + message.subscriber.unsubscribe_link(message.campaign, message) + ">"
+        mail.header["List-Unsubscribe-Post"] = "List-Unsubscribe=One-Click"
+      end
+
       if Rails.env.test?
         mail.delivery_method :test
       else
@@ -85,6 +93,11 @@ module Nuntius
       message
     end
 
+    def no_recipient
+      message.status = "no_recipient"
+      message
+    end
+
     private
 
     def message_url(message)

data/app/services/nuntius/deliver_campaign_service.rb

@@ -22,11 +22,11 @@ module Nuntius
     end
 
     def new_message(subscriber, assigns = {})
-      message = Nuntius::Message.create!(transport: campaign.transport, campaign: campaign, nuntiable: subscriber.nuntiable, metadata: campaign.metadata)
+      message = Nuntius::Message.create!(transport: campaign.transport, campaign: campaign, nuntiable: subscriber.nuntiable, metadata: campaign.metadata, subscriber: subscriber)
 
       assigns["campaign"] = context.campaign
       assigns["subscriber"] = subscriber
-      assigns["subscriber_link"] = subscriber_link(subscriber, message)
+      assigns["subscriber_link"] = subscriber.link(campaign, message)
 
       if subscriber.nuntiable
         name = Nuntius::BaseMessenger.liquid_variable_name_for(subscriber.nuntiable)
@@ -62,11 +62,6 @@ module Nuntius
       scope.join(".")
     end
 
-    def subscriber_link(subscriber, message)
-      url = Nuntius::Engine.routes.url_helpers.subscriber_url(subscriber, host: Nuntius.config.host(message))
-      "<a href=\"#{url}\" data-nuntius-tracking=\"false\">#{t("subscriber_url_text")}</a>"
-    end
-
     private
 
     def render(attr, assigns, locale, options = {})

data/app/tables/nuntius/campaigns_table.rb

@@ -25,7 +25,7 @@ module Nuntius
         show ->(campaign) { campaign.transport != "sms" && campaign.can_publish? }
         link { |campaign| campaign.can_publish? ? nuntius.publish_admin_campaign_path(campaign) : nil }
         icon "fa-solid fa-paper-plane"
-        link_attributes data: {"turbo-confirm": "Are you sure you want to send out this campaign?", "turbo-method": :post}
+        link_attributes data: {"turbo-confirm": t(".campaign_publish_confirm"), "turbo-method": :post}
       end
 
       order name: :asc

data/app/transports/nuntius/mail_transport.rb

@@ -4,15 +4,13 @@ module Nuntius
   class MailTransport < BaseTransport
     # We split per email address, to allow easy resends
     def deliver(message)
-      message.html = Inky::Core.new.release_the_kraken(message.html)
-
       premailer = Premailer.new(message.html, with_html_string: true)
       message.html = premailer.to_inline_css
       message.text = premailer.to_plain_text
 
       message.request_id = SecureRandom.uuid
 
-      tos = message.to.split(/[\s;,]+/)
+      tos = message.to.to_s.split(/[\s;,]+/)
 
       messages = []
       message.to = tos.first

data/app/views/nuntius/subscribers/show.html.slim

@@ -2,8 +2,8 @@
 = sts.card :subscriber, title: @list.name do |card|
   - card.with_action
     - if @subscriber.unsubscribed_at.present?
-      = link_to 'Resubscribe', subscribe_subscriber_path(@subscriber), data: { turbo_method: :post }, class: 'button'
+      = link_to t('.resubscribe'), subscribe_subscriber_path(@subscriber), data: { turbo_method: :post }, class: 'button'
     - else
-      = link_to 'Unsubscribe', unsubscribe_subscriber_path(@subscriber), data: { turbo_method: :post }, class: 'button primary'
+      = link_to t('.unsubscribe'), unsubscribe_subscriber_path(@subscriber), data: { turbo_method: :post }, class: 'button primary'
 
   p== sanitize @list.description

data/config/locales/en.yml

@@ -1,4 +1,5 @@
 en:
+  campaign_publish_confirm: "Are you sure you want to send out this campaign?"
   subscriber_url_text: "Click here to unsubscribe"
   choose_files: Choose files
   activerecord:
@@ -178,6 +179,10 @@ en:
               tab:
                 Nuntius templates: Templates
               title: Templates
+    subscribers:
+      show:
+        unsubscribe: Unsubscribe
+        resubscribe: Resubscribe
     context_menu:
       resend: Resend
       root: Root

data/config/locales/nl.yml

@@ -1,5 +1,6 @@
 nl:
-  subscriber_url_text: "Klik hier om uit te schrijven"
+  campaign_publish_confirm: "Weet je zeker dat je deze campagne wilt verzenden?"
+  subscriber_url_text: "Klik hier om je uit te schrijven"
   choose_files: Kies bestanden
   activerecord:
     attributes:
@@ -193,6 +194,10 @@ nl:
               tab:
                 Nuntius templates: Templates
               title: Templates
+    subscribers:
+      show:
+        unsubscribe: Uitschrijven
+        resubscribe: Opnieuw inschrijven
     context_menu:
       resend: Verstuur opnieuw
       root: Root

data/db/migrate/20260310153208_add_subscriber_to_message.rb

@@ -0,0 +1,5 @@
+class AddSubscriberToMessage < ActiveRecord::Migration[8.1]
+  def change
+    add_reference :nuntius_messages, :subscriber, null: true, type: :uuid, foreign_key: {to_table: :nuntius_subscribers}
+  end
+end

data/lib/nuntius/engine.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "auxilium"
-require "inky"
 require "faraday"
 require "faraday/follow_redirects"
 require "liquidum"

data/lib/nuntius/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nuntius
 version: !ruby/object:Gem::Version
-  version: 1.4.12
+  version: 1.4.14
 platform: ruby
 authors:
 - Tom de Grunt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-02-27 00:00:00.000000000 Z
+date: 2026-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apnotic
@@ -108,20 +108,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.5
-- !ruby/object:Gem::Dependency
-  name: inky-rb
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: labelary
   requirement: !ruby/object:Gem::Requirement
@@ -567,6 +553,7 @@ files:
 - db/migrate/20260123160443_change_nuntius_events_id.rb
 - db/migrate/20260210122500_add_tracking_to_nuntius_messages.rb
 - db/migrate/20260225123822_add_metadata_to_subscriber.rb
+- db/migrate/20260310153208_add_subscriber_to_message.rb
 - lib/generators/nuntius/install_generator.rb
 - lib/generators/nuntius/tailwind_config_generator.rb
 - lib/generators/nuntius/templates/config/initializers/nuntius.rb