nuntius 1.4.0 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96231ee66f145c33c7c1fea7669be34a28d03c4c8f802cee010c984ad97f30c7
-  data.tar.gz: 98c827211fc8a8082710352838744ecb7b646ef4083493eb7078059b1627471b
+  metadata.gz: 503ba69f7497033d55a16b1ec419a8c7b9083c31e55ac8c80bfc93bbb3581f7c
+  data.tar.gz: c690591944454ff27e64faa46d0fad4240cc5f2124f5ee2c21182e991c268b20
 SHA512:
-  metadata.gz: d3c2ba2b4663c73fd4ac849b0a94878646b1f32c743be1c7f1db8f9529934920497abb54345f7d35b56f7cd682ecbc710944f3bd89c9a7444f7878b7967b79d4
-  data.tar.gz: d54a2dd92af1f92cc40886c4be3bdfea123bdcb9f451abca15b919258f010b2363bc404b3f6f0a7c1f78bf1fb417dc65f0328fca12d98e7c38e9f381a44c963d
+  metadata.gz: 33ebca7868482ad0f3682a719a160ce53c98ae232eb5416952cc676ad2c568a2eefa1c67073e87990ac99e0409315b9100c4be79b67434dd1dfeb2cda4fb2f94
+  data.tar.gz: 4b2aa8d8a6f238001c2f0610b3fd797d80b68860e1b1335453daf382988610d3f01a5760ec37ef5c287967ab0feb5140fe4772fc520dd67856dcbad3a9c5736f

data/README.md

@@ -150,7 +150,7 @@ in a cronjob every 5 minutes with "bundle exec rails runner 'Nuntius::TimebasedE
 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.
+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.
 
 ### Direct
 

data/app/jobs/nuntius/messenger_job.rb

@@ -3,17 +3,28 @@
 # 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
 
-      messenger = Nuntius::BaseMessenger.messenger_for_obj(obj).new(obj, event, params)
-      return unless messenger.is_a?(Nuntius::CustomMessenger) || messenger.respond_to?(event.to_sym)
+      ActiveRecord::Base.transaction do
+        messenger = Nuntius::BaseMessenger.messenger_for_obj(obj).new(obj, event, params)
+        return unless messenger.is_a?(Nuntius::CustomMessenger) || messenger.respond_to?(event.to_sym)
+
+        result = messenger.call
+        return if result == false
 
-      result = messenger.call
-      return if result == false
+        templates = messenger.templates
+        messenger.dispatch(templates) if templates.exists?
+      end
+    end
 
-      templates = messenger.templates
-      messenger.dispatch(templates) if templates.present?
+    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

@@ -0,0 +1,43 @@
+module Nuntius
+  module Concerns
+    module EventsTransaction
+      extend ActiveSupport::Concern
+
+      included do
+        state_machine.events.map(&:name)
+          .reject { |event_name| messenger.method_defined?(event_name) }
+          .each do |event_name|
+          messenger.send(:define_method, event_name) { |object, options = {}| }
+        end
+
+        state_machine do
+          after_transition any => any do |object, transition|
+            if object.persisted? && Nuntius.templates?(object, transition.event)
+              Nuntius::Event.find_or_create_by!(
+                transitionable_type: object.class.name,
+                transitionable_id: object.id,
+                # transitionable: object,
+                transition_event: transition.event.to_s,
+                transition_attribute: transition.attribute.to_s
+              ) do |event|
+                event.transition_from = transition.from.to_s
+                event.transition_to = transition.to.to_s
+              end
+            end
+          end
+        end
+
+        after_commit :dispatch_nuntius_events
+      end
+
+      def dispatch_nuntius_events
+        Nuntius::Event
+          .where(transitionable: self)
+          .includes(:transitionable)
+          .select(:transition_event, :transitionable_type, :transitionable_id).distinct.each do |event|
+          Nuntius.event(event.transition_event.to_sym, event.transitionable)
+        end
+      end
+    end
+  end
+end

data/app/models/nuntius/event.rb

@@ -0,0 +1,6 @@
+module Nuntius
+  class Event < ApplicationRecord
+    belongs_to :transitionable, polymorphic: true
+    validates :transition_event, :transition_attribute, :transition_from, :transition_to, presence: true
+  end
+end

data/app/models/nuntius/template.rb

@@ -33,8 +33,10 @@ module Nuntius
 
       options = {registers: {"template" => self, "message" => message}}
 
-      message.to = render(:to, assigns, locale, options).split(",").reject(&:empty?).join(",")
-      message.from = render(:from, assigns, locale, options).split(",").reject(&:empty?).join(",")
+      message.to = render(:to, assigns, locale, options).split(',').map(&:strip).reject{ |to| to == 'Liquid error internal' }.reject(&:empty?).join(',')
+      return unless message.to.present?
+
+      message.from = render(:from, assigns, locale, options).split(',').reject(&:empty?).join(',')
       message.subject = render(:subject, assigns, locale, options)
       message.html = render(:html, assigns, locale, options.merge(layout: layout&.data))
       message.text = render(:text, assigns, locale, options)

data/db/migrate/20250520091916_create_nuntius_events_table.rb

