nuntius 1.4.9 → 1.4.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ccc43faba64c7face2decf37a6c33b775ea9d6c13dd36cc08ec86da58da0bbd
-  data.tar.gz: f43c4cf84c238bd62956151a468a0adc62c1e798589e02b70ffe85be899a1ad8
+  metadata.gz: 5a1dcbc1e10bce99c94c7537d5091e32bcaa588b51d92a884a001978a1dd24fa
+  data.tar.gz: '09cb3a5e7da66b49c8e755ab3f4956d1933d3197749de506e7693649f480141a'
 SHA512:
-  metadata.gz: db7b5cd54668c544ad6ca9494b350ec2585e3f504bdeb68aa4ce2b8f56a344ee36d2d09b9802d8d3dbd8ecc9df5f8e2d59648ee30f577b65e64e14170a84e21a
-  data.tar.gz: 96dbae515949cf5c24d9936712ac8d0068283fce076314943eacb6439b98e0f36329a8e0a5a95f75e2b19322a4c9891117100d2dda90b9186f10e991391abb84
+  metadata.gz: 9ac1da3a93afccd8b1da9f79b652e8749081daa4394bf468c902f700445257ca5e722a43b30ea874372eeb15c5f40f45c393a4de07e47223f72984c6b6148a70
+  data.tar.gz: 402bd584c757524017bcd83d5773737711fe5542b0359cf6546a3addcf0c99c789e811581a1f058371a1cdd9a072560f1765079933ae167a04b449e172084720

data/README.md

@@ -230,6 +230,8 @@ In the layout you can add `<a href="{{message_url}}">Link to mail</a>` to provid
 Nuntius supports email tracking, to enable this, you need to enable tracking for a template.
 Nuntius will then inject a tracking pixel and track clicks on links.
 
+Per link you can disable tracking by adding `data-nuntius-tracking="false"` to the link.
+
 #### AWS SES
 
 In case you use AWS SES, you can use the SNS Feedback Notifications to automatically mark messages as read, or deal with complaints and bounces. Create a AWS SNS topic, with a HTTPS subscription with the following URL (pattern):

data/app/controllers/nuntius/admin/lists/subscribers_controller.rb

@@ -38,7 +38,7 @@ module Nuntius
         private
 
         def subscriber_params
-          params.require(:subscriber).permit(:first_name, :last_name, :email, :phone_number, tags: [])
+          params.require(:subscriber).permit(:first_name, :last_name, :email, :phone_number, :metadata_yaml, tags: [])
         end
 
         def set_objects

data/app/controllers/nuntius/messages_controller.rb

@@ -13,9 +13,7 @@ module Nuntius
 
     # GET /messages/:message_id/pixel.gif
     def pixel
-      return if request.env["HTTP_REFERER"].to_s.include?(Nuntius.config.host(@message))
-
-      if @message&.open_tracking_enabled?
+      if external? && @message&.open_tracking_enabled?
         # Record the first open time
         @message.opened_at ||= Time.current
         @message.open_count = (@message.open_count || 0) + 1
@@ -28,11 +26,9 @@ module Nuntius
 
     # GET /messages/:message_id/link?url=...
     def link
-      return if request.env["HTTP_REFERER"].to_s.include?(Nuntius.config.host(@message))
-
       url = params[:url]
 
-      if @message&.link_tracking_enabled? && url.present?
+      if external? && @message&.link_tracking_enabled? && url.present?
         # Record the first click time
         @message.clicked_at ||= Time.current
         @message.click_count = (@message.click_count || 0) + 1
@@ -53,6 +49,10 @@ module Nuntius
 
     private
 
+    def external?
+      request.env["HTTP_REFERER"].to_s.include?(Nuntius.config.host(@message))
+    end
+
     def set_objects
       @message = Nuntius::Message.find(params[:id])
     end

data/app/drops/nuntius/subscriber_drop.rb

@@ -2,6 +2,6 @@
 
 module Nuntius
   class SubscriberDrop < ApplicationDrop
-    delegate :id, :first_name, :last_name, :name, :list, to: :@object
+    delegate :id, :first_name, :last_name, :name, :list, :metadata, to: :@object
   end
 end

data/app/models/nuntius/subscriber.rb

@@ -2,11 +2,15 @@
 
 module Nuntius
   class Subscriber < ApplicationRecord
+    include Nuntius::Concerns::Yamlify
+
     belongs_to :list, counter_cache: :subscribers_count
     belongs_to :nuntiable, polymorphic: true, optional: true
 
     scope :subscribed, -> { where(unsubscribed_at: nil) }
 
+    yamlify :metadata
+
     def name
       [first_name, last_name].compact.join(" ").presence || email
     end

data/app/services/nuntius/deliver_campaign_service.rb

@@ -22,13 +22,16 @@ module Nuntius
     end
 
     def new_message(subscriber, assigns = {})
+      message = Nuntius::Message.create!(transport: campaign.transport, campaign: campaign, nuntiable: subscriber.nuntiable, metadata: campaign.metadata)
+
       assigns["campaign"] = context.campaign
       assigns["subscriber"] = subscriber
+      assigns["subscriber_link"] = subscriber_link(subscriber, message)
+
       if subscriber.nuntiable
         name = Nuntius::BaseMessenger.liquid_variable_name_for(subscriber.nuntiable)
         assigns[name] = subscriber.nuntiable
       end
-      message = Nuntius::Message.new(transport: campaign.transport, campaign: campaign, nuntiable: subscriber.nuntiable, metadata: campaign.metadata)
 
       locale = nil
       if subscriber.nuntiable
@@ -49,6 +52,7 @@ module Nuntius
       message.subject = render(:subject, assigns, locale)
       message.html = render(:html, assigns, locale, layout: campaign.layout&.data)
 
+      message.save!
       message
     end
 
@@ -58,6 +62,11 @@ 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/services/nuntius/email_tracking_service.rb

@@ -41,6 +41,8 @@ module Nuntius
       doc = Nokogiri::HTML.fragment(html)
 
       doc.css("a[href]").each do |link|
+        next if link["data-nuntius-tracking"] == "false"
+
         original_url = link["href"]
 
         # Skip if it's a mailto, tel, anchor link or liquid variable

data/app/views/nuntius/admin/campaigns/edit.html.slim

@@ -15,7 +15,7 @@
         .col-span-4
           = f.association :layout, collection: @layouts
         .col-span-4
-          = f.association :list, collection: @lists
+          = f.association :list, collection: @lists, hint: t(".list_hint")
 
         .col-span-12
           = f.input :from, hint: t(".from_hint")
@@ -39,5 +39,31 @@
           .col-span-12
             = f.input :text, as: :editor, mode: 'text/plain'
 - else
-  = sts.card :nuntius_admin_campaigns, title: @campaign.name, description: 'We are sending or have sent this campaign, you can no longer make any changes.', icon: 'fal fa-megaphone', content_padding: false do |card|
-    = sts.table :"nuntius/campaign_messages", params: { campaign_id: @campaign.id }
+  = sts.card :nuntius_admin_campaigns, title: @campaign.name, icon: 'fal fa-megaphone', content_padding: false do |card|
+    - card.with_tab :statistics, padding: true do |tab|
+      .grid.grid-cols-4.gap-4
+        .col-span-4
+          dl.grid.grid-cols-4.gap-1.overflow-hidden.rounded-2xl.text-center.sm:grid-cols-4.lg:grid-cols-4
+            .flex.flex-col.bg-gray-200.p-8
+              dt.text-sm.font-semibold.leading-6.text-gray-600
+                = t(".messages_sent")
+              dd.order-first.text-3xl.font-semibold.tracking-tight.text-gray-900
+                = @campaign.messages.where(status: "sent").count
+            .flex.flex-col.bg-gray-200.p-8
+              dt.text-sm.font-semibold.leading-6.text-gray-600
+                = t(".messages_not_sent") 
+              dd.order-first.text-3xl.font-semibold.tracking-tight.text-gray-900
+                = @campaign.messages.where.not(status: "sent").count
+            .flex.flex-col.bg-gray-200.p-8
+              dt.text-sm.font-semibold.leading-6.text-gray-600
+                = t(".messages_opened")
+              dd.order-first.text-3xl.font-semibold.tracking-tight.text-gray-900
+                = @campaign.messages.where("open_count >= 1").count
+            .flex.flex-col.bg-gray-200.p-8
+              dt.text-sm.font-semibold.leading-6.text-gray-600
+                = t(".messages_clicked")
+              dd.order-first.text-3xl.font-semibold.tracking-tight.text-gray-900
+                = @campaign.messages.where("click_count >= 1").count
+        
+    - card.with_tab :messages, padding: false do |tab|
+      = sts.table :"nuntius/campaign_messages", params: { campaign_id: @campaign.id }

data/app/views/nuntius/admin/layouts/edit.html.slim

@@ -25,4 +25,4 @@
 
     - if @layout.templates.exists?
       - card.with_tab :templates, padding: false
-        = sts.table :"nuntius/templates", filters: { layout_id: @layout.id }
+        = sts.table :"nuntius/templates", params: { layout_id: @layout.id }

data/app/views/nuntius/admin/layouts/index.html.slim

@@ -1,2 +1,2 @@
 = sts.card :nuntius_admin_layouts, icon: 'fad fa-table-layout', content_padding: false, menu: nuntius_layouts_menu do |card|
-  = sts.table :"nuntius/layouts", custom_views: true
+  = sts.table :"nuntius/layouts"

data/app/views/nuntius/admin/lists/edit.html.slim

@@ -19,4 +19,4 @@
 
     - if @list.subscribers.exists?
       - card.with_tab :subscribers, padding: false
-        = sts.table :"nuntius/subscribers", filters: { list_id: @list.id }
+        = sts.table :"nuntius/subscribers", params: { list_id: @list.id }

data/app/views/nuntius/admin/lists/subscribers/edit.html.slim

@@ -12,3 +12,5 @@
         = f.input :phone_number
       .col-span-12
         = f.input :email
