acidic_job 1.0.0.pre16 → 1.0.0.pre17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53f3b1dca6c15b94a5fef3e2e2bd6c23d4f60a6635fa729426bcd98e08bfcf22
-  data.tar.gz: 64fe54f8707c255211dba80c678012f4068ccc0fb279a50043afff4812649467
+  metadata.gz: c458faa1225d1b5e0fe7590bdd00371169de92b638dfbc74e88958b2430c5c7e
+  data.tar.gz: 8657eea5fd2a3929d049be9a7da1a252413cab1de42b991178673328202f4ee1
 SHA512:
-  metadata.gz: a657457d4714245dda16796e59e35e91246842e1c7dd92c174ac0469674e0a1145f0c20b55cbae4b02e82f391f8e5e8527ab267d88a82d6868578177ce19db9a
-  data.tar.gz: 785185e925ae66815668fdecbb8ab66bdf71553ecc52eb0002f3ecbd327b2680bc3777db3caf26e00c664dcd83d138e2142b43eb488aaf26c739c9a3099ddb52
+  metadata.gz: 4ae6d08046b2bc2e3388544fa61f308cf57c9dab5a4f67a923d1400ca7743fb48966a9aa0ce504a2d16d5c7e80fc98d8fd5308583236ff305ffb0d1b2eb17c70
+  data.tar.gz: afee2f7723b316410d1144cf71c42cbace68ff304842cc1c29cd0a358c297ae47f9ae1166e3cd1daef8e677dbdd38b11fb64e771d2d1975afc399cafb8329129

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    acidic_job (1.0.0.pre16)
+    acidic_job (1.0.0.pre17)
       activerecord
       activesupport
       database_cleaner
@@ -205,7 +205,7 @@ GEM
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
     ruby-progressbar (1.11.0)
-    sidekiq (6.4.1)
+    sidekiq (6.4.2)
       connection_pool (>= 2.2.2)
       rack (~> 2.0)
       redis (>= 4.2.0)

data/lib/acidic_job/extensions/sidekiq.rb

@@ -25,12 +25,16 @@ module AcidicJob
           # and `AcidicJob::DeliverAcidicly#deliver_acidicly`
           def serialize_with_arguments(args = [], _kwargs = nil)
             # THIS IS A HACK THAT ESSENTIALLY COPIES THE CODE FROM THE SIDEKIQ CODEBASE TO MIMIC THE BEHAVIOR
+            # updated to handle Sidekiq v6.4.2 at latest
             args = Array[args]
             normalized_args = ::Sidekiq.load_json(::Sidekiq.dump_json(args))
             item = { "class" => self, "args" => normalized_args }
             dummy_sidekiq_client = ::Sidekiq::Client.new
             normed = dummy_sidekiq_client.send :normalize_item, item
-            dummy_sidekiq_client.send :process_single, item["class"], normed
+            redis_pool = dummy_sidekiq_client.instance_variable_get(:@redis_pool)
+            dummy_sidekiq_client.middleware.invoke(normed["class"], normed, normed["queue"], redis_pool) do
+              normed
+            end
           end
         end
 

data/lib/acidic_job/step.rb

@@ -52,6 +52,12 @@ module AcidicJob
       # {"does" => :enqueue_step, "then" => :next_step, "awaits" => [WorkerWithEnqueueStep::FirstWorker]}
       current_step = step["does"]
       next_step = step["then"]
+      # to support iteration within steps
+      iterable_key = step["for_each"]
+      iterated_key = "processed_#{iterable_key}"
+      iterables = @run.attr_accessors.fetch(iterable_key, [])
+      iterateds = @run.attr_accessors.fetch(iterated_key, [])
+      next_item = iterables.reject { |item| iterateds.include? item }.first
 
       # jobs can have no-op steps, especially so that they can use only the async/await mechanism for that step
       callable = if @job.respond_to?(current_step, _include_private = true)
@@ -62,7 +68,11 @@ module AcidicJob
 
       # return a callable Proc with a consistent interface for the execution phase
       proc do |run|
-        result = if callable.arity.zero?
+        result = if iterable_key.present? && next_item.present?
+                   callable.call(next_item)
+                 elsif iterable_key.present? && next_item.nil?
+                   true
+                 elsif callable.arity.zero?
                    callable.call
                  elsif callable.arity == 1
                    callable.call(run)
@@ -72,6 +82,11 @@ module AcidicJob
 
         if result.is_a?(FinishedPoint)
           result
+        elsif next_item.present?
+          iterateds << next_item
+          @run.attr_accessors[iterated_key] = iterateds
+          @run.save!(validate: false)
+          RecoveryPoint.new(current_step)
         elsif next_step.to_s == Run::FINISHED_RECOVERY_POINT
           FinishedPoint.new
         else

data/lib/acidic_job/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AcidicJob
-  VERSION = "1.0.0.pre16"
+  VERSION = "1.0.0.pre17"
 end

data/lib/acidic_job.rb

@@ -131,7 +131,7 @@ module AcidicJob
     return run.succeeded? if run.finished?
 
     # otherwise, we will enter a loop to process each step of the workflow
-    run.workflow.size.times do
+    loop do
       recovery_point = run.recovery_point.to_s
       current_step = run.workflow[recovery_point]
 
@@ -170,12 +170,13 @@ module AcidicJob
     run.succeeded?
   end
 
-  def step(method_name, awaits: [])
+  def step(method_name, awaits: [], for_each: nil)
     @__acidic_job_steps ||= []
 
     @__acidic_job_steps << {
       "does" => method_name.to_s,
-      "awaits" => awaits
+      "awaits" => awaits,
+      "for_each" => for_each
     }
 
     @__acidic_job_steps

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acidic_job
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre16
+  version: 1.0.0.pre17
 platform: ruby
 authors:
 - fractaledmind
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-11 00:00:00.000000000 Z
+date: 2022-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord