nuntius 1.4.5 → 1.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72c62131cce1070a9f5841ae23c99337cacb49b71beb4f9746fe4712b4c29c63
-  data.tar.gz: 3afc9c7a30ee98df0a59b982547a8015d9dcaa110b6b7ae8f21f8d1b78709539
+  metadata.gz: 60ba6bdae28e285f54ae11261866c96857711e32dc2d8f066a39f01acfff444f
+  data.tar.gz: f0044e290dc4e32eee2eb7ce024e74325aa437846b304920f2d31d1f211e43d5
 SHA512:
-  metadata.gz: 7de8e870aef90f772b92ceeca210a358e911067b2c1348f51611e2904baf7c366682b13e3d77633f293f233e8e370d7e7010694eb08ff19320102edcda24a3f1
-  data.tar.gz: 93e801e4b808a632c5c8df2162eb7d7e4a7062f7538353628a088c121618c43a7e175db24361476351a9e747532a089382f3cd8f65f986bbbd6ab67c47da1896
+  metadata.gz: 05ba146b1ee291c41819bef8041ed961c6c93c52ffa0474e9522e9e2e5a37657427d61aca8bb387233c6c1c3f641189113dcdd986bfa8f0a1fe137e4266be607
+  data.tar.gz: d23e9470ad3bc65cc2b1a0f3134d5f45367afcabd152d3e936998142edf67e91a22122fa8b712b3fc49710e609804cc8ce62c7e96d0e99d2f4c2db71acdfe12d

data/README.md

@@ -152,6 +152,48 @@ Beter even is using Sidekiq::Cron or GoodJob
 Nuntius will automatically prevent sending duplicates within the timerange you define. 
 It will also ONLY send messages for objects (the one in template class), created after you created this template, this prevents sending dozens of emails which may make no sense, when you add a new template.
 
+### Locales
+
+Nuntius supports locale support in it's mails. You can add locales for your emails per language:
+
+Add a locale with key `en`:
+```yaml
+en:
+  salutation: "Hello %{name}"
+```
+
+Then in your template you can do:
+```liquid
+{{'salutation' | t name: {{car.owner}} }}
+```
+
+### Metadata
+
+You can use metadata in your template to guide some text and information in your layout. 
+
+Say you need to change the header of an email, based on the template. In your layout you can then do this:
+
+```html
+<h2>{{template.metadata.header}}</h2>
+```
+
+And in you template metadata:
+
+```yaml
+header: You lost your password?
+```
+
+Say your layout has a logo image, which needs to change based on the brand of the car.
+In your layout html you can do the following, to grab
+
+```html
+<img src="{%render template.metadata.logo_url%}" alt="logo"/>
+```
+
+in your template metadata:
+```yaml
+logo_path: "{{car.brand.logo_path}}"
+```
 ### Direct
 
 Another more direct way of using Nuntius is by just instantiating a message:

data/app/jobs/nuntius/application_job.rb

@@ -4,6 +4,7 @@ module Nuntius
   class ApplicationJob < ActiveJob::Base
     retry_on ActiveJob::DeserializationError
     retry_on ActiveRecord::Deadlocked
+    retry_on Net::OpenTimeout
     queue_as Nuntius.config.jobs_queue_name
   end
 end

data/app/jobs/nuntius/messenger_job.rb

@@ -3,8 +3,6 @@
 # Initializes the appropriate Messenger class and calls the event method
 module Nuntius
   class MessengerJob < ApplicationJob
-    after_perform :cleanup_nuntius_events
-
     def perform(obj, event, params = {})
       return unless obj
 
@@ -19,12 +17,5 @@ module Nuntius
         messenger.dispatch(templates) if templates.exists?
       end
     end
-
-    def cleanup_nuntius_events
-      Nuntius::Event.where(
-        transitionable: arguments.first,
-        transition_event: arguments.second.to_s
-      ).delete_all
-    end
   end
 end

data/app/models/nuntius/concerns/events_transaction.rb

@@ -31,10 +31,15 @@ module Nuntius
 
       def dispatch_nuntius_events
         Nuntius::Event
-          .where(transitionable_type: self.class.name,transitionable_id: self.id,)
+          .where(transitionable_type: self.class.name, transitionable_id: id)
           .includes(:transitionable)
-          .select(:transition_event, :transitionable_type, :transitionable_id).distinct.each do |event|
+          .select(:transition_event, :transition_attribute, :transitionable_type, :transitionable_id).distinct.each do |event|
           Nuntius.event(event.transition_event.to_sym, event.transitionable)
+
+          # Immediately cleanup the events after dispatching
+          Nuntius::Event.where(transitionable_type: self.class.name, transitionable_id: id,
+            transition_event: event.transition_event.to_s,
+            transition_attribute: event.transition_attribute).delete_all
         end
       end
     end

data/app/models/nuntius/message.rb

@@ -69,7 +69,7 @@ module Nuntius
         # FIXME: This is a possible security problem
         attachment[:io] = File.open(uri.path)
       elsif uri
-        client = Faraday.new(ssl: {verify: false}) do |builder|
+        client = Faraday.new do |builder|
           builder.response :follow_redirects
           builder.adapter Faraday.default_adapter
         end

data/app/tables/nuntius/messages_table.rb

@@ -2,12 +2,20 @@
 
 module Nuntius
   class MessagesTable < Nuntius::ApplicationTable
+
     definition do
       model Nuntius::Message
 
       column(:to)
       column(:created_at)
       column(:last_sent_at)
+      action :resend do
+        link { |message| nuntius.resend_admin_message_path(message) }
+        icon "fal fa-rotate-right"
+        link_attributes data: {"turbo-confirm": "Are you sure you want to resend the message?", "turbo-method": :post}
+        show ->(message) { true }
+      end
+      
       column(:campaign_id) do
         render do
           html do |message|

data/db/migrate/20260123160443_change_nuntius_events_id.rb

@@ -0,0 +1,12 @@
+class ChangeNuntiusEventsId < ActiveRecord::Migration[8.1]
+  def change
+    execute "DELETE  FROM public.nuntius_events;"
+    add_column :nuntius_events, :uuid, :uuid, default: "gen_random_uuid()", null: false
+
+    change_table :nuntius_events do |t|
+      t.remove :id
+      t.rename :uuid, :id
+    end
+    execute "ALTER TABLE nuntius_events ADD PRIMARY KEY (id);"
+  end
+end

data/lib/nuntius/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nuntius
 version: !ruby/object:Gem::Version
-  version: 1.4.5
+  version: 1.4.7
 platform: ruby
 authors:
 - Tom de Grunt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-07-24 00:00:00.000000000 Z
+date: 2026-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apnotic
@@ -66,20 +66,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: houston
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.4'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -497,7 +483,6 @@ files:
 - app/providers/nuntius/apnotic_push_provider.rb
 - app/providers/nuntius/base_provider.rb
 - 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/slack_slack_provider.rb
 - app/providers/nuntius/smstools_sms_provider.rb
@@ -573,6 +558,7 @@ files:
 - db/migrate/20240206203019_add_slug_to_nuntius_list.rb
 - db/migrate/20250520091916_create_nuntius_events_table.rb
 - db/migrate/20250521132554_update_nuntius_events_index.rb
+- db/migrate/20260123160443_change_nuntius_events_id.rb
 - lib/generators/nuntius/install_generator.rb
 - lib/generators/nuntius/tailwind_config_generator.rb
 - lib/generators/nuntius/templates/config/initializers/nuntius.rb

data/app/providers/nuntius/houston_push_provider.rb

@@ -1,40 +0,0 @@
-# frozen_string_literal: true
-
-require "houston"
-
-module Nuntius
-  class HoustonPushProvider < BaseProvider
-    transport :push
-
-    setting_reader :certificate,
-      required: true,
-      description: "The contents of a valid APNS push certificate in .pem format"
-    setting_reader :passphrase,
-      required: false,
-      description: "If the APNS certificate is protected by a passphrase, " \
-                   "provide this variable to use when decrypting it."
-    setting_reader :environment,
-      required: false,
-      default: :production,
-      description: "Development or production, defaults to production"
-
-    def deliver
-      return message if message.to.size != 64
-
-      apn = (environment.to_sym == :development) ? Houston::Client.development : Houston::Client.production
-      apn.certificate = certificate
-      apn.passphrase = passphrase
-
-      notification = Houston::Notification.new((message.payload || {}).merge(device: message.to,
-        alert: message.text, sound: "default"))
-      apn.push(notification)
-
-      message.status = if notification.sent?
-        "sent"
-      elsif !notification.valid? || notification.error
-        "undelivered"
-      end
-      message
-    end
-  end
-end