nuntius 1.4.1 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be4761123ee4a2d8aaca7f70592b66c3f0f2c1a352596e10233f9e1f7fae1d82
-  data.tar.gz: 4a725d5bfa7f330ac1a7b89955b7df2aef3a56ee1ee36a8ea1a85074f26a6d77
+  metadata.gz: 503ba69f7497033d55a16b1ec419a8c7b9083c31e55ac8c80bfc93bbb3581f7c
+  data.tar.gz: c690591944454ff27e64faa46d0fad4240cc5f2124f5ee2c21182e991c268b20
 SHA512:
-  metadata.gz: 108cc9efe6c26d6cc223fe9c58f671bbfc95ac4992c1859feca5d9f4d718eab4811b60d045b04cec06595bfcdc77ecf18e391dce0de87a8cce6388c52cb98b94
-  data.tar.gz: afffc5c56327a134603c24520727ee9d1b76b527a1e378de6c350d71f459e488e8238c8dda9bf4ea562ce1b12107aa4d6bda3349109bafbc92f23815cb5abc8a
+  metadata.gz: 33ebca7868482ad0f3682a719a160ce53c98ae232eb5416952cc676ad2c568a2eefa1c67073e87990ac99e0409315b9100c4be79b67434dd1dfeb2cda4fb2f94
+  data.tar.gz: 4b2aa8d8a6f238001c2f0610b3fd797d80b68860e1b1335453daf382988610d3f01a5760ec37ef5c287967ab0feb5140fe4772fc520dd67856dcbad3a9c5736f

data/app/jobs/nuntius/messenger_job.rb

@@ -3,8 +3,11 @@
 # 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
+
       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)
@@ -13,19 +16,15 @@ module Nuntius
         return if result == false
 
         templates = messenger.templates
-        messenger.dispatch(templates) if templates.present?
+        messenger.dispatch(templates) if templates.exists?
       end
-      cleanup_nuntius_events(obj, event)
     end
 
-    def cleanup_nuntius_events(obj, event)
-
-      nuntius_events = Nuntius::Event.where(
-        transitionable_id: obj["id"],
-        transitionable_type: obj["type"],
-        transition_event: event.to_s
-      )
-      nuntius_events.destroy_all
+    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

@@ -4,26 +4,38 @@ module Nuntius
       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 |record, transition|
-            event = Nuntius::Event.find_or_initialize_by(
-              transitionable_id: record.id,
-              transitionable_type: record.class.to_s,
-              transition_event: transition.event.to_s,
-              transition_attribute: transition.attribute.to_s
-            )
-            event.update!(
-              transition_from: transition.from.to_s,
-              transition_to: transition.to.to_s
-            )
+          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 do
-          Nuntius::Event.all.each do |transition|
-            transitionable = transition.transitionable_type.constantize.find(transition.transitionable_id)
-            Nuntius.event(transition.transition_event.to_sym, transitionable)
-          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

data/app/models/nuntius/event.rb

@@ -3,4 +3,4 @@ module Nuntius
     belongs_to :transitionable, polymorphic: true
     validates :transition_event, :transition_attribute, :transition_from, :transition_to, presence: true
   end
-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/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,8 +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]
+      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.1"
+  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.1
+  version: 1.4.3
 platform: ruby
 authors:
 - Tom de Grunt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-20 00:00:00.000000000 Z
+date: 2025-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apnotic
@@ -572,6 +572,7 @@ files:
 - 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
@@ -587,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