sidekiq-clutch 1.1.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34898643a173edd20ec4a28e2a2f01f15c05d9e074d67a72e9f06a56580f2367
-  data.tar.gz: 4e39b5cd8a173520db812680c647ba8708f547614986bb8ad13be5d872377117
+  metadata.gz: 3c1c011474bce5ee85157d392601fea64a7e173c3bd3dd90d976a6909f6c3217
+  data.tar.gz: d5ee4da83925370f370c9bcffbf5e5d7543b6534b6458ce8b1af7a5c38df679e
 SHA512:
-  metadata.gz: fcfd9af62fc2a84546862f12813ffed617eaeee69b10f0136529a70d4307bfb85616b1629223d50e909c967d98462dcf4b04ec0492c56f3dd5fd5ce43bda2946
-  data.tar.gz: 699d22544e893ea1130e0bd4967888781d2ee1856b7a918a919eff639b4dcd40cade5651840ab22b95f9b43a27262078d37b30e32b0ff6aea3a06203d378e897
+  metadata.gz: 6e5f4c4629928d3b6089e64f158a2b2a3aa2b1d28c1ec81db522d6bf42865426c964a6f1b721c50d0af04222d644c99305a1b0a5049824a16cd5d0b5a5e911cd
+  data.tar.gz: fe33f33a75b67511c4a759dec8fb3977547e21885d55293ca2bf56a4bc241679bded581dfdc78a7f3ffaacd963814b8f580b97296853098f7966eb8dc82e1b01

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 2.0.0 - Feb 5, 2020
+
+* BREAKING: Treat each parallel block as a distinct step
+
 # 1.1.0 - Feb 5, 2020
 
 * FEAT: use Sidekiq's wrapped option for improved logging

data/lib/sidekiq/clutch.rb

@@ -10,18 +10,18 @@ module Sidekiq
       @batch = batch || Sidekiq::Batch.new
     end
 
-    attr_reader :batch, :queue
+    attr_reader :batch, :queue, :parallel_key
 
     attr_accessor :current_result_key, :on_failure
 
     def parallel
-      @parallel = true
+      @parallel_key = SecureRandom.uuid
       yield
-      @parallel = false
+      @parallel_key = nil
     end
 
     def parallel?
-      @parallel == true
+      !!@parallel_key
     end
 
     def jobs

data/lib/sidekiq/clutch/jobs_collection.rb

@@ -22,7 +22,7 @@ module Sidekiq
 
       def <<((klass, *params))
         if @service.parallel?
-          @jobs << { 'parallel' => [], 'result_key' => next_result_key } unless @jobs.last && @jobs.last['parallel']
+          @jobs << new_parallel_step unless continue_existing_parallel_step?
           @jobs.last['parallel'] << [klass.name, params]
         else
           @jobs << { 'series' => [klass.name, params], 'result_key' => next_result_key }
@@ -33,6 +33,16 @@ module Sidekiq
         @result_key_index += 1
         "#{@result_key_prefix}-#{@result_key_index}"
       end
+
+      private
+
+      def new_parallel_step
+        { 'parallel' => [], 'result_key' => next_result_key, 'parallel_key' => @service.parallel_key }
+      end
+
+      def continue_existing_parallel_step?
+        @jobs.last && @jobs.last['parallel_key'] == @service.parallel_key
+      end
     end
   end
 end

data/lib/sidekiq/clutch/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   class Clutch
-    VERSION = "1.1.0"
+    VERSION = "2.0.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-clutch
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Tim Morgan