acidic_job 1.0.0.pre23 → 1.0.0.pre24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5fb0d14a9e26e9a79f4976dc74318e97c096c695dacfed5a6546dff058ca4b1b
-  data.tar.gz: abe13e27abaf05a1200a1bc245e649e00da1948847576df3ca1774101ca03d28
+  metadata.gz: 223aa8cad5d48e2a4fc04a9e33f82bdf7ef54cb933c2e14f3dc0aa6d46986932
+  data.tar.gz: a8a646da8f9e5987267f1448e44056bdd37c2d4f8cbfbc84650659555567b635
 SHA512:
-  metadata.gz: 1f7abb59cb78202482f82e4c9057afabf3dc687b1c723d10c2b60e8bcea3a7bb6bd4c9c6b8d835f8498076f2a75fa124baba1571e4f16093d80c6fc0228c8658
-  data.tar.gz: cea09574f0843c71b52c542eaeef20cd1ee330fd11a1f7c37977126d2c321ea3e055e8073b4c4ae525af17b133c3d98b50f1fa9d2ead2b93026b45897dc5945e
+  metadata.gz: 857647ff5cce856d41a8e30014005ef035cefcca383a719e6e679a4fc7bdc254c76f65e2d312c508ad56fd45b1e33ed533aecf2541e13b0480c579e0127ec338
+  data.tar.gz: 4208fa26057e5a1fb0908c554b8e2ef74c6a5018a4d782815caa1fbd7716f18b33598ff6877e3c0c583f449099438d316c506dee6fa84afea34d54aa42f085b8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    acidic_job (1.0.0.pre23)
+    acidic_job (1.0.0.pre24)
       activerecord
       activesupport
       database_cleaner

data/lib/acidic_job/awaiting.rb

@@ -32,11 +32,10 @@ module AcidicJob
 
       return if run.finished?
 
-      # job = job_class.constantize.deserialize(serialized_staged_job)
-      # job.enqueue
-
       # when a batch of jobs for a step succeeds, we begin processing the `AcidicJob::Run` record again
-      process_run(run)
+      # process_run(run)
+      run.update_column(:locked_at, nil)
+      job.enqueue
     end
 
     def enqueue_step_parallel_jobs(jobs_or_jobs_getter, run, step_result)

data/lib/acidic_job/extensions/sidekiq.rb

@@ -58,7 +58,7 @@ module AcidicJob
           ::Sidekiq::Client.push(
             "class" => self.class,
             "args" => @args,
-            "jid" => @jid
+            "jid" => @acidic_job_run&.staged_job_id || @jid
           )
         end
       end

data/lib/acidic_job/run.rb

@@ -64,16 +64,19 @@ module AcidicJob
       error_object.present?
     end
 
-    private
-
-    def enqueue_staged_job
-      return unless staged?
-
+    def staged_job_id
       # encode the identifier for this record in the job ID
       # base64 encoding for minimal security
       global_id = to_global_id.to_s.remove("gid://")
       encoded_global_id = Base64.encode64(global_id).strip
-      staged_job_id = "STG__#{idempotency_key}__#{encoded_global_id}"
+
+      "STG__#{idempotency_key}__#{encoded_global_id}"
+    end
+
+    private
+
+    def enqueue_staged_job
+      return unless staged?
 
       serialized_staged_job = if serialized_job.key?("jid")
                                 serialized_job.merge("jid" => staged_job_id)

data/lib/acidic_job/staging.rb

@@ -9,15 +9,6 @@ module AcidicJob
 
     private
 
-    def delete_staged_job_record
-      return unless was_staged_job?
-
-      staged_job_run.delete
-      true
-    rescue ActiveRecord::RecordNotFound
-      true
-    end
-
     def was_staged_job?
       identifier.start_with? "STG__"
     end

data/lib/acidic_job/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AcidicJob
-  VERSION = "1.0.0.pre23"
+  VERSION = "1.0.0.pre24"
 end

data/lib/acidic_job.rb

@@ -50,13 +50,9 @@ module AcidicJob
     # TODO: write test for a staged job that uses awaits
     klass.set_callback :perform, :after, :reenqueue_awaited_by_job,
                        if: -> { was_awaited_job? && !was_workflow_job? }
-    klass.set_callback :perform, :after, :delete_staged_job_record,
-                       if: -> { was_staged_job? && !was_awaited_job? }
     klass.define_callbacks :finish
     klass.set_callback :finish, :after, :reenqueue_awaited_by_job,
                        if: -> { was_workflow_job? && was_awaited_job? }
-    klass.set_callback :finish, :after, :delete_staged_job_record,
-                       if: -> { was_workflow_job? && was_staged_job? && !was_awaited_job? }
 
     klass.instance_variable_set(:@acidic_identifier, :job_id)
     klass.define_singleton_method(:acidic_by_job_id) { @acidic_identifier = :job_id }

metadata

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