acidic_job 1.0.0.pre16 → 1.0.0.pre19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53f3b1dca6c15b94a5fef3e2e2bd6c23d4f60a6635fa729426bcd98e08bfcf22
-  data.tar.gz: 64fe54f8707c255211dba80c678012f4068ccc0fb279a50043afff4812649467
+  metadata.gz: cb1a8e3e2658bf86b44012171e33458c6e25803e41c255401575bc772cf033db
+  data.tar.gz: a2672fb1755af7ada91b7e8b156cffe951f22d530cbf7d94aee794622f9ad5c8
 SHA512:
-  metadata.gz: a657457d4714245dda16796e59e35e91246842e1c7dd92c174ac0469674e0a1145f0c20b55cbae4b02e82f391f8e5e8527ab267d88a82d6868578177ce19db9a
-  data.tar.gz: 785185e925ae66815668fdecbb8ab66bdf71553ecc52eb0002f3ecbd327b2680bc3777db3caf26e00c664dcd83d138e2142b43eb488aaf26c739c9a3099ddb52
+  metadata.gz: d6fc3314e1eb512ef9eab52cada5b7705891563715f1d549912b45b13b85bd0bf778a8950a5657037ddf75e7e81819cf8c85a240c191cb71d615e98ca22c7c3a
+  data.tar.gz: 011f57cb97e93bd6e09c2c07d164d06679c8311b8e76a1b1cf9438376e65da5d4d76851cd7e1b6eb4d2f1ffba7064ff722c8cec75db08e78a1e96b7353672d13

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    acidic_job (1.0.0.pre16)
+    acidic_job (1.0.0.pre19)
       activerecord
       activesupport
       database_cleaner
@@ -9,67 +9,67 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.0.2.3)
-      actionpack (= 7.0.2.3)
-      activesupport (= 7.0.2.3)
+    actioncable (7.0.3)
+      actionpack (= 7.0.3)
+      activesupport (= 7.0.3)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (7.0.2.3)
-      actionpack (= 7.0.2.3)
-      activejob (= 7.0.2.3)
-      activerecord (= 7.0.2.3)
-      activestorage (= 7.0.2.3)
-      activesupport (= 7.0.2.3)
+    actionmailbox (7.0.3)
+      actionpack (= 7.0.3)
+      activejob (= 7.0.3)
+      activerecord (= 7.0.3)
+      activestorage (= 7.0.3)
+      activesupport (= 7.0.3)
       mail (>= 2.7.1)
       net-imap
       net-pop
       net-smtp
-    actionmailer (7.0.2.3)
-      actionpack (= 7.0.2.3)
-      actionview (= 7.0.2.3)
-      activejob (= 7.0.2.3)
-      activesupport (= 7.0.2.3)
+    actionmailer (7.0.3)
+      actionpack (= 7.0.3)
+      actionview (= 7.0.3)
+      activejob (= 7.0.3)
+      activesupport (= 7.0.3)
       mail (~> 2.5, >= 2.5.4)
       net-imap
       net-pop
       net-smtp
       rails-dom-testing (~> 2.0)
-    actionpack (7.0.2.3)
-      actionview (= 7.0.2.3)
-      activesupport (= 7.0.2.3)
+    actionpack (7.0.3)
+      actionview (= 7.0.3)
+      activesupport (= 7.0.3)
       rack (~> 2.0, >= 2.2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (7.0.2.3)
-      actionpack (= 7.0.2.3)
-      activerecord (= 7.0.2.3)
-      activestorage (= 7.0.2.3)
-      activesupport (= 7.0.2.3)
+    actiontext (7.0.3)
+      actionpack (= 7.0.3)
+      activerecord (= 7.0.3)
+      activestorage (= 7.0.3)
+      activesupport (= 7.0.3)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.0.2.3)
-      activesupport (= 7.0.2.3)
+    actionview (7.0.3)
+      activesupport (= 7.0.3)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (7.0.2.3)
-      activesupport (= 7.0.2.3)
+    activejob (7.0.3)
+      activesupport (= 7.0.3)
       globalid (>= 0.3.6)
-    activemodel (7.0.2.3)
-      activesupport (= 7.0.2.3)
-    activerecord (7.0.2.3)
-      activemodel (= 7.0.2.3)
-      activesupport (= 7.0.2.3)
-    activestorage (7.0.2.3)
-      actionpack (= 7.0.2.3)
-      activejob (= 7.0.2.3)
-      activerecord (= 7.0.2.3)
-      activesupport (= 7.0.2.3)
+    activemodel (7.0.3)
+      activesupport (= 7.0.3)
+    activerecord (7.0.3)
+      activemodel (= 7.0.3)
+      activesupport (= 7.0.3)
+    activestorage (7.0.3)
+      actionpack (= 7.0.3)
+      activejob (= 7.0.3)
+      activerecord (= 7.0.3)
+      activesupport (= 7.0.3)
       marcel (~> 1.0)
       mini_mime (>= 1.1.0)
-    activesupport (7.0.2.3)
+    activesupport (7.0.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -82,7 +82,7 @@ GEM
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
       thor (>= 0.14.6)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
     connection_pool (2.2.5)
     crass (1.0.6)
     database_cleaner (2.0.1)
@@ -112,11 +112,10 @@ GEM
     http-form_data (2.3.0)
     i18n (1.10.0)
       concurrent-ruby (~> 1.0)
-    io-wait (0.2.1)
     llhttp-ffi (0.4.0)
       ffi-compiler (~> 1.0)
       rake (~> 13.0)
-    loofah (2.15.0)
+    loofah (2.18.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -134,52 +133,51 @@ GEM
       digest
       net-protocol
       timeout
-    net-protocol (0.1.2)
-      io-wait
+    net-protocol (0.1.3)
       timeout
     net-smtp (0.3.1)
       digest
       net-protocol
       timeout
     nio4r (2.5.8)
-    nokogiri (1.13.3)
+    nokogiri (1.13.6)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    nokogiri (1.13.3-x86_64-darwin)
+    nokogiri (1.13.6-x86_64-darwin)
       racc (~> 1.4)
     noticed (1.5.9)
       http (>= 4.0.0)
       rails (>= 5.2.0)
-    parallel (1.21.0)
-    parser (3.1.1.0)
+    parallel (1.22.1)
+    parser (3.1.2.0)
       ast (~> 2.4.1)
-    public_suffix (4.0.6)
+    public_suffix (4.0.7)
     racc (1.6.0)
     rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (7.0.2.3)
-      actioncable (= 7.0.2.3)
-      actionmailbox (= 7.0.2.3)
-      actionmailer (= 7.0.2.3)
-      actionpack (= 7.0.2.3)
-      actiontext (= 7.0.2.3)
-      actionview (= 7.0.2.3)
-      activejob (= 7.0.2.3)
-      activemodel (= 7.0.2.3)
-      activerecord (= 7.0.2.3)
-      activestorage (= 7.0.2.3)
-      activesupport (= 7.0.2.3)
+    rails (7.0.3)
+      actioncable (= 7.0.3)
+      actionmailbox (= 7.0.3)
+      actionmailer (= 7.0.3)
+      actionpack (= 7.0.3)
+      actiontext (= 7.0.3)
+      actionview (= 7.0.3)
+      activejob (= 7.0.3)
+      activemodel (= 7.0.3)
+      activerecord (= 7.0.3)
+      activestorage (= 7.0.3)
+      activesupport (= 7.0.3)
       bundler (>= 1.15.0)
-      railties (= 7.0.2.3)
+      railties (= 7.0.3)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.4.2)
       loofah (~> 2.3)
-    railties (7.0.2.3)
-      actionpack (= 7.0.2.3)
-      activesupport (= 7.0.2.3)
+    railties (7.0.3)
+      actionpack (= 7.0.3)
+      activesupport (= 7.0.3)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
@@ -187,25 +185,25 @@ GEM
     rainbow (3.1.1)
     rake (13.0.6)
     redis (4.6.0)
-    regexp_parser (2.2.1)
+    regexp_parser (2.4.0)
     rexml (3.2.5)
-    rubocop (1.26.0)
+    rubocop (1.29.1)
       parallel (~> 1.10)
       parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.16.0, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.17.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.16.0)
+    rubocop-ast (1.18.0)
       parser (>= 3.1.1.0)
-    rubocop-minitest (0.18.0)
+    rubocop-minitest (0.19.1)
       rubocop (>= 0.90, < 2.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
     ruby-progressbar (1.11.0)
-    sidekiq (6.4.1)
+    sidekiq (6.4.2)
       connection_pool (>= 2.2.2)
       rack (~> 2.0)
       redis (>= 4.2.0)
@@ -216,7 +214,7 @@ GEM
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
     sqlite3 (1.4.2)
-    strscan (3.0.1)
+    strscan (3.0.3)
     thor (1.2.1)
     timeout (0.2.0)
     tzinfo (2.0.4)

data/lib/acidic_job/awaiting.rb

@@ -17,8 +17,11 @@ module AcidicJob
         "#{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 }
+          "step_result_yaml" => step_result.to_yaml.strip,
+          "parent_worker" => self.class.name,
+          "job_names" => jobs.map(&:to_s) }
       )
+
       # 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.
@@ -26,7 +29,8 @@ module AcidicJob
         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?
