taskinator 0.4.0 → 0.4.4

data/spec/spec_helper.rb

@@ -27,6 +27,20 @@ require 'resque'
 require 'resque_spec'
 ResqueSpec.disable_ext = false
 
+require 'active_job'
+
+ActiveJob::Base.queue_adapter = :test
+
+class ApplicationJob < ActiveJob::Base
+  queue_as :not_used
+end
+
+# minimum rails gems for rspec/rails
+require 'action_view'
+require 'action_dispatch'
+require 'action_controller'
+require 'rspec/rails'
+
 require 'taskinator'
 
 Taskinator.configure do |config|

data/spec/support/test_flows.rb

@@ -132,4 +132,42 @@ module TestFlows
     end
   end
 
+  module NestedTask
+    extend Taskinator::Definition
+    include Support
+
+    define_process :task_count do
+      task :task_1
+
+      concurrent do
+        task :task_2
+        task :task_3
+
+        sequential do
+          task :task_4
+          task :task_5
+
+          concurrent do
+            task :task_6
+            task :task_7
+
+            sequential do
+              task :task_8
+              task :task_9
+
+            end
+
+            task :task_10
+          end
+
+          task :task_11
+        end
+
+        task :task_12
+      end
+
+      task :task_13
+    end
+  end
+
 end

data/spec/taskinator/api_spec.rb

@@ -44,4 +44,20 @@ describe Taskinator::Api, :redis => true do
     end
   end
 
+  describe "#find_process" do
+    it {
+      # fetch method is covered by persistence spec
+      expect(Taskinator::Process).to receive(:fetch) {}
+      subject.find_process 'foo:bar:process'
+    }
+  end
+
+  describe "#find_task" do
+    it {
+      # fetch method is covered by persistence spec
+      expect(Taskinator::Task).to receive(:fetch) {}
+      subject.find_task 'foo:bar:process:baz:task'
+    }
+  end
+
 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/persistence_spec.rb

@@ -370,24 +370,27 @@ describe Taskinator::Persistence, :redis => true do
         TestFlows::Job,
         TestFlows::SubProcess,
         TestFlows::Sequential,
-        TestFlows::Concurrent
+        TestFlows::Concurrent,
+        TestFlows::EmptySequentialProcessTest,
+        TestFlows::EmptyConcurrentProcessTest,
+        TestFlows::NestedTask,
       ].each do |definition|
 
         describe "#{definition.name} expire immediately" do
           it {
-            process = definition.create_process(1)
-
             Taskinator.redis do |conn|
-              expect(conn.hget(process.key, :uuid)).to eq(process.uuid)
+              # sanity check
+              expect(conn.keys).to be_empty
 
-              process.cleanup(0) # immediately
+              process = definition.create_process(1)
 
-              expect(conn.hget(process.key, :uuid)).to be_nil
+              # sanity check
+              expect(conn.hget(process.key, :uuid)).to eq(process.uuid)
 
-              recursively_enumerate_tasks(process.tasks) do |task|
-                expect(conn.hget(task.key, :uuid)).to be_nil
-              end
+              process.cleanup(0) # immediately
 
+              # ensure nothing left behind
+              expect(conn.keys).to be_empty
             end
           }
         end
@@ -396,9 +399,14 @@ describe Taskinator::Persistence, :redis => true do
 
       describe "expires in future" do
         it {
-          process = TestFlows::Task.create_process(1)
-
           Taskinator.redis do |conn|
+
+            # sanity check
+            expect(conn.keys).to be_empty
+
+            process = TestFlows::Task.create_process(1)
+
+            # sanity check
             expect(conn.hget(process.key, :uuid)).to eq(process.uuid)
 
             process.cleanup(2)
@@ -411,12 +419,8 @@ describe Taskinator::Persistence, :redis => true do
 
             sleep 3
 
-            # gone!
-            expect(conn.hget(process.key, :uuid)).to be_nil
-            recursively_enumerate_tasks(process.tasks) do |task|
-              expect(conn.hget(task.key, :uuid)).to be_nil
-            end
-
+            # ensure nothing left behind
+            expect(conn.keys).to be_empty
           end
         }
       end

data/spec/taskinator/queues/active_job_spec.rb

@@ -0,0 +1,80 @@
+require 'spec_helper'
+
+describe Taskinator::Queues::ActiveJobAdapter, :active_job do
+
+  it_should_behave_like "a queue adapter", :active_job, Taskinator::Queues::ActiveJobAdapter
+
+  let(:adapter) { Taskinator::Queues::ActiveJobAdapter }
+  let(:uuid) {  Taskinator.generate_uuid }
+
+  subject { adapter.new }
+
+  describe "CreateProcessWorker" do
+    let(:args) { Taskinator::Persistence.serialize(:foo => :bar) }
+
+    it "enqueues" do
+      worker = adapter::CreateProcessWorker
+      definition = MockDefinition.create
+      subject.enqueue_create_process(definition, uuid, :foo => :bar)
+
+      expect(worker).to have_been_enqueued.with(definition.name, uuid, args)
+    end
+
+    it "enqueues to specified queue" do
+      worker = adapter::CreateProcessWorker
+      definition = MockDefinition.create(:other)
+
+      subject.enqueue_create_process(definition, uuid, :foo => :bar)
+
+      expect(worker).to have_been_enqueued.with(definition.name, uuid, args).on_queue(:other)
+    end
+
+    it "calls worker" do
+      expect_any_instance_of(Taskinator::CreateProcessWorker).to receive(:perform)
+      adapter::CreateProcessWorker.new.perform(MockDefinition.create.name, uuid, args)
+    end
+  end
+
+  describe "ProcessWorker" do
+    it "enqueues processes" do
+      worker = adapter::ProcessWorker
+      subject.enqueue_process(double('process', :uuid => uuid, :queue => nil))
+
+      expect(worker).to have_been_enqueued.with(uuid)
+    end
+
+    it "enqueues process to specified queue" do
+      worker = adapter::ProcessWorker
+      subject.enqueue_process(double('process', :uuid => uuid, :queue => :other))
+
+      expect(worker).to have_been_enqueued.with(uuid).on_queue(:other)
+    end
+
+    it "calls process worker" do
+      expect_any_instance_of(Taskinator::ProcessWorker).to receive(:perform)
+      adapter::ProcessWorker.new.perform(uuid)
+    end
+  end
+
+  describe "TaskWorker" do
+    it "enqueues tasks" do
+      worker = adapter::TaskWorker
+      subject.enqueue_task(double('task', :uuid => uuid, :queue => nil))
+
+      expect(worker).to have_been_enqueued.with(uuid)
+    end
+
+    it "enqueues task to specified queue" do
+      worker = adapter::TaskWorker
+      subject.enqueue_task(double('task', :uuid => uuid, :queue => :other))
+
+      expect(worker).to have_been_enqueued.with(uuid).on_queue(:other)
+    end
+
+    it "calls task worker" do
+      expect_any_instance_of(Taskinator::TaskWorker).to receive(:perform)
+      adapter::TaskWorker.new.perform(uuid)
+    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.4
 platform: ruby
 authors:
 - Chris Stefano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-05 00:00:00.000000000 Z
+date: 2022-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -131,13 +131,17 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".coveralls.yml"
+- ".github/ISSUE_TEMPLATE/bug_report.md"
+- ".github/ISSUE_TEMPLATE/custom.md"
+- ".github/ISSUE_TEMPLATE/feature_request.md"
+- ".github/workflows/taskinator.yml"
 - ".gitignore"
 - ".rspec"
 - ".ruby-gemset"
 - ".ruby-version"
-- ".travis.yml"
 - CHANGELOG.md
+- CODE_OF_CONDUCT.md
+- CONTRIBUTING.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -159,6 +163,7 @@ files:
 - lib/taskinator/process.rb
 - lib/taskinator/process_worker.rb
 - lib/taskinator/queues.rb
+- lib/taskinator/queues/active_job.rb
 - lib/taskinator/queues/delayed_job.rb
 - lib/taskinator/queues/resque.rb
 - lib/taskinator/queues/sidekiq.rb
@@ -200,6 +205,7 @@ files:
 - spec/taskinator/persistence_spec.rb
 - spec/taskinator/process_spec.rb
 - spec/taskinator/process_worker_spec.rb
+- spec/taskinator/queues/active_job_spec.rb
 - spec/taskinator/queues/delayed_job_spec.rb
 - spec/taskinator/queues/resque_spec.rb
 - spec/taskinator/queues/sidekiq_spec.rb
@@ -232,7 +238,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: A simple orchestration library for running complex processes or workflows
@@ -266,6 +272,7 @@ test_files:
 - spec/taskinator/persistence_spec.rb
 - spec/taskinator/process_spec.rb
 - spec/taskinator/process_worker_spec.rb
+- spec/taskinator/queues/active_job_spec.rb
 - spec/taskinator/queues/delayed_job_spec.rb
 - spec/taskinator/queues/resque_spec.rb
 - spec/taskinator/queues/sidekiq_spec.rb

data/.coveralls.yml

@@ -1 +0,0 @@
-service_name: travis-ci

data/.travis.yml

@@ -1,23 +0,0 @@
-os: linux
-dist: xenial
-language: ruby
-cache: bundler
-
-services:
-  - redis
-
-rvm:
-  - 2.5.8
-  - 2.6.6
-  - 2.7.2
-  - 3.0.0
-
-script: 'bundle exec rake spec'
-
-notifications:
-  email:
-    recipients:
-      - virtualstaticvoid@gmail.com
-    on_failure: change
-    on_success: never
-