Adding Sidekiq 7 support

Author: mayesa

lib/sidekiq/batch.rb

@@ -22,8 +22,9 @@ def initialize(existing_bid = nil)
       @bidkey = "BID-" + @bid.to_s
       @queued_jids = []
       @pending_jids = []
-      @incremental_push = Sidekiq.options.keys.include?(:batch_push_interval)
-      @batch_push_interval = Sidekiq.options[:batch_push_interval]
+      sidekiq_config = Sidekiq.const_defined?('MAJOR') && Sidekiq::MAJOR >= 7 ? (Thread.current[:sidekiq_capsule]&.config || Sidekiq.default_configuration) : Sidekiq.options
+      @incremental_push = sidekiq_config[:batch_push_interval]&.present?
+      @batch_push_interval = sidekiq_config[:batch_push_interval]
     end
 
     def description=(description)
@@ -102,7 +103,7 @@ def jobs
 
             pipeline.expire(@bidkey, BID_EXPIRE_TTL)
 
-            pipeline.sadd(@bidkey + "-jids", [@queued_jids])
+            pipeline.sadd(@bidkey + "-jids", [@queued_jids.flatten])
             pipeline.expire(@bidkey + "-jids", BID_EXPIRE_TTL)
           end
         end
@@ -247,7 +248,7 @@ def enqueue_callbacks(event, bid)
         already_processed, _, callbacks, queue, parent_bid, callback_batch = Sidekiq.redis do |r|
           r.multi do |pipeline|
             pipeline.hget(batch_key, event_name)
-            pipeline.hset(batch_key, event_name, true)
+            pipeline.hset(batch_key, event_name, 'true')
             pipeline.smembers(callback_key)
             pipeline.hget(batch_key, "callback_queue")
             pipeline.hget(batch_key, "parent_bid")
@@ -291,7 +292,7 @@ def enqueue_callbacks(event, bid)
         else
           # Otherwise finalize in sub batch complete callback
           cb_batch = self.new
-          cb_batch.callback_batch = true
+          cb_batch.callback_batch = 'true'
           Sidekiq.logger.debug {"Adding callback batch: #{cb_batch.bid} for batch: #{bid}"}
           cb_batch.on(:complete, "Sidekiq::Batch::Callback::Finalize#dispatch", opts)
           cb_batch.jobs do

sidekiq-batch.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "sidekiq", ">= 3", "<7"
+  spec.add_dependency "sidekiq", ">= 3", "<8"
 
   spec.add_development_dependency "bundler", "~> 2.1"
   spec.add_development_dependency "rake", "~> 13.0"

spec/sidekiq/batch/middleware_spec.rb

@@ -79,7 +79,7 @@
 end
 
 describe Sidekiq::Batch::Middleware do
-  let(:config) { class_double(Sidekiq) }
+  let(:config) { Sidekiq.const_defined?('MAJOR') && Sidekiq::MAJOR >= 7 ? double(Sidekiq.default_configuration) : class_double(Sidekiq) }
   let(:client_middleware) { double(Sidekiq::Middleware::Chain) }
 
   context 'client' do

spec/spec_helper.rb

@@ -1,3 +1,6 @@
+require 'sidekiq/testing' 
+Sidekiq::Testing.fake!
+
 require "simplecov"
 SimpleCov.start
 
@@ -6,7 +9,8 @@
 require 'sidekiq/batch'
 
 redis_opts = { url: "redis://127.0.0.1:6379/1" }
-redis_opts[:driver] = Redis::Connection::Memory if defined?(Redis::Connection::Memory)
+# This doesn't work with Sidekiq 7. Is fakeredis even needed?
+# redis_opts[:driver] = Redis::Connection::Memory if defined?(Redis::Connection::Memory)
 
 Sidekiq.configure_client do |config|
   config.redis = redis_opts