taskinator 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5f30cdfcc1ec3f517d2346f5eb27549cf27ed18ab830692e3747fdb1a5244e8
-  data.tar.gz: '08299d0e337897c9efcb2080debec16072459d6a2a9fdfb8218c2bc296652a25'
+  metadata.gz: 4a5f5f63478b9c1b1419e33baf6039f8e92153638ba2c08dc60cadd1a968d117
+  data.tar.gz: e222c79a85490ec2cbced43833b05b40e97dc6863782586505b19b178e44f664
 SHA512:
-  metadata.gz: 6d3c829ff6913bfc9c7bd41736a75b43119ebb50337eb666970e6133cbc3ee466291011c72b6213e7182111c9899706c1a241f2b3e4579474a6c1c7513e6c4d6
-  data.tar.gz: 82c7058f70249413193d1699b8ad49e300d858d6a2d90f12c63667131399c9e33358342f6d28f36a8fd3f98d4e31c6b5a98dd4735105484e917d8262825243a2
+  metadata.gz: ffd5ee0e0b9bfc78e9f44086d2b60986483c4668acf9b9a282ed3110d15d59477fec68b1042876d52899fe2531648ccd793efa9ba92415231ad4e637922b8049
+  data.tar.gz: 99fb91f000e510dd98eda1d843e644c563ca71288759e7d23493a605b7f7b342a116cff2d2bd530250fb552cd88d728a67171fafb49419461baa7200355d9e47

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+v0.4.1 - 15 Mar 2021
+---
+Optimisation to exclude sub-processes which don't have any tasks.
+Preparations for upgrade to Ruby 3 and ActiveSupport 6
+
 v0.4.0 - 4 Mar 2021
 ---
 Bug fix `job` tasks which have no arguments to the `perform` method.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    taskinator (0.4.0)
+    taskinator (0.4.1)
       builder (>= 3.2.2)
       connection_pool (>= 2.2.0)
       globalid (~> 0.3)
@@ -139,4 +139,4 @@ DEPENDENCIES
   taskinator!
 
 BUNDLED WITH
-   2.2.13
+   2.2.14

data/lib/taskinator/definition/builder.rb

@@ -24,7 +24,10 @@ module Taskinator
         raise ArgumentError, 'block' unless block_given?
 
         sub_process = Process.define_sequential_process_for(@definition, options)
-        Builder.new(define_sub_process_task(@process, sub_process, options), @definition, *@args).instance_eval(&block)
+        task = define_sub_process_task(@process, sub_process, options)
+        Builder.new(sub_process, @definition, *@args).instance_eval(&block)
+        @process.tasks << task if sub_process.tasks.any?
+        nil
       end
 
       # defines a sub process of tasks which are executed concurrently
@@ -32,7 +35,10 @@ module Taskinator
         raise ArgumentError, 'block' unless block_given?
 
         sub_process = Process.define_concurrent_process_for(@definition, complete_on, options)
-        Builder.new(define_sub_process_task(@process, sub_process, options), @definition, *@args).instance_eval(&block)
+        task = define_sub_process_task(@process, sub_process, options)
+        Builder.new(sub_process, @definition, *@args).instance_eval(&block)
+        @process.tasks << task if sub_process.tasks.any?
+        nil
       end
 
       # dynamically defines tasks, using the given @iterator method
@@ -51,6 +57,7 @@ module Taskinator
         @executor.send(method, *method_args) do |*args|
           Builder.new(@process, @definition, *args).instance_eval(&block)
         end
+        nil
       end
 
       alias_method :transform, :for_each
@@ -61,6 +68,7 @@ module Taskinator
         raise NoMethodError, method unless @executor.respond_to?(method)
 
         define_step_task(@process, method, @args, options)
+        nil
       end
 
       # defines a task which executes the given @job
@@ -70,6 +78,7 @@ module Taskinator
         raise ArgumentError, 'job' unless job.methods.include?(:perform) || job.instance_methods.include?(:perform)
 
         define_job_task(@process, job, @args, options)
