nuntius 1.1.4 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1dadbe5b3ded5dffcb6ceba8c5630fcce1d02905030087f3ac2fe7a5b0e94c0d
-  data.tar.gz: 909fce72b52db1d9b24c2445a6e13767564f56f633fee205eeb0b8e497ed407f
+  metadata.gz: aa439d75f1be61c5122338f9d0c2c74b68d016e91208756d9ad2be119845ad51
+  data.tar.gz: 164ff8b68eb4912eaabade99a3ee39e593d5c2274345211601dccf14d6bb11c1
 SHA512:
-  metadata.gz: 617adffb4414a45c2eb885666a030225b7338d736ead1960bce4aae499960c4123de259c48bdf04584e033b65809abf1e4cfe076e24c67961508c66ecdaea27b
-  data.tar.gz: 1b8dba96defc70f262b455bbcd5ae87e5313e96e891910075eede92027c07811e524d1c25b83f0776b649b40e5bc1e11d0a771193069efa7f6bb52328f3d948d
+  metadata.gz: 3f40c494fc93610eee81a49f8b648b7cb3dafa8be578b051d24cfa8a052536ce69f6eb252df05eb98c5367bd28fe10c5109ad668b10efde3b015355282293e92
+  data.tar.gz: 65088baae2f8f957ac6dab1c14d9945d43e594149c9074d257d4a1db5f6f582a02801642c4348c3cd8b2a5c02c93ade63599d61d474869e30920a06e2d75cbd6

data/Rakefile

@@ -33,7 +33,3 @@ Rake::TestTask.new(:test) do |t|
 end
 
 task default: :test
-
-# Adds the Auxilium semver task
-spec = Gem::Specification.find_by_name "auxilium"
-load "#{spec.gem_dir}/lib/tasks/semver.rake"

data/app/providers/nuntius/teams_teams_provider.rb

@@ -6,6 +6,7 @@ module Nuntius
 
     def deliver
       # NOTE: Attachments are not supported
+      # https://adaptivecards.io/designer/
       # https://learn.microsoft.com/en-us/power-automate/overview-adaptive-cards
       # https://learn.microsoft.com/en-us/microsoftteams/platform/webhooks-and-connectors/how-to/add-incoming-webhook?tabs=newteams%2Cdotnet
 

data/lib/nuntius/active_record_helpers.rb

@@ -3,7 +3,8 @@
 require_relative "nuntiable"
 require_relative "devise"
 require_relative "state_machine"
-require_relative "transactio"
+require_relative "life_cycle"
+# require_relative "transactio"
 
 module Nuntius::ActiveRecordHelpers
   extend ActiveSupport::Concern
@@ -18,7 +19,7 @@ module Nuntius::ActiveRecordHelpers
       include Nuntius::Nuntiable
       include Nuntius::StateMachine if options[:use_state_machine]
       include Nuntius::Devise if options[:override_devise]
-      include Nuntius::Transactio
+      include Nuntius::LifeCycle if options[:life_cycle]
     end
 
     def nuntiable?

data/lib/nuntius/devise.rb

@@ -7,12 +7,13 @@ module Nuntius
     included do
       raise "#{name} must be nuntiable" unless nuntiable?
 
-      orchestrator = Evento::Orchestrator.new(self)
-      orchestrator.define_event_methods_on(messenger, devise: true) { |object, options = {}| }
+      I18n.t('devise.mailer').keys.map(&:to_s).each do |event_name|
+        messenger.send(:define_method, event_name) { |object, options = {}| }
+      end
 
-      orchestrator.override_devise_notification do |notification, *devise_params|
+      define_method(:send_devise_notification) do |notification, *devise_params|
         # All notifications have either a token as the first param, or nothing
-        Nuntius.event(notification, self, {token: devise_params.first})
+        Nuntius.event(notification, self, { token: devise_params.first })
       end
     end
   end

data/lib/nuntius/engine.rb

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

data/lib/nuntius/life_cycle.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Nuntius
+  module LifeCycle
+    extend ActiveSupport::Concern
+
+    included do
+      raise "#{name} must be nuntiable" unless nuntiable?
+
+      after_commit do
+        if previously_persisted?
+          Nuntius.event(:destroy, self)
+        elsif previously_new_record?
+          Nuntius.event(:create, self)
+          Nuntius.event(:save, self)
+        else
+          Nuntius.event(:update, self)
+          Nuntius.event(:save, self)
+        end
+      end
+
+      %i[create destroy update save].each do |event_name|
+        next if messenger.method_defined?(event_name)
+        messenger.send(:define_method, event_name) { |object, options = {}| }
+      end
+    end
+  end
+end

data/lib/nuntius/state_machine.rb

@@ -1,18 +1,40 @@
 # frozen_string_literal: true
 
 module Nuntius
+
   module StateMachine
     extend ActiveSupport::Concern
 
     included do
       raise "#{name} must be nuntiable" unless nuntiable?
 
-      orchestrator = Evento::Orchestrator.new(self)
-      orchestrator.define_event_methods_on(messenger, state_machine: true) { |object, options = {}| }
+      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
 
-      orchestrator.after_audit_trail_commit(:nuntius) do |resource_state_transition|
-        resource = resource_state_transition.resource
-        Nuntius.event(event, resource) if resource.nuntiable? && event.present?
+        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

data/lib/nuntius/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nuntius
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.2.0
 platform: ruby
 authors:
 - Tom de Grunt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-21 00:00:00.000000000 Z
+date: 2024-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apnotic
@@ -52,20 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.56'
-- !ruby/object:Gem::Dependency
-  name: evento
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: fcm
   requirement: !ruby/object:Gem::Requirement
@@ -154,16 +140,16 @@ dependencies:
   name: labelary
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: liquidum
   requirement: !ruby/object:Gem::Requirement
@@ -238,16 +224,16 @@ dependencies:
   name: parse-cron
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -266,16 +252,16 @@ dependencies:
   name: premailer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.23'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.23'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -551,11 +537,11 @@ files:
 - lib/nuntius/devise.rb
 - lib/nuntius/engine.rb
 - lib/nuntius/i18n_store.rb
+- lib/nuntius/life_cycle.rb
 - lib/nuntius/liquid/tags/attach_tag.rb
 - lib/nuntius/mail_allow_list.rb
 - lib/nuntius/nuntiable.rb
 - lib/nuntius/state_machine.rb
-- lib/nuntius/transactio.rb
 - lib/nuntius/version.rb
 - lib/preamble.rb
 - lib/tasks/nuntius_tasks.rake

data/lib/nuntius/transactio.rb

@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-module Nuntius
-  module Transactio
-    extend ActiveSupport::Concern
-
-    included do
-      raise "#{name} must be nuntiable" unless nuntiable?
-
-      orchestrator = Evento::Orchestrator.new(self)
-      if nuntiable_options[:life_cycle]
-        orchestrator.define_event_methods_on(messenger, life_cycle: true) do |object, options = {}|
-        end
-      end
-
-      orchestrator = Evento::Orchestrator.new(self)
-      orchestrator.after_transaction_log_commit(:nuntius) do |transaction_log_entry|
-        resource = transaction_log_entry.transaction_loggable
-        event = transaction_log_entry.event
-
-        if resource.present? && event.present? && resource.nuntiable?
-          params = Nuntius.config.default_params(transaction_log_entry)
-
-          Nuntius.event(event, resource, params)
-          Nuntius.event("save", resource, params) if %w[create update].include?(event)
-        end
-      end
-    end
-  end
-end