acidic_job 1.0.0.pre24 → 1.0.0.pre25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 223aa8cad5d48e2a4fc04a9e33f82bdf7ef54cb933c2e14f3dc0aa6d46986932
-  data.tar.gz: a8a646da8f9e5987267f1448e44056bdd37c2d4f8cbfbc84650659555567b635
+  metadata.gz: 305652928d6e3948110121767a94388b2f569a0ccc4693944cde5df2938c9a4b
+  data.tar.gz: 1c612e9380eaa0f73dd194441f69a988015e304c55c047793ad292f8c46e6c19
 SHA512:
-  metadata.gz: 857647ff5cce856d41a8e30014005ef035cefcca383a719e6e679a4fc7bdc254c76f65e2d312c508ad56fd45b1e33ed533aecf2541e13b0480c579e0127ec338
-  data.tar.gz: 4208fa26057e5a1fb0908c554b8e2ef74c6a5018a4d782815caa1fbd7716f18b33598ff6877e3c0c583f449099438d316c506dee6fa84afea34d54aa42f085b8
+  metadata.gz: f720cc6bebf8bdc4197295a3501b750e4b8b7741d7f04d6096aba426d45b37027d650664b038f1e45a32dc0763af9cd88ccec41c6d32dbdde56d0937a5af4df2
+  data.tar.gz: a7639fe45ebbea79331a8355a5f8a20fc95182341d575ca8a8040a0733cfe242f5e694ec98d1b442eea5235ccabf4280bd91f20f28ff1814b0bd32ffa95a8bff

data/Gemfile.lock

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

data/lib/acidic_job/awaiting.rb

@@ -17,6 +17,7 @@ module AcidicJob
       run = staged_job_run&.awaited_by || acidic_job_run&.awaited_by
 
       return unless run
+      return if run.batched_runs.outstanding.any?
 
       current_step = run.workflow[run.recovery_point.to_s]
       step_result = run.returning_to

data/lib/acidic_job/run.rb

@@ -31,7 +31,9 @@ module AcidicJob
     scope :staged, -> { where(staged: true) }
     scope :unstaged, -> { where(staged: false) }
     scope :finished, -> { where(recovery_point: FINISHED_RECOVERY_POINT) }
-    scope :running, -> { where.not(recovery_point: FINISHED_RECOVERY_POINT) }
+    scope :outstanding, lambda {
+      where.not(recovery_point: FINISHED_RECOVERY_POINT).or(where(recovery_point: [nil, ""]))
+    }
 
     with_options unless: :staged? do
       validates :last_run_at, presence: true

data/lib/acidic_job/version.rb

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

data/lib/acidic_job.rb

@@ -50,6 +50,7 @@ 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, :finish_staged_job, if: -> { was_staged_job? && !was_workflow_job? }
     klass.define_callbacks :finish
     klass.set_callback :finish, :after, :reenqueue_awaited_by_job,
                        if: -> { was_workflow_job? && was_awaited_job? }
@@ -136,6 +137,10 @@ module AcidicJob
 
   private
 
+  def finish_staged_job
+    FinishedPoint.new.call(run: staged_job_run)
+  end
+
   def was_workflow_job?
     defined?(@acidic_job_run) && @acidic_job_run.present?
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acidic_job
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre24
+  version: 1.0.0.pre25
 platform: ruby
 authors:
 - fractaledmind
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-26 00:00:00.000000000 Z
+date: 2022-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord