acidic_job 1.0.0.beta.6 → 1.0.0.beta.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15f22e01fee75c9785c6d7ac0ef1f38620cd599bd4f05b372bdda1fa0e6045e5
-  data.tar.gz: b9cdb3146ed4752b11b5c7aaccfd02f8cb14e37712212796bf14e2a4bdf03ca2
+  metadata.gz: 2ffcde3bd4dedc0b59de934bed0cadeaa63f33fb26f36ddf1678d17e0abbec55
+  data.tar.gz: 8fe70548a2e2438e59956a41b2373f294150716a2d5e2de7e84993aeb766a523
 SHA512:
-  metadata.gz: 72a327e00a6e066160d73ffda31321af66e6c20a8b2e446f30869f7e3245ec4db704812f9ceda6a8fb02be9454eaddf503476ebf6614d453df15b4ca8a656e65
-  data.tar.gz: 420b38dbb39ba3ed89be0c2b8b5c2305f27f6aea8208ee2dfc689ec729329f676ec43b3cb3ac98481c25985eae13eacc64348900f3389b12f74c56d723143d33
+  metadata.gz: fcd0acb3acda0eeaaf499a58c165e376739d808d50f074e35f6236f5b0acdb55b34296b95f86a5edabb19b5c6c3e0e24a04e3408e62322052f43f538bcbc2433
+  data.tar.gz: 46e5c1560717f18399afad20f568a69b8ee2c66aff02ba03f54d04f74dc2e749ad3aa5e5f73e470e22cb3a0737ac9f394498db558d4d806f7f453fb501b272f9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    acidic_job (1.0.0.beta.6)
+    acidic_job (1.0.0.beta.7)
       activejob
       activerecord
       activesupport

data/lib/acidic_job/processor.rb

@@ -19,7 +19,7 @@ module AcidicJob
         if !@run.known_recovery_point?
           raise UnknownRecoveryPoint,
                 "Defined workflow does not reference this step: #{@run.current_step_name.inspect}"
-        elsif !Array(awaited_jobs = @run.current_step_hash.fetch("awaits", [])).compact.empty?
+        elsif Array(awaited_jobs = jobs_from(@run.current_step_awaits)).compact.any?
           # We only execute the current step, without progressing to the next step.
           # This ensures that any failures in parallel jobs will have this step retried in the main workflow
           step_result = @workflow.execute_current_step
@@ -47,14 +47,12 @@ module AcidicJob
 
     private
 
-    def enqueue_awaited_jobs(jobs_or_jobs_getter, step_result)
-      awaited_jobs = jobs_from(jobs_or_jobs_getter)
-
+    def enqueue_awaited_jobs(awaited_jobs, step_result)
       AcidicJob.logger.log_run_event("Enqueuing #{awaited_jobs.count} awaited jobs...", @job, @run)
       # All jobs created in the block are pushed atomically at the end of the block.
       AcidicJob::Run.transaction do
         awaited_jobs.each do |awaited_job|
-          worker_class, args = job_args_and_kwargs(awaited_job)
+          worker_class, args = job_and_args(awaited_job)
 
           job = worker_class.new(*args)
 
@@ -81,7 +79,7 @@ module AcidicJob
       end
     end
 
-    def job_args_and_kwargs(job)
+    def job_and_args(job)
       case job
       when Class
         [job, []]

data/lib/acidic_job/run.rb

@@ -173,6 +173,10 @@ module AcidicJob
         current_step_hash.fetch("then")
       end
 
+      def current_step_awaits
+        current_step_hash.fetch("awaits", []) || []
+      end
+
       def next_step_finishes?
         next_step_name.to_s == FINISHED_RECOVERY_POINT
       end

data/lib/acidic_job/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AcidicJob
-  VERSION = "1.0.0.beta.6"
+  VERSION = "1.0.0.beta.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acidic_job
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta.6
+  version: 1.0.0.beta.7
 platform: ruby
 authors:
 - fractaledmind