@@ -0,0 +1,12 @@
+class CreateNuntiusEventsTable < ActiveRecord::Migration[7.0]
+  def change
+    create_table :nuntius_events do |t|
+      t.references :transitionable, type: :uuid, polymorphic: true
+      t.string :transition_attribute
+      t.string :transition_event
+      t.string :transition_from
+      t.string :transition_to
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20250521132554_update_nuntius_events_index.rb

@@ -0,0 +1,9 @@
+class UpdateNuntiusEventsIndex < ActiveRecord::Migration[7.0]
+  def change
+    remove_index :nuntius_events, name: :index_nuntius_events_on_transitionable
+
+    add_index :nuntius_events,
+              [:transitionable_type, :transitionable_id, :transition_event],
+              name: :index_nuntius_events_on_type_id_event
+  end
+end

data/lib/nuntius/active_record_helpers.rb

@@ -2,7 +2,6 @@
 
 require_relative "nuntiable"
 require_relative "devise"
-require_relative "state_machine"
 require_relative "life_cycle"
 # require_relative "transactio"
 
@@ -17,7 +16,7 @@ module Nuntius::ActiveRecordHelpers
     def nuntiable(options = {})
       @_nuntius_nuntiable_options = options
       include Nuntius::Nuntiable
-      include Nuntius::StateMachine if options[:use_state_machine]
+      include Nuntius::Concerns::EventsTransaction if options[:use_state_machine] || options[:state_machine]
       include Nuntius::Devise if options[:override_devise]
       include Nuntius::LifeCycle if options[:life_cycle]
     end

data/lib/nuntius/version.rb

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

data/lib/nuntius.rb

@@ -50,10 +50,13 @@ module Nuntius
     end
 
     def templates?(obj, event)
-      Nuntius::Template.where(klass: Nuntius::BaseMessenger.class_names_for(obj),
-        event: Nuntius::BaseMessenger.event_name_for(
-          obj, event
-        )).where(enabled: true).count.positive?
+      messenger = Nuntius::BaseMessenger.messenger_for_obj(obj).new(obj, event)
+      return false unless messenger.is_a?(Nuntius::CustomMessenger) || messenger.respond_to?(event.to_sym)
+
+      result = messenger.call
+      return false if result == false
+
+      messenger.templates.exists?
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nuntius
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.3
 platform: ruby
 authors:
 - Tom de Grunt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-28 00:00:00.000000000 Z
+date: 2025-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apnotic
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
@@ -481,8 +481,10 @@ files:
 - app/models/nuntius/application_record.rb
 - app/models/nuntius/attachment.rb
 - app/models/nuntius/campaign.rb
+- app/models/nuntius/concerns/events_transaction.rb
 - app/models/nuntius/concerns/metadata_scoped.rb
 - app/models/nuntius/concerns/yamlify.rb
+- app/models/nuntius/event.rb
 - app/models/nuntius/inbound_message.rb
 - app/models/nuntius/layout.rb
 - app/models/nuntius/list.rb
@@ -569,6 +571,8 @@ files:
 - db/migrate/20220412114148_add_last_sent_to_message.rb
 - db/migrate/20240205204719_add_description_to_list.rb
 - 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
 - lib/generators/nuntius/install_generator.rb
 - lib/generators/nuntius/tailwind_config_generator.rb
 - lib/generators/nuntius/templates/config/initializers/nuntius.rb
@@ -584,7 +588,6 @@ files:
 - lib/nuntius/liquid/tags/attach_tag.rb
 - lib/nuntius/mail_allow_list.rb
 - lib/nuntius/nuntiable.rb
-- lib/nuntius/state_machine.rb
 - lib/nuntius/version.rb
 - lib/preamble.rb
 - lib/tasks/nuntius_tasks.rake

data/lib/nuntius/state_machine.rb

@@ -1,40 +0,0 @@
-# frozen_string_literal: true
-
-module Nuntius
-  module StateMachine
-    extend ActiveSupport::Concern
-
-    included do
-      raise "#{name} must be nuntiable" unless nuntiable?
-
-      state_machine.events.map(&:name)
-        .reject { |event_name| messenger.method_defined?(event_name) }
-        .each do |event_name|
-        messenger.send(:define_method, event_name) { |object, options = {}| }
-      end
-
-      after_commit do
-        Thread.current["___nuntius_state_machine_events"]&.each do |event|
-          Nuntius.event(event[:event], event[:object])
-        end
-        # After events are fired we can clear the events
-        Thread.current["___nuntius_state_machine_events"] = []
-      end
-
-      state_machine do
-        # This records events within the same thread, and clears them in the same thread.
-        # A different thread is a different transaction.
-        after_transition any => any do |record, transition|
-          ___record__nuntius_state_machine_event(transition.event, record)
-          ___record__nuntius_state_machine_event(:update, record)
-          ___record__nuntius_state_machine_event(:save, record)
-        end
-
-        def ___record__nuntius_state_machine_event(event, object)
-          Thread.current["___nuntius_state_machine_events"] ||= []
-          Thread.current["___nuntius_state_machine_events"] << {event: event, object: object}
-        end
-      end
-    end
-  end
-end