sidekiq-recursive 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c314d036966c7977f1647dca8d10a139d2897a26
-  data.tar.gz: 87d913ed242b44275d845bf811521a71163854f6
+SHA256:
+  metadata.gz: 1d53c4fb9b4dbdc525a168796d1f8340e436c4d89ff1490b3d46a0ffce0469f8
+  data.tar.gz: c6a66d65b9f0ed6438f21f8969a58f1463a8a6afee6c0ded64de5614cbfbb903
 SHA512:
-  metadata.gz: 3e0876def8a48e6cae0bf6201f616eb4a6d69a8a90ebbb47d8ef0188d43942ee9374a197c4e06c93e73ff98cdd4f56a8d98ee278949b6a0152f3aa1db327c485
-  data.tar.gz: 42305c2399da0bcd64de5766160a15a79967c2e5421218d28aa57f5b2369e8d4b15c69be51907d6b3e24126f954b46d8b57dc6cead6ae8de6b018c65c37c7334
+  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,18 +1,20 @@
 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
 
   def self.safe_process(worker_instance, argument)
     worker_instance.process(argument)
-  rescue
-    worker_instance.class.perform_async(:failed_worker, argument)
+  rescue StandardError
+    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,14 +1,14 @@
+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/version'
 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.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Justas Kazakauskas
-autorequire: 
-bindir: exe
+autorequire:
+bindir: bin
 cert_chain: []
-date: 2018-04-01 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: '5.1'
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,112 +27,27 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.16'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.16'
-- !ruby/object:Gem::Dependency
-  name: fakeredis
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.7.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.7.0
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.11.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.11.3
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '12.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '12.3'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '8.0'
 description: Use simple recursion to limit sidekiq workers per job.
 email: leakymirror@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
-- CODE_OF_CONDUCT.md
-- Gemfile
-- Gemfile.lock
-- LICENSE.txt
-- Makefile
-- README.md
-- Rakefile
-- bin/console
-- bin/setup
 - 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
-- sidekiq-recursive.gemspec
 homepage: https://github.com/justaskz/sidekiq-recursive
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -140,16 +55,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
-signing_key: 
+rubygems_version: 3.5.3
+signing_key:
 specification_version: 4
 summary: Use simple recursion to limit sidekiq workers per job
 test_files: []

data/.gitignore

@@ -1,12 +0,0 @@
-/.bundle/
-/.yardoc
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-*gem
-
-# rspec failure tracking
-.rspec_status

data/.rspec

@@ -1 +0,0 @@
---require spec_helper

data/.travis.yml

@@ -1,5 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-  - 2.4.1
-before_install: gem install bundler -v 1.16.1

data/CODE_OF_CONDUCT.md

@@ -1,74 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, gender identity and expression, level of experience,
-nationality, personal appearance, race, religion, or sexual identity and
-orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or
-advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
-  address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at justas.kazakauskas@vinted.com. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at [http://contributor-covenant.org/version/1/4][version]
-
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/

data/Gemfile

@@ -1,6 +0,0 @@
-source "https://rubygems.org"
-
-git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
-
-# Specify your gem's dependencies in sidekiq-recursive.gemspec
-gemspec

data/Gemfile.lock

@@ -1,56 +0,0 @@
-PATH
-  remote: .
-  specs:
-    sidekiq-recursive (0.2.0)
-      sidekiq (~> 5.1, >= 3.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    coderay (1.1.2)
-    concurrent-ruby (1.0.5)
-    connection_pool (2.2.1)
-    diff-lcs (1.3)
-    fakeredis (0.7.0)
-      redis (>= 3.2, < 5.0)
-    method_source (0.9.0)
-    pry (0.11.3)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    rack (2.0.4)
-    rack-protection (2.0.1)
-      rack
-    rake (12.3.1)
-    redis (4.0.1)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
-    sidekiq (5.1.2)
-      concurrent-ruby (~> 1.0)
-      connection_pool (~> 2.2, >= 2.2.0)
-      rack-protection (>= 1.5.0)
-      redis (>= 3.3.5, < 5)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.16)
-  fakeredis (~> 0.7.0)
-  pry (~> 0.11.3)
-  rake (~> 12.3)
-  rspec (~> 3.7)
-  sidekiq-recursive!
-
-BUNDLED WITH
-   1.16.1

data/LICENSE.txt

@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2018 Justas Kazakauskas
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.

data/Makefile

@@ -1,13 +0,0 @@
-test:
-	@ rspec
-
-build: clear
-	@ bundle
-	@ gem build *.gemspec
-
-release: test build
-	@ gem push *.gem
-
-clear:
-	@ rm -rf pkg
-	@ rm -rf *.gem

data/README.md

@@ -1,78 +0,0 @@
-# Sidekiq::Recursive
-Use simple recursion to limit sidekiq workers per job
-
-## Installation
-
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'sidekiq-recursive'
-```
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install sidekiq-recursive
-
-## Usage
-
-```ruby
-class CleanUpOldUsers
-  include Sidekiq::Worker
-  include Sidekiq::Recursive::Worker
-
-  recursive_worker_count 5
-
-  def process(user_id)
-    User.destroy(user_id)
-  end
-end
-
-user_ids = User.where(is_old: true).ids
-CleanUpOldUsers.run(user_ids)
-```
-
-#### before_all and after_all hooks
-```ruby
-class CleanUpOldUsers
-  include Sidekiq::Worker
-  include Sidekiq::Recursive::Worker
-
-  recursive_worker_count 5
-  before_all :bar
-  after_all :foo
-
-  def bar
-    # do something before starting all workers
-  end
-
-  def process(user_id)
-    User.destroy(user_id)
-  end
-
-  def foo
-    # do something after all workers are finished
-  end
-end
-```
-
-## Development
-
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
-
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
-
-## Contributing
-
-Bug reports and pull requests are welcome on GitHub at https://github.com/justaskz/sidekiq-recursive. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
-
-## License
-
-The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
-
-## Code of Conduct
-
-Everyone interacting in the Sidekiq::Recursive project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/justaskz/sidekiq-recursive/blob/master/CODE_OF_CONDUCT.md).

data/Rakefile

@@ -1,6 +0,0 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-
-RSpec::Core::RakeTask.new(:spec)
-
-task :default => :spec

data/bin/console

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "sidekiq/recursive"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start(__FILE__)

data/bin/setup

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here

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.0'
-  end
-end

data/sidekiq-recursive.gemspec

@@ -1,32 +0,0 @@
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'sidekiq/recursive/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = 'sidekiq-recursive'
-  spec.version       = Sidekiq::Recursive::VERSION
-  spec.authors       = 'Justas Kazakauskas'
-  spec.email         = 'leakymirror@gmail.com'
-
-  spec.summary       = 'Use simple recursion to limit sidekiq workers per job'
-  spec.description   = 'Use simple recursion to limit sidekiq workers per job.'
-  spec.homepage      = 'https://github.com/justaskz/sidekiq-recursive'
-  spec.license       = 'MIT'
-
-  spec.required_ruby_version = '>= 2.0'
-
-  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^(test|spec|features)/})
-  end
-  spec.bindir        = 'exe'
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ['lib']
-
-  spec.add_runtime_dependency 'sidekiq', '>= 3.0', '~> 5.1'
-
-  spec.add_development_dependency 'bundler', '~> 1.16'
-  spec.add_development_dependency 'fakeredis', '~> 0.7.0'
-  spec.add_development_dependency 'pry', '~> 0.11.3'
-  spec.add_development_dependency 'rake', '~> 12.3'
-  spec.add_development_dependency 'rspec', '~> 3.7'
-end