acidic_job 1.0.0.beta.4 → 1.0.0.beta.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9516f1c035c3f7256c178aa23c6966f19420e718f2f0e24d0ec0d751c5e8beb5
-  data.tar.gz: 0dcf21315d4afefbd1861f69aff453b293818b9166fb58fe36ac45b62266ea13
+  metadata.gz: 2ffcde3bd4dedc0b59de934bed0cadeaa63f33fb26f36ddf1678d17e0abbec55
+  data.tar.gz: 8fe70548a2e2438e59956a41b2373f294150716a2d5e2de7e84993aeb766a523
 SHA512:
-  metadata.gz: 1c742edbc7e301b035276a93ca8d68f1118c6899b024ef7edbf0694790ee6804a18ae7e7d1c2a2d89c40b5e05b966a0bee9114a61aeca0307618c8d0715a047f
-  data.tar.gz: 5cfda7f2d2cdc602da3bcb6225e8c38647e79b1f1b08e153e4d524594551fc42ce4116240d4837dee59bf17adbf8390e5d0d036120816e0aa379cadb872c787a
+  metadata.gz: fcd0acb3acda0eeaaf499a58c165e376739d808d50f074e35f6236f5b0acdb55b34296b95f86a5edabb19b5c6c3e0e24a04e3408e62322052f43f538bcbc2433
+  data.tar.gz: 46e5c1560717f18399afad20f568a69b8ee2c66aff02ba03f54d04f74dc2e749ad3aa5e5f73e470e22cb3a0737ac9f394498db558d4d806f7f453fb501b272f9

data/Gemfile.lock

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

data/lib/acidic_job/errors.rb

@@ -15,4 +15,5 @@ module AcidicJob
   class UnserializableValue < Error; end
   class LockedIdempotencyKey < Error; end
   class MismatchedIdempotencyKeyAndJobArguments < Error; end
+  class MissingBlockArgument < Error; end
 end

data/lib/acidic_job/mixin.rb

@@ -81,12 +81,9 @@ module AcidicJob
       @workflow_builder = WorkflowBuilder.new
 
       raise MissingWorkflowBlock, "A block must be passed to `with_acidic_workflow`" unless block_given?
+      raise MissingBlockArgument, "An argument must be passed to the `with_acidic_workflow` block" if block.arity.zero?
 
-      if block.arity.zero?
-        @workflow_builder.instance_exec(&block)
-      else
-        yield @workflow_builder
-      end
+      block.call @workflow_builder
 
       raise NoDefinedSteps if @workflow_builder.steps.empty?
 

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)
 
@@ -69,7 +67,7 @@ module AcidicJob
       when Array
         jobs_or_jobs_getter
       when Symbol, String
-        if @job.respond_to?(jobs_or_jobs_getter)
+        if @job.respond_to?(jobs_or_jobs_getter, _include_private = true)
           @job.method(jobs_or_jobs_getter).call
         else
           raise UnknownAwaitedJob,
@@ -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.4"
+  VERSION = "1.0.0.beta.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acidic_job
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta.4
+  version: 1.0.0.beta.7
 platform: ruby
 authors:
 - fractaledmind
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-09 00:00:00.000000000 Z
+date: 2022-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob