eventsimple 1.1.0 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c89fd452fb688ea84659fb341c78b8c30ce14632a948750fab7ec831d34baf0e
-  data.tar.gz: ef3abdd6bd8158e65e476a23170c9e9b42329974abd7de679f2ca27c2203972e
+  metadata.gz: 989aab149125d77a97510193a1905233eef5714a798a821e14fa7697247b5403
+  data.tar.gz: 7dc3276c03f6ab9617733ef292297ba2e5dc9b414c5d221621b2bed5a8635151
 SHA512:
-  metadata.gz: 804e17de52e7f4f5c172b1e3a8735c1037966298aaf40952ffc36446ad37514890fabe4cf602164932723598c83d8060a6ab0f9a05d39d01b932b9fbcd0bd401
-  data.tar.gz: 77589ed9dbb33bd4142282599f00a53790468ebdd1695d74bd19a1a7d515937988c31c70db84cbc2b91a76ce0e3b32aab910735cacbfc3f4e81ce055fc4023c7
+  metadata.gz: a378b62e0dc1e50540b85f002b06d5a8ff8b17d338b9b7a860d97f630538c919dde28bd1ff44c1d0ef62e29044e26f11089115e03bbd08545c60566fd893a9c5
+  data.tar.gz: 34cd12770a08ff80b4c6e7ee6e01e0c8e347415d7303ee646d4328a734ca2214180cd64e223e38fe7bae1bb6f39a702aa44ad2dc9e440677cd42e3ce1424618b

data/CHANGELOG.md

@@ -6,6 +6,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## 1.1.2 - 2023-06-22
+### Changed
+- Fix exception noise generated by early global_id desrialization
+
+## 1.1.1 - 2023-06-19
+### Changed
+- Remove active_job_parent_klass config introduced in 1.1.0. There isn't a usecase for it yet,
+  and it was causing loading issues.
+
 ## 1.1.0 - 2023-06-11
 ### Changed
 - Reactors now use ActiveJob instead of Sidekiq directly. This allows for more

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    eventsimple (1.1.0)
+    eventsimple (1.1.2)
       dry-struct (~> 1.6)
       dry-types (~> 1.7)
       pg (~> 1.4)
@@ -159,7 +159,7 @@ GEM
     mini_mime (1.1.2)
     minitest (5.18.0)
     nenv (0.3.0)
-    net-imap (0.3.4)
+    net-imap (0.3.6)
       date
       net-protocol
     net-pop (0.1.2)
@@ -284,7 +284,7 @@ GEM
       rubocop (>= 0.53.0)
     ruby-progressbar (1.13.0)
     shellany (0.0.1)
-    sidekiq (7.1.1)
+    sidekiq (7.1.2)
       concurrent-ruby (< 2)
       connection_pool (>= 2.3.0)
       rack (>= 2.2.4)

data/README.md

@@ -74,11 +74,6 @@ Setup an initializer in `config/initializers/eventsimple.rb`:
     # Defaults to `Eventsimple::Metadata`
     config.metadata_klass = 'Eventsimple::Metadata'
 
-    # Optional: Reactors inherit from an ActiveJob base class.
-    # Set the parent class for reactors.
-    # Defaults to ActiveJob::Base.
-    config.active_job_parent_klass = 'ApplicationJob'
-
     # Optional: When using an ActiveJob adapter that writes to a different data store like redis,
     # it is possible that the reactor is executed before the transaction persisting the event is committed. This can result in noisy errors when using processors like Sidekiq.
     # Enable this option to retry the reactor inline if the event is not found.

data/lib/eventsimple/active_job/arguments.rb

@@ -0,0 +1,20 @@
+require 'active_job/arguments'
+
+module ActiveJob
+  module Arguments
+    extend self
+
+    def deserialize_global_id(hash)
+      # For non database based processors like sidekiq, the reactor may trigger before the
+      # transaction is committed. Attempt to wait for the transaction to be commited before
+      # running the reactor. This is not a perfect solution, but it's better than nothing.
+      if Eventsimple.configuration.retry_reactor_on_record_not_found
+        Retriable.with_context(:reactor) do
+          ApplicationRecord.uncached { GlobalID::Locator.locate hash[GLOBALID_KEY] }
+        end
+      else
+        GlobalID::Locator.locate hash[GLOBALID_KEY]
+      end
+    end
+  end
+end

data/lib/eventsimple/configuration.rb

@@ -4,7 +4,6 @@ module Eventsimple
   class Configuration
     attr_reader :max_concurrency_retries
     attr_writer :metadata_klass
-    attr_writer :active_job_parent_klass
     attr_accessor :retry_reactor_on_record_not_found
 
     attr_accessor :ui_visible_models
@@ -13,7 +12,6 @@ module Eventsimple
       @dispatchers = []
       @max_concurrency_retries = 2
       @metadata_klass = 'Eventsimple::Metadata'
-      @active_job_parent_klass = 'ActiveJob::Base'
       @retry_reactor_on_record_not_found = false
 
       @ui_visible_models = [] # internal use only
@@ -34,7 +32,6 @@ module Eventsimple
     end
 
     # rubocop:disable Naming/MemoizedInstanceVariableName
-
     def dispatchers
       @dispatchers_klass_consts ||= @dispatchers.map(&:constantize)
     end
@@ -42,10 +39,6 @@ module Eventsimple
     def metadata_klass
       @metadata_klass_const ||= @metadata_klass.constantize
     end
-
-    def active_job_parent_klass
-      @active_job_parent_klass_const ||= @active_job_parent_klass.constantize
-    end
     # rubocop:enable Naming/MemoizedInstanceVariableName
   end
 end

data/lib/eventsimple/reactor.rb

@@ -1,32 +1,15 @@
 # frozen_string_literal: true
 
 module Eventsimple
-  class Reactor < Eventsimple.configuration.active_job_parent_klass
+  class Reactor < ActiveJob::Base # rubocop:disable Rails/ApplicationJob
     queue_as :eventsimple
 
-    def perform(event)
-      call(event)
+    discard_on ActiveJob::DeserializationError do |job, error|
+      Rails.logger.warn("Event #{job.arguments.first} not found for reactor: #{self.class}")
     end
 
-    around_perform do |job, block|
-      event_global_id = job.arguments.first
-      reactor_class = job.arguments.second
-
-      # For non database based processors like sidekiq, the reactor may trigger before the
-      # transaction is committed. Attempt to wait for the transaction to be commited before
-      # running the reactor. This is not a perfect solution, but it's better than nothing.
-      if Eventsimple.configuration.retry_reactor_on_record_not_found
-        begin
-          Retriable.with_context(:reactor) do
-            ApplicationRecord.uncached { GlobalID::Locator.locate(event_global_id) }
-          end
-        rescue ActiveRecord::RecordNotFound
-          Rails.logger.error("Event #{event_global_id} not found for reactor: #{reactor_class}")
-          return
-        end
-      end
-
-      block.call
+    def perform(event)
+      call(event)
     end
   end
 end

data/lib/eventsimple/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Eventsimple
-  VERSION = '1.1.0'
+  VERSION = '1.1.2'
 end

data/lib/eventsimple.rb

@@ -13,6 +13,7 @@ require 'sidekiq'
 
 require 'dry_types'
 
+require 'eventsimple/active_job/arguments'
 require 'eventsimple/configuration'
 require 'eventsimple/message'
 require 'eventsimple/data_type'
@@ -20,6 +21,7 @@ require 'eventsimple/metadata_type'
 require 'eventsimple/metadata'
 require 'eventsimple/dispatcher'
 require 'eventsimple/event_dispatcher'
+require 'eventsimple/reactor'
 require 'eventsimple/reactor_worker'
 require 'eventsimple/invalid_transition'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eventsimple
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.2
 platform: ruby
 authors:
 - Zulfiqar Ali
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-15 00:00:00.000000000 Z
+date: 2023-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-struct
@@ -253,6 +253,7 @@ files:
 - eventsimple.gemspec
 - lib/dry_types.rb
 - lib/eventsimple.rb
+- lib/eventsimple/active_job/arguments.rb
 - lib/eventsimple/configuration.rb
 - lib/eventsimple/data_type.rb
 - lib/eventsimple/dispatcher.rb