sidekiq_workflows 0.2.3 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a72a673bff2b06b52efa9b4c1850b00e60dda029cbd014bb5c18c97de341743c
-  data.tar.gz: d0c51fde3f914762c31636e98a025e90719b8f3c107e6671846829c7394dbafb
+  metadata.gz: cfe14b006b243a658de47101698b0b0b47e73b881275745f17a13851cec71efc
+  data.tar.gz: 6b66f424a92e434152ffce19079435de9ec12884cc24cbf16e623d8571948082
 SHA512:
-  metadata.gz: da3206c3422a4ae213fc2fd2bfb07221378d029e15c3fb35a6260bf749798f318ebdbf7fb6023317281990728e7148819070c0f3cd33c6d2664873de54af35df
-  data.tar.gz: 8e4a7fd1f097a20d63ac9668ad2153d39b17201f3bca7e09e1eec0711ad5b691daf78e5428817fccc4e75e4dc47b4162abed22c0ed1ded3690bdc53ddd95a6e1
+  metadata.gz: c87521b82948cd1a084612c06556361d69e7a4739094aa1ba3b3cc65d1d79016773c0f39e10b7de8f17909d9b683a55871b594720a54aeb43e23daf417fdbe55
+  data.tar.gz: ffb5ef5cf0bd7f3bf23664d819ab4cd5b80040c009ad1fc3965611a890bdddd31fcbcd4dde19c00d8e633f8ff8077f58c584bcb95fa72c8d92c59a9eb612c139

data/lib/sidekiq_workflows/worker.rb

@@ -17,7 +17,8 @@ module SidekiqWorkflows
           child_batch = Sidekiq::Batch.new
           child_batch.callback_queue = SidekiqWorkflows.callback_queue unless SidekiqWorkflows.callback_queue.nil?
           child_batch.description = "Workflow #{workflow.workflow_uuid || '-'}"
-          child_batch.on(:complete, 'SidekiqWorkflows::Worker#on_complete', workflow: workflow.serialize, workflow_uuid: workflow.workflow_uuid)
+          child_batch.on(:success, 'SidekiqWorkflows::Worker#on_success', workflow: workflow.serialize, workflow_uuid: workflow.workflow_uuid)
+          child_batch.on(:death, 'SidekiqWorkflows::Worker#on_death', workflow: workflow.serialize, workflow_uuid: workflow.workflow_uuid)
           child_batch.jobs do
             workflow.workers.each do |entry|
               if entry[:delay]
@@ -31,7 +32,7 @@ module SidekiqWorkflows
       end
     end
 
-    def on_complete(status, options)
+    def on_success(status, options)
       workflow = ensure_deserialized(options['workflow'])
 
       if workflow.on_partial_complete
@@ -39,21 +40,35 @@ module SidekiqWorkflows
         ActiveSupport::Inflector.constantize(klass).new.send(method, status, options)
       end
 
-      perform_children(status.parent_batch, workflow) unless status.failures > 0
+      perform_children(status.parent_batch, workflow)
+    end
+
+    def on_death(status, options)
+      workflow = ensure_deserialized(options['workflow'])
+
+      if workflow.on_partial_complete
+        klass, method = workflow.on_partial_complete.split('#')
+        ActiveSupport::Inflector.constantize(klass).new.send(method, status, options)
+      end
     end
 
     def self.perform_async(workflow, *args)
       set(queue: worker_queue).send(:perform_async, workflow.serialize, *args)
     end
 
-    def self.perform_workflow(workflow, on_complete: nil, on_complete_options: {})
+    def self.perform_workflow(workflow, on_success: nil, on_success_options: {}, on_death: nil, on_death_options: {})
       batch = Sidekiq::Batch.new
       batch.callback_queue = SidekiqWorkflows.callback_queue unless SidekiqWorkflows.callback_queue.nil?
       batch.description = "Workflow #{workflow.workflow_uuid || '-'} root batch"
-      batch.on(:complete, on_complete, on_complete_options.merge(workflow_uuid: workflow.workflow_uuid)) if on_complete
+      batch.on(:success, on_success, on_success_options.merge(workflow_uuid: workflow.workflow_uuid)) if on_success
+      batch.on(:death, on_death, on_death_options.merge(workflow_uuid: workflow.workflow_uuid)) if on_death
+
+      yield batch if block_given?
+
       batch.jobs do
         perform_async(workflow)
       end
+
       batch.bid
     end
 

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq_workflows
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 1.0.0
 platform: ruby
 authors:
 - Marian Theisen
 - Christian Semmler
 - Patrick Detlefsen
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-08-16 00:00:00.000000000 Z
+date: 2021-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq-pro
@@ -18,26 +18,26 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 5.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 5.2.1
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
@@ -116,7 +116,7 @@ homepage: https://github.com/easymarketing/sidekiq_workflows
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -131,8 +131,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Sidekiq extension providing a workflow API on top of Sidekiq Pro's batches
 test_files: []