acidic_job 1.0.0.beta.6 → 1.0.0.beta.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15f22e01fee75c9785c6d7ac0ef1f38620cd599bd4f05b372bdda1fa0e6045e5
-  data.tar.gz: b9cdb3146ed4752b11b5c7aaccfd02f8cb14e37712212796bf14e2a4bdf03ca2
+  metadata.gz: 55e96056c881f1a048efc79156db98799bd911ac8417803260499ef1d9f69ff7
+  data.tar.gz: 52ae51638b01352db67279455f08b086c2be8c725914fe32c84542d9b5927325
 SHA512:
-  metadata.gz: 72a327e00a6e066160d73ffda31321af66e6c20a8b2e446f30869f7e3245ec4db704812f9ceda6a8fb02be9454eaddf503476ebf6614d453df15b4ca8a656e65
-  data.tar.gz: 420b38dbb39ba3ed89be0c2b8b5c2305f27f6aea8208ee2dfc689ec729329f676ec43b3cb3ac98481c25985eae13eacc64348900f3389b12f74c56d723143d33
+  metadata.gz: 4b6a2f319942e8f5973255453608edab836b8e02c421ab3291725b171817f100061319b0fed5af60a706ae8b4eabc15f3b62f146eeff0a97474fa817547a53ff
+  data.tar.gz: 6fa11549153a9334089a59534e049e59fba1a5f353069d49ec347238f3e6f26b18b0deb618414e99b33a33400554d05b0ebc29389c12ce1c0e5cb5c727ef90c1

data/.github/FUNDING.yml

@@ -0,0 +1,13 @@
+# These are supported funding model platforms
+
+github: fractaledmind
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

data/Gemfile.lock

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

data/lib/acidic_job/mixin.rb

@@ -227,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/test_case.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require_relative "./testing"
+
+module AcidicJob
+  class TestCase < ::ActiveJob::TestCase
+    include ::AcidicJob::Testing
+  end
+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.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acidic_job
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta.6
+  version: 1.0.0.beta.9
 platform: ruby
 authors:
 - fractaledmind
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-10 00:00:00.000000000 Z
+date: 2022-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -227,6 +227,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/FUNDING.yml"
 - ".github/workflows/main.yml"
 - ".gitignore"
 - ".rubocop.yml"
@@ -271,6 +272,7 @@ files:
 - lib/acidic_job/serializers/range_serializer.rb
 - lib/acidic_job/serializers/recovery_point_serializer.rb
 - lib/acidic_job/serializers/worker_serializer.rb
+- lib/acidic_job/test_case.rb
 - lib/acidic_job/testing.rb
 - lib/acidic_job/version.rb
 - lib/acidic_job/workflow.rb