+        nil
       end
 
       # defines a sub process task, for the given @definition
@@ -82,7 +91,10 @@ module Taskinator
         # TODO: decide whether the sub process to dynamically receive arguments
 
         sub_process = definition.create_sub_process(*@args, combine_options(options))
-        Builder.new(define_sub_process_task(@process, sub_process, options), definition, *@args)
+        task = define_sub_process_task(@process, sub_process, options)
+        Builder.new(sub_process, definition, *@args)
+        @process.tasks << task if sub_process.tasks.any?
+        nil
       end
 
     private
@@ -100,10 +112,7 @@ module Taskinator
       end
 
       def define_sub_process_task(process, sub_process, options={})
-        define_task(process) {
-          Task.define_sub_process_task(process, sub_process, combine_options(options))
-        }
-        sub_process
+        Task.define_sub_process_task(process, sub_process, combine_options(options))
       end
 
       def define_task(process)

data/lib/taskinator/version.rb

@@ -1,3 +1,3 @@
 module Taskinator
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/spec/taskinator/definition/builder_spec.rb

@@ -75,6 +75,22 @@ describe Taskinator::Definition::Builder do
       expect(Taskinator::Process).to receive(:define_sequential_process_for).with(definition, options).and_call_original
       subject.sequential(options, &define_block)
     end
+
+    it "adds sub-process task" do
+      block = Proc.new {|p|
+        p.task :task_method
+      }
+      expect(process.tasks).to be_empty
+      subject.sequential(options, &block)
+      expect(process.tasks).to_not be_empty
+    end
+
+    it "ignores sub-processes without tasks" do
+      allow(block).to receive(:call)
+      expect(process.tasks).to be_empty
+      subject.sequential(options, &define_block)
+      expect(process.tasks).to be_empty
+    end
   end
 
   describe "#concurrent" do
@@ -100,6 +116,22 @@ describe Taskinator::Definition::Builder do
       expect(Taskinator::Process).to receive(:define_concurrent_process_for).with(definition, Taskinator::CompleteOn::First, options).and_call_original
       subject.concurrent(Taskinator::CompleteOn::First, options, &define_block)
     end
+
+    it "adds sub-process task" do
+      block = Proc.new {|p|
+        p.task :task_method
+      }
+      expect(process.tasks).to be_empty
+      subject.sequential(options, &block)
+      expect(process.tasks).to_not be_empty
+    end
+
+    it "ignores sub-processes without tasks" do
+      allow(block).to receive(:call)
+      expect(process.tasks).to be_empty
+      subject.sequential(options, &define_block)
+      expect(process.tasks).to be_empty
+    end
   end
 
   describe "#for_each" do
@@ -235,6 +267,22 @@ describe Taskinator::Definition::Builder do
       expect(sub_definition).to receive(:create_sub_process).with(*args, builder_options.merge(options)).and_call_original
       subject.sub_process(sub_definition, options)
     end
+
+    it "adds sub-process task" do
+      block = Proc.new {|p|
+        p.task :task_method
+      }
+      expect(process.tasks).to be_empty
+      subject.sequential(options, &block)
+      expect(process.tasks).to_not be_empty
+    end
+
+    it "ignores sub-processes without tasks" do
+      allow(block).to receive(:call)
+      expect(process.tasks).to be_empty
+      subject.sequential(options, &define_block)
+      expect(process.tasks).to be_empty
+    end
   end
 
 end

data/spec/taskinator/task_spec.rb

@@ -227,7 +227,7 @@ describe Taskinator::Task do
 
         method = subject.method
 
-        executor.class_eval do
+        executor.singleton_class.class_eval do
           define_method method do |*args|
             # this method executes in the scope of the executor
             # store the context in an instance variable

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: taskinator
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Chris Stefano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-05 00:00:00.000000000 Z
+date: 2021-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis