sidekiq-recursive 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 167fe7d1d7abfc01a5b0efd0ae38c6a973a36123ee4c0f46af01e82a84aa3bf8
-  data.tar.gz: 0f69a42dbca65d9e598cd62514e761f41cce05bc84a6a8fbb85ec9dfc96b6ad3
+  metadata.gz: 1d53c4fb9b4dbdc525a168796d1f8340e436c4d89ff1490b3d46a0ffce0469f8
+  data.tar.gz: c6a66d65b9f0ed6438f21f8969a58f1463a8a6afee6c0ded64de5614cbfbb903
 SHA512:
-  metadata.gz: d3e0c107ea4dc180ca9ce67ca578881ca99e233882ebda43f271ed6da56df98c210c1c09239eeec958b4a94da939b1a6768ce329a3f9d46251b4dc442efd2aab
-  data.tar.gz: b85598a1f13ab9a6ce0fe4d773d1c9e47167f3a6eda4df2201078f43d7767ac5718d48cf576de756583051f302fe078d8fedc76b5f7d17aa78b830bf04e72bf3
+  metadata.gz: ab3d30b806cfeceea20dfa20822b49d3d791b52b805b4d09062669b5de7e1a995c901f8f6033e25bb740e0e2524d7a827e9d2d34ff7c9ff3556799f2e80d5b24
+  data.tar.gz: 1cb96f287e0bdb0ac4aea8aa3b51b20b426975d69ebd4d03964b5d5225f93326fb3159833440d9d9e62c88ea4ded5b413f52bbf594123d23fca52ecaeb171010

data/lib/sidekiq/recursive/argument_queue.rb

@@ -1,21 +1,21 @@
 class Sidekiq::Recursive::ArgumentQueue
   class << self
-    def push(worker, arguments)
-      arguments_queue_name = generate_arguments_queue_name(worker)
+    def push(worker_class, arguments)
+      arguments_queue_name = generate_arguments_queue_name(worker_class)
       redis_client.rpush(arguments_queue_name, arguments)
 
       true
     end
 
-    def pop(worker)
-      arguments_queue_name = generate_arguments_queue_name(worker)
+    def pop(worker_class)
+      arguments_queue_name = generate_arguments_queue_name(worker_class)
       redis_client.lpop(arguments_queue_name)
     end
 
     private
 
-    def generate_arguments_queue_name(worker)
-      worker.to_s
+    def generate_arguments_queue_name(worker_class)
+      "recursive_queue__#{worker_class}"
     end
 
     def redis_client

data/lib/sidekiq/recursive/hooks/after_all.rb

@@ -1,9 +1,10 @@
 class Sidekiq::Recursive::Hooks::AfterAll
-  def self.run(worker, worker_id)
-    action_name = worker.after_all
+  def self.run(worker_class, worker_id)
+    action_name = worker_class.after_all
     return unless action_name
-    return unless worker.recursive_worker_count == worker_id
-    worker.new.send(action_name)
+    return unless worker_class.worker_count == worker_id
+
+    worker_class.new.send(action_name)
     true
   end
 end

data/lib/sidekiq/recursive/hooks/before_all.rb

@@ -1,8 +1,10 @@
 class Sidekiq::Recursive::Hooks::BeforeAll
-  def self.run(worker)
-    action_name = worker.before_all
+  def self.run(worker_class)
+    action_name = worker_class.before_all
     return unless action_name
-    worker.new.send(action_name)
+
+    worker_class.new.send(action_name)
+
     true
   end
 end

data/lib/sidekiq/recursive/perform.rb

@@ -1,11 +1,13 @@
 class Sidekiq::Recursive::Perform
   def self.run(worker_instance, worker_id, argument)
-    worker = worker_instance.class
-    return worker_instance.process(argument) if worker_id == :failed_worker
+    worker_class = worker_instance.class
+    return worker_instance.process(argument) if worker_id == Sidekiq::Recursive::FAILED_WORKER_ID
+
     safe_process(worker_instance, argument)
-    next_argument = Sidekiq::Recursive::ArgumentQueue.pop(worker)
-    return Sidekiq::Recursive::Hooks::AfterAll.run(worker, worker_id) unless next_argument
-    worker.perform_async(worker_id, next_argument)
+    next_argument = Sidekiq::Recursive::ArgumentQueue.pop(worker_class)
+    return Sidekiq::Recursive::Hooks::AfterAll.run(worker_class, worker_id) unless next_argument
+
+    worker_class.perform_async(worker_id, next_argument)
 
     true
   end
@@ -13,6 +15,6 @@ class Sidekiq::Recursive::Perform
   def self.safe_process(worker_instance, argument)
     worker_instance.process(argument)
   rescue StandardError
-    worker_instance.class.perform_async(:failed_worker, argument)
+    worker_instance.class.perform_async(Sidekiq::Recursive::FAILED_WORKER_ID, argument)
   end
 end

data/lib/sidekiq/recursive/start.rb

@@ -1,11 +1,11 @@
 class Sidekiq::Recursive::Start
-  def self.run(worker, arguments)
-    Sidekiq::Recursive::ArgumentQueue.push(worker, arguments)
-    Sidekiq::Recursive::Hooks::BeforeAll.run(worker)
+  def self.run(worker_class, arguments)
+    Sidekiq::Recursive::ArgumentQueue.push(worker_class, arguments)
+    Sidekiq::Recursive::Hooks::BeforeAll.run(worker_class)
 
-    1.upto(worker.recursive_worker_count) do |worker_id|
-      argument = Sidekiq::Recursive::ArgumentQueue.pop(worker)
-      worker.perform_async(worker_id, argument)
+    1.upto(worker_class.worker_count) do |worker_id|
+      argument = Sidekiq::Recursive::ArgumentQueue.pop(worker_class)
+      worker_class.perform_async(worker_id, argument)
     end
 
     true

data/lib/sidekiq/recursive/worker.rb

@@ -5,14 +5,18 @@ module Sidekiq::Recursive::Worker
   end
 
   module ClassMethods
-    def run(arguments)
+    def call(arguments)
       Sidekiq::Recursive::Start.run(self, arguments)
+
       true
     end
 
-    def recursive_worker_count(count = nil)
-      raise Sidekiq::Recursive::UndefinedWorkerCountError if count.nil? && @worker_count.nil?
-      @worker_count ||= count
+    def recursive_worker_count(worker_count)
+      @worker_count = worker_count
+    end
+
+    def worker_count
+      @worker_count
     end
 
     def before_all(action_name = nil)
@@ -27,6 +31,7 @@ module Sidekiq::Recursive::Worker
   module InstanceMethods
     def perform(worker_id, argument)
       Sidekiq::Recursive::Perform.run(self, worker_id, argument)
+
       true
     end
   end

data/lib/sidekiq/recursive.rb

@@ -1,15 +1,14 @@
-require 'sidekiq/recursive/version'
+module Sidekiq
+  module Recursive
+    FAILED_WORKER_ID = 'failed_worker'
+
+    module Hooks; end
+  end
+end
 
 require 'sidekiq/recursive/argument_queue'
-require 'sidekiq/recursive/hooks'
 require 'sidekiq/recursive/hooks/after_all'
 require 'sidekiq/recursive/hooks/before_all'
 require 'sidekiq/recursive/perform'
 require 'sidekiq/recursive/start'
 require 'sidekiq/recursive/worker'
-
-module Sidekiq
-  module Recursive
-    class UndefinedWorkerCountError < StandardError; end
-  end
-end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-recursive
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Justas Kazakauskas
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-23 00:00:00.000000000 Z
+date: 2024-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -17,9 +17,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,9 +27,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8.0'
 description: Use simple recursion to limit sidekiq workers per job.
 email: leakymirror@gmail.com
 executables: []
@@ -38,12 +38,10 @@ extra_rdoc_files: []
 files:
 - lib/sidekiq/recursive.rb
 - lib/sidekiq/recursive/argument_queue.rb
-- lib/sidekiq/recursive/hooks.rb
 - lib/sidekiq/recursive/hooks/after_all.rb
 - lib/sidekiq/recursive/hooks/before_all.rb
 - lib/sidekiq/recursive/perform.rb
 - lib/sidekiq/recursive/start.rb
-- lib/sidekiq/recursive/version.rb
 - lib/sidekiq/recursive/worker.rb
 homepage: https://github.com/justaskz/sidekiq-recursive
 licenses:

data/lib/sidekiq/recursive/hooks.rb

@@ -1,2 +0,0 @@
-module Sidekiq::Recursive::Hooks
-end

data/lib/sidekiq/recursive/version.rb

@@ -1,5 +0,0 @@
-module Sidekiq
-  module Recursive
-    VERSION = '0.2.1'
-  end
-end