sidekiq-amigo 1.4.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: defd2060d1c4a56780815bbaff9cfc54169ed12857fc5c1e20a075a5ea60ee8d
-  data.tar.gz: 1cefc43ca64867f333d5706c5f2df3998a3fac294d957ccdf95f05763589d1aa
+  metadata.gz: 70d47770af144a84aedec89e8b74e4ebd13851119a5c329a0f4c65d56ec94a60
+  data.tar.gz: 69305abac1bb5eeb00eaf81613e591476bf1acb35cdac50dcc97a094d255aab8
 SHA512:
-  metadata.gz: fde4becc89be41126f447ce282a9c6ccbe5adb05b979cc6dbea455d7bd7735043001115722450b412434253a23dc0b80bab6766b43804ad58698d0eddfd6713b
-  data.tar.gz: 43209e4289474df8d62bc1d8052869df1cd7c375df921ead70f5aeb69f03be79dbaba53f33b1f04d66153681fd0f6e92a598176a3e7261718cda972306b571af
+  metadata.gz: adf9aa76c352c9ddb9832f142d415b4efded423324dd78a87cfc3140a755eb266dd1a1b80e15a2f911ccafaaf8ea89f416d66dfe25a17955709fb1e4828554ef
+  data.tar.gz: f69c16bfd06a7ea5cc3ac15db4a962f3fb02345db60ac6f581123bf5425627775bb1958e9f99ff0be8b5956db57d4c6fec64d5422ff7903c0157bf0a0f8ba4d1

data/lib/amigo/retry.rb

@@ -52,6 +52,12 @@ module Amigo
       end
     end
 
+    # Raise this error to finish the job. Usually used when there is a fatal error
+    # from deep in a job and they want to jump out of the whole thing.
+    # Usually you should log before raising this!
+    class Quit < Error
+    end
+
     class ServerMiddleware
       def call(worker, job, _queue)
         yield
@@ -61,6 +67,9 @@ module Amigo
         handle_die(worker, job, e)
       rescue Amigo::Retry::OrDie => e
         handle_retry_or_die(worker, job, e)
+      rescue Amigo::Retry::Quit
+        Sidekiq.logger.info("job_quit")
+        return
       end
 
       def handle_retry(worker, job, e)

data/lib/amigo/router.rb

@@ -11,7 +11,13 @@ module Amigo
     def perform(event_json)
       event_name = event_json["name"]
       matches = Amigo.registered_event_jobs.
-        select { |job| File.fnmatch(job.pattern, event_name, File::FNM_EXTGLOB) }
+        select do |job|
+        if job.pattern.is_a?(Regexp)
+          job.pattern.match(event_name)
+        else
+          File.fnmatch(job.pattern, event_name, File::FNM_EXTGLOB)
+        end
+      end
       matches.each do |job|
         Amigo.synchronous_mode ? job.new.perform(event_json) : job.perform_async(event_json)
       end

data/lib/amigo/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Amigo
-  VERSION = "1.4.1"
+  VERSION = "1.5.0"
 end

data/lib/amigo.rb

@@ -57,6 +57,9 @@ require "sidekiq-cron"
 # The 'on' pattern can be 'myapp.customer.*' to match all customer events for example,
 # or '*' to match all events. The rules of matching follow File.fnmatch.
 #
+# The 'on' pattern also accepts regular expressions, like /^myapp\.customer\.[a-z]+$/,
+# to control the matching rules more closely than File.fnmatch can provide.
+#
 # Jobs must implement a `_perform` method, which takes a Amigo::Event.
 # Note that normal Sidekiq workers use a 'perform' method that takes a variable number of arguments;
 # the base Async::Job class has this method and delegates its business logic to the subclass _perform method.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-amigo
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
 platform: ruby
 authors:
 - Lithic Technology
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-24 00:00:00.000000000 Z
+date: 2023-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq