acidic_job 1.0.0.pre15 → 1.0.0.pre18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 027f8f80b370e238f64d6f6dbc9cbddd9738ebb97db7d5b9e35a8872933965f7
-  data.tar.gz: 95119d599bb5c986edce1fdcef26bf03c62b94fac85f6045d92d51b2793e59bd
+  metadata.gz: 6a350dbda056af9bf8965e6a68ece409285d0ba18c03c264509e7249e1635883
+  data.tar.gz: 4361b820ca0efb3f30fbd726692ffbe815746d5adcf1582710e4abcee3246ca6
 SHA512:
-  metadata.gz: c2cbc3e2a8e6841a63e27e1622394046932e0679e7f41fe5950e25297cc6754efb5d66df0d1ed85dfb6a2089a6e52a4032e41a96ebbb0e0ec3428a2523d219b0
-  data.tar.gz: 42849b9a525f5e6a8d2d2c5cd4845d6cc4793331e78f9d083ebb74256227f5b0c5abc5dad01e19e4e2e17ae791ba78c7b678cfd4fb44c325f24f51203fc8f8cf
+  metadata.gz: e97d5c3dc34f74249d9aed1a43ac80a9db776cc7f9eb7e19894bbbbce9ccf4c74395f988fb9cf14d918bf8107642b948e018dfc407528523cd056ff596a86bb7
+  data.tar.gz: ac977d26c7dd272ea9c7503846beeed90b909d52abd425b96c354ac0d21658dbe0849752d005e4b847749667bca6298557ae1edcd75a37278fb9db904875e23d

data/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    acidic_job (1.0.0.pre15)
+    acidic_job (1.0.0.pre18)
       activerecord
       activesupport
+      database_cleaner
 
 GEM
   remote: https://rubygems.org/
@@ -204,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)
@@ -238,7 +239,6 @@ DEPENDENCIES
   acidic_job!
   activejob
   combustion
-  database_cleaner
   minitest
   net-smtp
   noticed

data/acidic_job.gemspec

@@ -29,9 +29,9 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "activerecord"
   spec.add_dependency "activesupport"
+  spec.add_dependency "database_cleaner"
   spec.add_development_dependency "activejob"
   spec.add_development_dependency "combustion"
-  spec.add_development_dependency "database_cleaner"
   spec.add_development_dependency "minitest"
   spec.add_development_dependency "net-smtp"
   spec.add_development_dependency "noticed"

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_#{current_step}_#{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.pre15"
+  VERSION = "1.0.0.pre18"
 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.pre15
+  version: 1.0.0.pre18
 platform: ruby
 authors:
 - fractaledmind
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-05 00:00:00.000000000 Z
+date: 2022-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -39,13 +39,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activejob
+  name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: combustion
+  name: activejob
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: database_cleaner
+  name: combustion
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="