acidic_job 1.0.0.beta.7 → 1.0.0.beta.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ffcde3bd4dedc0b59de934bed0cadeaa63f33fb26f36ddf1678d17e0abbec55
-  data.tar.gz: 8fe70548a2e2438e59956a41b2373f294150716a2d5e2de7e84993aeb766a523
+  metadata.gz: 6c2f5b13489acc0e87c1de14248857c107d794a60d0af9a3cafdc5606c80929c
+  data.tar.gz: 6bc97dda18375d3efd1cd37c7c6c2642b2cbe6c44a73e3451e07ebcce738ab30
 SHA512:
-  metadata.gz: fcd0acb3acda0eeaaf499a58c165e376739d808d50f074e35f6236f5b0acdb55b34296b95f86a5edabb19b5c6c3e0e24a04e3408e62322052f43f538bcbc2433
-  data.tar.gz: 46e5c1560717f18399afad20f568a69b8ee2c66aff02ba03f54d04f74dc2e749ad3aa5e5f73e470e22cb3a0737ac9f394498db558d4d806f7f453fb501b272f9
+  metadata.gz: 586158e2ccfa061f7efa636dd14ef9d83be1105d32e964e29a77df6728e941d8506379794e7144b8ec41f8c4e7187fae6de66cf7c37c16fd07d45a6e84bdb849
+  data.tar.gz: fdf9c926a74abc99262c76a508f07dd87de823958b5ea3230a5c6f98c17cb2f93153a32f8d34cb4c27145f0a5838a5e2090a32f815b7e8c61a50f7aafa65b39e

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.7)
+    acidic_job (1.0.0.beta.10)
       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 = jobs_from(@run.current_step_awaits)).compact.any?
+        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
@@ -65,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"

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,
@@ -174,7 +174,7 @@ module AcidicJob
       end
 
       def current_step_awaits
-        current_step_hash.fetch("awaits", []) || []
+        current_step_hash["awaits"]
       end
 
       def next_step_finishes?

data/lib/acidic_job/serializer.rb

@@ -10,11 +10,11 @@ module AcidicJob
         return if json.nil? || json.empty?
 
         data = JSON.parse(json)
-        Arguments.deserialize(data).first
+        Arguments.send :deserialize_argument, data
       end
 
       def dump(obj)
-        data = Arguments.serialize [obj]
+        data = Arguments.send :serialize_argument, obj
         data.to_json
       rescue ActiveJob::SerializationError
         raise UnserializableValue

data/lib/acidic_job/serializers/job_serializer.rb

@@ -6,24 +6,16 @@ module AcidicJob
   module Serializers
     class JobSerializer < ::ActiveJob::Serializers::ObjectSerializer
       def serialize(job)
-        super(job.serialize)
+        # don't serialize the `enqueued_at` value, as ActiveRecord will check if the Run record has changed
+        # by comparing the deserialized database value with a temporary in-memory generated value.
+        # That temporary in-memory generated value can sometimes have an `enqueued_at` value that is 1 second off
+        # from the original. In this case, ActiveRecord will think the record has unsaved changes and block the lock.
+        super(job.as_json.merge("job_class" => job.class.name))
       end
 
       def deserialize(hash)
-        job = ActiveJob::Base.deserialize(hash)
+        job = ::ActiveJob::Base.deserialize(hash)
         job.send(:deserialize_arguments_if_needed)
-        # this is a shim to ensure we can work with Ruby 2.7 as well as 3.0+
-        # :nocov:
-        if job.arguments.last.is_a?(Hash)
-          *args, kwargs = job.arguments
-        else
-          args = job.arguments
-          kwargs = {}
-        end
-        # :nocov:
-        job.instance_variable_set(:@__acidic_job_args, args)
-        job.instance_variable_set(:@__acidic_job_kwargs, kwargs)
-
         job
       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.7"
+  VERSION = "1.0.0.beta.10"
 end

data/lib/acidic_job/workflow.rb

@@ -50,10 +50,6 @@ module AcidicJob
       wrapped_method = WorkflowStep.new(run: @run, job: @job).wrapped
       current_step = @run.current_step_name
 
-      # can't reproduce yet, but saw a bug in production where
-      # nested awaits workflows had an unsaved `workflow` attribute
-      @run.save! if @run.has_changes_to_save?
-
       AcidicJob.logger.log_run_event("Executing #{current_step}...", @job, @run)
       @run.with_lock do
         @step_result = wrapped_method.call(@run)
@@ -64,10 +60,6 @@ module AcidicJob
     def run_step_result
       next_step = @run.next_step_name
 
-      # can't reproduce yet, but saw a bug in production where
-      # nested awaits workflows had an unsaved `workflow` attribute
-      @run.save! if @run.has_changes_to_save?
-
       AcidicJob.logger.log_run_event("Progressing to #{next_step}...", @job, @run)
       @run.with_lock do
         @step_result.call(run: @run)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acidic_job
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta.7
+  version: 1.0.0.beta.10
 platform: ruby
 authors:
 - fractaledmind
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-10 00:00:00.000000000 Z
+date: 2022-08-13 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