+      .col-span-12
+        = f.input :metadata_yaml, as: :editor, mode: 'application/yaml', label: t('.metadata')

data/app/views/nuntius/admin/messages/show.html.slim

@@ -1,4 +1,4 @@
-= sts.card :nuntius_admin_messages, title: [t('.message'), @message.template&.description], icon: 'fad fa-envelope' do |card|
+= sts.card :nuntius_admin_messages, title: [t('.message'), @message.template&.description||@message.campaign&.name], icon: 'fad fa-envelope' do |card|
   - card.with_action
     = button_to(t('nuntius.context_menu.resend'), resend_admin_message_path(@message), class: 'button')
 

data/app/views/nuntius/admin/templates/edit.html.slim

@@ -85,4 +85,4 @@
 
       - if @template.messages.exists?
         - card.with_tab :messages, padding: false
-          = sts.table :"nuntius/messages", filters: { template_id: @template.id }
+          = sts.table :"nuntius/messages", params: { template_id: @template.id }

data/app/views/nuntius/admin/templates/index.html.slim

@@ -1,2 +1,2 @@
 = sts.card :nuntius_admin_templates, icon: 'fad fa-file', content_padding: false, menu: nuntius_templates_menu do |card|
-  = sts.table :"nuntius/templates", custom_views: true
+  = sts.table :"nuntius/templates"

data/config/locales/en.yml

@@ -1,4 +1,5 @@
 en:
+  subscriber_url_text: "Click here to unsubscribe"
   choose_files: Choose files
   activerecord:
     attributes:
@@ -57,7 +58,17 @@ en:
             nuntius_admin_campaigns:
               title: Campaigns
           from_hint: "You can leave this blank, only fill this in if you want to override the default"
+          list_hint: "You can re-use a list from a previous campaign, for the same purpose. Unsubscribes happen against the list."
           metadata: Metadata
+          tabs:
+            main:
+              tab:
+                statistics: Statistics
+                messages: Messages
+          messages_sent: Messages sent
+          messages_not_sent: Messages not sent
+          messages_opened: Messages opened
+          messages_clicked: Messages clicked
         index:
           card:
             nuntius_admin_campaigns:
@@ -99,6 +110,7 @@ en:
               title: Lists
         subscribers:
           edit:
+            metadata: Metadata
             subscribers: Subscribers
       locales:
         edit:

data/config/locales/nl.yml

@@ -1,11 +1,13 @@
 nl:
+  subscriber_url_text: "Klik hier om uit te schrijven"
   choose_files: Kies bestanden
   activerecord:
     attributes:
       nuntius/campaign:
         from: Van
-        layout: Layout
-        list: Lijst
+        layout_id: Layout
+        list_id: Lijst
+        list_name: Lijst naam
         name: Naam
         state: Staat
         subject: Onderwerp
@@ -28,6 +30,17 @@ nl:
         subject: Onderwerp
         to: Aan
         transport: Transport
+        messages_count: Aantal berichten
+      nuntius/message:
+        to: Aan
+        from: Van
+        subject: Onderwerp
+        transport: Transport
+        last_sent_at: Laatste keer verzonden
+        open_count: Aantal geopend
+        click_count: Aantal geklikt
+        campaign_id: Campagne
+        created_at: Aangemaakt om
     models:
       campaign: Campagne
       layout: Layout
@@ -58,6 +71,16 @@ nl:
               title: Campagne
           metadata: Metadata
           from_hint: "Je kunt dit leeg laten, vul dit alleen in als je de standaard wilt overschrijven"
+          list_hint: "Je kunt een lijst hergebruiken van een vorige campagne, voor hetzelfde doel. Uitschrijvingen gebeuren tegen de lijst."
+          tabs:
+            main:
+              tab:
+                statistics: Statistieken
+                messages: Berichten
+          messages_sent: Berichten verzonden
+          messages_not_sent: Berichten niet verzonden
+          messages_opened: Berichten geopend
+          messages_clicked: Berichten geklikt
         index:
           card:
             nuntius_admin_campaigns:
@@ -100,6 +123,7 @@ nl:
               title: Lijsten
         subscribers:
           edit:
+            metadata: Metadata
             subscribers: Abonnees
       locales:
         edit:

data/db/migrate/20260225123822_add_metadata_to_subscriber.rb

@@ -0,0 +1,5 @@
+class AddMetadataToSubscriber < ActiveRecord::Migration[8.1]
+  def change
+    add_column :nuntius_subscribers, :metadata, :jsonb, default: {}
+  end
+end

data/lib/nuntius/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nuntius
 version: !ruby/object:Gem::Version
-  version: 1.4.9
+  version: 1.4.10
 platform: ruby
 authors:
 - Tom de Grunt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-02-24 00:00:00.000000000 Z
+date: 2026-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apnotic
@@ -566,6 +566,7 @@ files:
 - db/migrate/20250521132554_update_nuntius_events_index.rb
 - 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
 - lib/generators/nuntius/install_generator.rb
 - lib/generators/nuntius/tailwind_config_generator.rb
 - lib/generators/nuntius/templates/config/initializers/nuntius.rb