dwf 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7cfd1989fd7228daec1f81759e249cb3a0d6e920e465b38f1f6998239c78f6c7
-  data.tar.gz: 0e4139ec4372ef7f5fb91b61cae9b2131e7e5b5983e25219a213b3edb821c9c6
+  metadata.gz: a08560cdfefa1c9f8e1f42416599e94550de0f0e1492bb5b05424e2bf94a482f
+  data.tar.gz: 84a83b6849b64e7fe5da74f5734e2d8faa96df25eef63a5d0de78229fcc733ba
 SHA512:
-  metadata.gz: 38b96a776878ddce8df1757ecdba3452a833f117536b9a3f44a07dc801ce71be7ac7cfac997622cd3e172c1a2929ac333f50e4823f901cb844149189c18563de
-  data.tar.gz: 3a32f7469c5a7009e8f04a1d1c9e35fcd8de4fb322593f8e3c9f90fa617fe96eda8dc768dd97c5a3f7bb9044a2eaa87632970fcdddfd6bb57e96c6d72446951b
+  metadata.gz: 6eb847d86872dfa70c1a602a3ae8ef0e0ca166cfa22d0a5e3706454ef0144ac434b48489a916d811e9dc66ebb9ef4979b00b63dee8da4d08c44af6d1bd714dad
+  data.tar.gz: cda011bc87919531f5de78721c3640c2460119cb4dd5668bd4ebb8093e19d46e848d27cfc2112c10021bd41e52e2365ced092f779a25a1509086fdf7095221a9

data/.github/workflows/build_gem.yaml

@@ -6,8 +6,12 @@ on:
   # Alternatively, publish whenever changes are merged to the `main` branch.
   push:
     branches: [ master ]
+    paths:
+      - 'dwf.gemspec'
   pull_request:
     branches: [ master ]
+    paths:
+      - 'dwf.gemspec'
 
 jobs:
   build:

data/.github/workflows/test.yaml

@@ -1,4 +1,4 @@
-name: dwf
+name: Test
 
 on:
   push:

data/CHANGELOG.md

@@ -0,0 +1,41 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+## 0.1.6
+### Added
+- Sidekiq batch callback: separate batches
+
+## 0.1.5
+### Added
+- add github action with build and public gem flow
+
+## 0.1.4
+### Added
+- Add testes
+- add github action
+
+### Fixed
+- Remove Sidekiq pro by default
+
+---
+## 0.1.3
+### Added
+- Support both build in and [Sidekiq batches](https://github.com/mperham/sidekiq/wiki/Batches) callback
+- Update readme
+
+### Fixed
+- Fix bug require development gem
+
+---
+## 0.1.2
+### Added
+- Support [Sidekiq batches](https://github.com/mperham/sidekiq/wiki/Batches) callback
+- Update readme
+
+### Fixed
+- fix typo and remove development gem
+
+---
+## 0.1.0
+### Added
+- init app with basic idea following [Gush](https://github.com/chaps-io/gush) concept
+- Support build in callback

data/README.md

@@ -4,7 +4,7 @@
 # Installation
 ## 1. Add `dwf` to Gemfile
 ```ruby
-gem 'dwf', '~> 0.1.3'
+gem 'dwf', '~> 0.1.5'
 ```
 ## 2. Execute flow
 ### Declare jobs
@@ -39,7 +39,7 @@ end
 ```
 
 #### Note
-`dwf` supports 2 type of callback `Dwf::Workflow::BUILD_IN` and `Dwf::Workflow::SK_BATCH`
+`dwf` supports 2 callback types `Dwf::Workflow::BUILD_IN` and `Dwf::Workflow::SK_BATCH`
 - `Dwf::Workflow::BUILD_IN` is a build-in callback
 - `Dwf::Workflow::SK_BATCH` is [sidekiq batch](https://github.com/mperham/sidekiq/wiki/Batches) callback which required [`sidekiq-pro`](https://sidekiq.org/products/pro.html)
 
@@ -47,7 +47,7 @@ By default `dwf` will use `Dwf::Workflow::BUILD_IN` callback.
 
 ### Execute flow
 ```ruby
-wf = TestWf.create
+wf = TestWf.create(callback_type: Dwf::Workflow::SK_BATCH)
 wf.start!
 ```
 
@@ -75,8 +75,9 @@ D Finished
 - [x] Support pass params
 - [x] Support with build-in callback
 - [x] Add github workflow
-- [ ] [WIF] Test
+- [ ] [WIP] Test
 - [ ] Transfer output through each node
+- [ ] Support [Resque](https://github.com/resque/resque)
 
 # References
 - https://github.com/chaps-io/gush

data/dwf.gemspec

@@ -6,7 +6,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "dwf"
-  spec.version       = '0.1.5'
+  spec.version       = '0.1.6'
   spec.authors       = ["dthtien"]
   spec.email         = ["tiendt2311@gmail.com"]
 

data/lib/dwf/callback.rb

@@ -22,19 +22,48 @@ module Dwf
     private
 
     def setup_batch(processing_job_names, workflow_id)
-      batch = Sidekiq::Batch.new
-      batch.on(
-        :success,
-        'Dwf::Callback#process_next_step',
-        names: processing_job_names,
-        workflow_id: workflow_id
-      )
+      jobs = fetch_jobs(processing_job_names, workflow_id)
+      jobs_classification = classify_jobs jobs
+
+      jobs_classification.values.each do |batch_jobs|
+        batch = Sidekiq::Batch.new
+        batch.on(
+          :success,
+          'Dwf::Callback#process_next_step',
+          names: batch_jobs.map(&:klass),
+          workflow_id: workflow_id
+        )
 
-      batch.jobs do
-        processing_job_names.each { |job_name| perform_job(job_name, workflow_id) }
+        batch.jobs do
+          batch_jobs.each do |job|
+            job.persist_and_perform_async! if job.ready_to_start?
+          end
+        end
       end
     end
 
+    def classify_jobs(jobs)
+      hash = {}
+      jobs.each do |job|
+        outgoing_jobs = job.outgoing
+        key = outgoing_jobs.empty? ? 'default_key' : outgoing_jobs.join
+
+        if hash[key].nil?
+          hash[key] = [job]
+        else
+          hash[key] = hash[key].push(job)
+        end
+      end
+
+      hash
+    end
+
+    def fetch_jobs(processing_job_names, workflow_id)
+      processing_job_names.map do |job_name|
+        client.find_job(workflow_id, job_name)
+      end.compact
+    end
+
     def perform_job(job_name, workflow_id)
       with_lock workflow_id, job_name do
         job = client.find_job(workflow_id, job_name)

data/lib/dwf.rb

@@ -14,6 +14,6 @@ require_relative 'dwf/worker'
 require_relative 'dwf/callback'
 
 module Dwf
-  VERSION = '0.1.3'
+  VERSION = '0.1.6'
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dwf
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - dthtien
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-05 00:00:00.000000000 Z
+date: 2021-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -78,6 +78,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".ruby-version"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md