acidic_job 1.0.0.pre13 → 1.0.0.pre14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff4783bfe9e3ff6a03683ed14a9f21a5227f6114bc5824cdee71a66f252d7fa1
-  data.tar.gz: d905d8ad1848d77ae9fade6b75527ae113675ba3c39b66149c750f9adb64d83b
+  metadata.gz: fcc6621d513d4284bb09bdb4da7433b81b2c240ce9873dbf1348569e76942960
+  data.tar.gz: 411b5819c7faab9f8bcb19f39bd4dc5c8a03d42f28239f5f19489b2f7d01eb68
 SHA512:
-  metadata.gz: 1af39ccff6bb5d414ab32344887d60f4cf721d9272ec0c98c9686053d3426fd2da98d82b9fe35fd45ebc6b719b8e1df6ce922abbec86653a91bea736f9522696
-  data.tar.gz: f0f8db378646cd3e948a2406c2237b44c9e6a551dafcbe1a687cbfadc5a15713e3b6a177a18ccf81146b024cb64b44085a14c8250fd8b364f16c911d3a202f5b
+  metadata.gz: 644bc4268dfa5c66804e169314f67452b4046bdbbd4b013589b6463e0c79363407d8fbdecfc2db3197cccdb75c558059492b2a9f22a0eca0198f7033836abd05
+  data.tar.gz: 2807478181d478a7ee10e082e7f76f42409e3c587e436712396371d92d8b53481b0606a19bbcb108fa2cb95c4529f4b9ca86b146cf1aec64c53954c57eda5971

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    acidic_job (1.0.0.pre13)
+    acidic_job (1.0.0.pre14)
       activerecord (>= 6.1.0)
       activesupport
 

data/lib/acidic_job/awaiting.rb

@@ -6,47 +6,32 @@ module AcidicJob
   module Awaiting
     extend ActiveSupport::Concern
 
-    class_methods do
-      # TODO: Allow the `perform` method to be used to kick off Sidekiq Batch powered workflows
-      def initiate(*args)
-        raise SidekiqBatchRequired unless defined?(Sidekiq::Batch)
-
-        top_level_workflow = Sidekiq::Batch.new
-        top_level_workflow.on(:success, self, *args)
-        top_level_workflow.jobs do
-          perform_async
-        end
-      end
-    end
-
     def enqueue_step_parallel_jobs(jobs, run, step_result)
       # `batch` is available from Sidekiq::Pro
       raise SidekiqBatchRequired unless defined?(Sidekiq::Batch)
 
-      batch.jobs do
-        step_batch = Sidekiq::Batch.new
-        # step_batch.description = "AcidicJob::Workflow Step: #{step}"
-        step_batch.on(
-          :success,
-          "#{self.class.name}#step_done",
-          # NOTE: options are marshalled through JSON so use only basic types.
-          { "run_id" => run.id,
-            "step_result_yaml" => step_result.to_yaml.strip }
-        )
-        # NOTE: The jobs method is atomic.
-        # All jobs created in the block are actually pushed atomically at the end of the block.
-        # If an error is raised, none of the jobs will go to Redis.
-        step_batch.jobs do
-          jobs.each do |worker_name|
-            # TODO: handle Symbols as well
-            worker = worker_name.is_a?(String) ? worker_name.constantize : worker_name
-            if worker.instance_method(:perform).arity.zero?
-              worker.perform_async
-            elsif worker.instance_method(:perform).arity == 1
-              worker.perform_async(run.id)
-            else
-              raise TooManyParametersForParallelJob
-            end
+      step_batch = Sidekiq::Batch.new
+      # step_batch.description = "AcidicJob::Workflow Step: #{step}"
+      step_batch.on(
+        :success,
+        "#{self.class.name}#step_done",
+        # NOTE: options are marshalled through JSON so use only basic types.
+        { "run_id" => run.id,
+          "step_result_yaml" => step_result.to_yaml.strip }
+      )
+      # NOTE: The jobs method is atomic.
+      # All jobs created in the block are actually pushed atomically at the end of the block.
+      # If an error is raised, none of the jobs will go to Redis.
+      step_batch.jobs do
+        jobs.each do |worker_name|
+          # TODO: handle Symbols as well
+          worker = worker_name.is_a?(String) ? worker_name.constantize : worker_name
+          if worker.instance_method(:perform).arity.zero?
+            worker.perform_async
+          elsif worker.instance_method(:perform).arity == 1
+            worker.perform_async(run.id)
+          else
+            raise TooManyParametersForParallelJob
           end
         end
       end

data/lib/acidic_job/staging.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "active_support/concern"
+require "global_id/locator"
 
 module AcidicJob
   module Staging

data/lib/acidic_job/version.rb

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

data/lib/acidic_job.rb

@@ -82,8 +82,6 @@ module AcidicJob
   end
 
   def with_acidity(providing: {})
-    # ensure this instance variable is always defined
-    @__acidic_job_steps = []
     # execute the block to gather the info on what steps are defined for this job workflow
     yield
 
@@ -112,7 +110,6 @@ module AcidicJob
     FinishedPoint.new
   end
 
-  # TODO: allow idempotency to be defined by args OR job id
   # rubocop:disable Naming/MemoizedInstanceVariableName
   def idempotency_key
     if defined?(@__acidic_job_idempotency_key) && !@__acidic_job_idempotency_key.nil?
@@ -138,7 +135,7 @@ module AcidicJob
 
       # if any step calls `safely_finish_acidic_job` or the workflow has simply completed,
       # be sure to break out of the loop
-      if recovery_point == Run::FINISHED_RECOVERY_POINT.to_s # rubocop:disable Style/GuardClause
+      if recovery_point.to_s == Run::FINISHED_RECOVERY_POINT.to_s # rubocop:disable Style/GuardClause
         break
       elsif current_step.nil?
         raise UnknownRecoveryPoint, "Defined workflow does not reference this step: #{recovery_point}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acidic_job
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre13
+  version: 1.0.0.pre14
 platform: ruby
 authors:
 - fractaledmind
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-16 00:00:00.000000000 Z
+date: 2022-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord