acidic_job 1.0.0.beta.5 → 1.0.0.beta.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c63f44eea243551258930cb521408f7691419297922f39f3722d9386764a877
-  data.tar.gz: 2a292f1abba04cf031c524084eb48ce8a4a16084b79614843aba2593edeaae5f
+  metadata.gz: 81769867ab7962af7062bc8714523d8743a629b3e13eb71f6f5561024bfe795c
+  data.tar.gz: bc8ca04208ed63b2a70839490a44102868238df48740a19f7a1d08d19115b29b
 SHA512:
-  metadata.gz: dae8645e4495d7b770fb7fe4a4875d3335a4c47239532cb769701bc18cba1867a3462cf5280d89d0d880841721a7db4091c40e952917d2169fc31067dac6cc98
-  data.tar.gz: 7a25ad55a271707f5444e66df9588594a62751e25310f300580169ae376236cbd9d0f4186bdd184d32b30cbc13953e100666614a7155307bbd4809867f87b534
+  metadata.gz: f9cc54a6e0956fed6fb57babdca80a95126810dae84d244abbd162e428bb52bb7cc59ccf34e2f5a9fea29ac7ea719919bd2c8f6fbe026e167947a69aae794be3
+  data.tar.gz: eefa772f9f26643ba39048f6d61b460a08b55c635386803df62e476edf3b00c77000380b0b3bf94fbe00b4d11ece3cdd764f07d97ab656e6aa54e41097f7df47

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    acidic_job (1.0.0.beta.5)
+    acidic_job (1.0.0.beta.8)
       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?
 
@@ -230,7 +227,7 @@ module AcidicJob
 
       # "STG__#{idempotency_key}__#{encoded_global_id}"
       _prefix, _idempotency_key, encoded_global_id = job_id.split("__")
-      staged_job_gid = "gid://#{::Base64.decode64(encoded_global_id)}"
+      staged_job_gid = "gid://#{::Base64.urlsafe_decode64(encoded_global_id)}"
 
       @staged_job_run = ::GlobalID::Locator.locate(staged_job_gid)
     end

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 (awaited_jobs = jobs_from(@run.current_step_awaits)).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)
 
@@ -67,10 +65,11 @@ module AcidicJob
     def jobs_from(jobs_or_jobs_getter)
       case jobs_or_jobs_getter
       when Array
-        jobs_or_jobs_getter
+        jobs_or_jobs_getter.compact
       when Symbol, String
         if @job.respond_to?(jobs_or_jobs_getter, _include_private = true)
-          @job.method(jobs_or_jobs_getter).call
+          jobs = @job.method(jobs_or_jobs_getter).call
+          Array(jobs).compact
         else
           raise UnknownAwaitedJob,
                 "Invalid `awaits`; unknown method `#{jobs_or_jobs_getter}` for this job"
@@ -81,7 +80,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

@@ -130,7 +130,7 @@ module AcidicJob
         # encode the identifier for this record in the job ID
         global_id = to_global_id.to_s.remove("gid://")
         # base64 encoding for minimal security
-        encoded_global_id = Base64.encode64(global_id).strip
+        encoded_global_id = Base64.urlsafe_encode64(global_id, padding: false)
 
         [
           STAGED_JOB_ID_PREFIX,
@@ -173,6 +173,10 @@ module AcidicJob
         current_step_hash.fetch("then")
       end
 
+      def current_step_awaits
+        current_step_hash["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.5"
+  VERSION = "1.0.0.beta.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acidic_job
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta.5
+  version: 1.0.0.beta.8
 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