+
+          if worker.instance_method(:perform).arity.presence_in [0, -1]
             worker.perform_async
           elsif worker.instance_method(:perform).arity == 1
             worker.perform_async(run.id)

data/lib/acidic_job/extensions/sidekiq.rb

@@ -25,12 +25,16 @@ module AcidicJob
           # and `AcidicJob::DeliverAcidicly#deliver_acidicly`
           def serialize_with_arguments(args = [], _kwargs = nil)
             # THIS IS A HACK THAT ESSENTIALLY COPIES THE CODE FROM THE SIDEKIQ CODEBASE TO MIMIC THE BEHAVIOR
+            # updated to handle Sidekiq v6.4.2 at latest
             args = Array[args]
             normalized_args = ::Sidekiq.load_json(::Sidekiq.dump_json(args))
             item = { "class" => self, "args" => normalized_args }
             dummy_sidekiq_client = ::Sidekiq::Client.new
             normed = dummy_sidekiq_client.send :normalize_item, item
-            dummy_sidekiq_client.send :process_single, item["class"], normed
+            redis_pool = dummy_sidekiq_client.instance_variable_get(:@redis_pool)
+            dummy_sidekiq_client.middleware.invoke(normed["class"], normed, normed["queue"], redis_pool) do
+              normed
+            end
           end
         end
 

data/lib/acidic_job/step.rb

@@ -52,6 +52,12 @@ module AcidicJob
       # {"does" => :enqueue_step, "then" => :next_step, "awaits" => [WorkerWithEnqueueStep::FirstWorker]}
       current_step = step["does"]
       next_step = step["then"]
+      # to support iteration within steps
+      iterable_key = step["for_each"]
+      iterated_key = "processed_#{current_step}_#{iterable_key}"
+      iterables = @run.attr_accessors.fetch(iterable_key, []) || []
+      iterateds = @run.attr_accessors.fetch(iterated_key, []) || []
+      next_item = iterables.reject { |item| iterateds.include? item }.first
 
       # jobs can have no-op steps, especially so that they can use only the async/await mechanism for that step
       callable = if @job.respond_to?(current_step, _include_private = true)
@@ -62,7 +68,11 @@ module AcidicJob
 
       # return a callable Proc with a consistent interface for the execution phase
       proc do |run|
-        result = if callable.arity.zero?
+        result = if iterable_key.present? && next_item.present?
+                   callable.call(next_item)
+                 elsif iterable_key.present? && next_item.nil?
+                   true
+                 elsif callable.arity.zero?
                    callable.call
                  elsif callable.arity == 1
                    callable.call(run)
@@ -72,6 +82,11 @@ module AcidicJob
 
         if result.is_a?(FinishedPoint)
           result
+        elsif next_item.present?
+          iterateds << next_item
+          @run.attr_accessors[iterated_key] = iterateds
+          @run.save!(validate: false)
+          RecoveryPoint.new(current_step)
         elsif next_step.to_s == Run::FINISHED_RECOVERY_POINT
           FinishedPoint.new
         else

data/lib/acidic_job/version.rb

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

data/lib/acidic_job.rb

@@ -47,7 +47,9 @@ module AcidicJob
       raise UnknownJobAdapter
     end
 
+    # TODO: write test for a staged job that uses awaits
     klass.set_callback :perform, :after, :delete_staged_job_record, if: :was_staged_job?
+    klass.define_callbacks :finish
 
     klass.instance_variable_set(:@acidic_identifier, :job_id)
     klass.define_singleton_method(:acidic_by_job_id) { @acidic_identifier = :job_id }
@@ -128,10 +130,10 @@ module AcidicJob
 
   def process_run(run)
     # if the run record is already marked as finished, immediately return its result
-    return run.succeeded? if run.finished?
+    return finish_run(run) if run.finished?
 
     # otherwise, we will enter a loop to process each step of the workflow
-    run.workflow.size.times do
+    loop do
       recovery_point = run.recovery_point.to_s
       current_step = run.workflow[recovery_point]
 
@@ -167,15 +169,22 @@ module AcidicJob
     end
 
     # the loop will break once the job is finished, so simply report the status
-    run.succeeded?
+    finish_run(run)
   end
 
-  def step(method_name, awaits: [])
+  def finish_run(run)
+    run_callbacks :finish do
+      run.succeeded?
+    end
+  end
+
+  def step(method_name, awaits: [], for_each: nil)
     @__acidic_job_steps ||= []
 
     @__acidic_job_steps << {
       "does" => method_name.to_s,
-      "awaits" => awaits
+      "awaits" => awaits,
+      "for_each" => for_each
     }
 
     @__acidic_job_steps

metadata

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