sidekiq-grouping 1.1.0 → 1.3.0

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 $LOAD_PATH << "." unless $LOAD_PATH.include?(".")
 
 require "rubygems"
@@ -7,6 +9,7 @@ require "simplecov"
 require "sidekiq"
 require "rspec-sidekiq"
 require "support/test_workers"
+require "pry"
 
 SimpleCov.start do
   add_filter "spec"
@@ -15,8 +18,10 @@ end
 require "sidekiq/grouping"
 
 Sidekiq::Grouping.logger = nil
-Sidekiq.redis = { namespace: ENV["namespace"] }
-Sidekiq.logger = nil
+Sidekiq.configure_client do |config|
+  config.redis = { db: 1 }
+  config.logger = nil
+end
 
 RSpec::Sidekiq.configure do |config|
   config.clear_all_enqueued_jobs = true
@@ -28,14 +33,19 @@ RSpec.configure do |config|
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
 
-  config.before :each do
+  config.before do
     Sidekiq.redis do |conn|
-      keys = conn.keys "*batching*"
-      keys.each { |key| conn.del key }
+      if Sidekiq::VERSION[0].to_i >= 7
+        keys = conn.call("KEYS", "*batching*")
+        keys.each { |key| conn.call("DEL", key) }
+      else
+        keys = conn.keys "*batching*"
+        keys.each { |key| conn.del key }
+      end
     end
   end
 
-  config.after :each do
+  config.after do
     Timecop.return
   end
 end

data/spec/support/test_workers.rb

@@ -1,8 +1,9 @@
+# frozen_string_literal: true
+
 class RegularWorker
   include Sidekiq::Worker
 
-  def perform(foo)
-  end
+  def perform(foo); end
 end
 
 class BatchedSizeWorker
@@ -10,8 +11,7 @@ class BatchedSizeWorker
 
   sidekiq_options queue: :batched_size, batch_flush_size: 3, batch_size: 2
 
-  def perform(foo)
-  end
+  def perform(foo); end
 end
 
 class BatchedIntervalWorker
@@ -19,8 +19,7 @@ class BatchedIntervalWorker
 
   sidekiq_options queue: :batched_interval, batch_flush_interval: 3600
 
-  def perform(foo)
-  end
+  def perform(foo); end
 end
 
 class BatchedBothWorker
@@ -30,8 +29,7 @@ class BatchedBothWorker
     queue: :batched_both, batch_flush_interval: 3600, batch_flush_size: 3
   )
 
-  def perform(foo)
-  end
+  def perform(foo); end
 end
 
 class BatchedUniqueArgsWorker
@@ -41,6 +39,5 @@ class BatchedUniqueArgsWorker
     queue: :batched_unique_args, batch_flush_size: 3, batch_unique: true
   )
 
-  def perform(foo)
-  end
+  def perform(foo); end
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-grouping
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Victor Sokolov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-15 00:00:00.000000000 Z
+date: 2022-12-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -24,6 +38,20 @@ dependencies:
     - - ">"
       - !ruby/object:Gem::Version
         version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -53,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rspec-sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-sidekiq
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: timecop
+  name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: appraisal
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,13 +137,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -123,19 +151,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sidekiq
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.2
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -150,26 +178,47 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sidekiq
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.4.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.4.2
 description:
 email:
 - gzigzigzeo@gmail.com
-executables: []
+executables:
+- console
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/lint.yml"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.yml"
 - Appraisals
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/console
 - gemfiles/sidekiq_4.0.gemfile
 - gemfiles/sidekiq_4.1.gemfile
 - gemfiles/sidekiq_4.2.gemfile
 - gemfiles/sidekiq_5.0.gemfile
+- gemfiles/sidekiq_6.0.gemfile
+- gemfiles/sidekiq_6.5.gemfile
+- gemfiles/sidekiq_7.0.gemfile
 - gemfiles/sidekiq_master.gemfile
+- lefthook.yml
 - lib/sidekiq/grouping.rb
 - lib/sidekiq/grouping/batch.rb
 - lib/sidekiq/grouping/config.rb
@@ -177,6 +226,7 @@ files:
 - lib/sidekiq/grouping/flusher_observer.rb
 - lib/sidekiq/grouping/middleware.rb
 - lib/sidekiq/grouping/redis.rb
+- lib/sidekiq/grouping/redis_dispatcher.rb
 - lib/sidekiq/grouping/version.rb
 - lib/sidekiq/grouping/views/index.erb
 - lib/sidekiq/grouping/web.rb
@@ -189,7 +239,8 @@ files:
 homepage: http://github.com/gzigzigzeo/sidekiq-grouping
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -198,19 +249,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.19
 signing_key:
 specification_version: 4
 summary: Allows identical sidekiq jobs to be processed with a single background call
-test_files:
-- spec/modules/batch_spec.rb
-- spec/modules/redis_spec.rb
-- spec/spec_helper.rb
-- spec/support/test_workers.rb
+test_files: []

data/.travis.yml

@@ -1,18 +0,0 @@
-language: ruby
-rvm:
-  - 2.2
-  - 2.3.1
-  - 2.4
-  - 2.5
-
-cache: bundler
-
-services:
-  - redis-server
-
-gemfile:
-  - gemfiles/sidekiq_4.0.gemfile
-  - gemfiles/sidekiq_4.1.gemfile
-  - gemfiles/sidekiq_4.2.gemfile
-  - gemfiles/sidekiq_5.0.gemfile
-  - gemfiles/sidekiq_master.gemfile