taskinator 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ae6a63807d0e3e2cb0c513f348eeab155abe830
-  data.tar.gz: ce5a3c1168ff6a3d1bcb623452c458dac6b96dee
+  metadata.gz: 96866a7042bc2b7082aaeead94c5c90f00448f0b
+  data.tar.gz: 42636386ce754b64ce167fe858a59e8c2a0a8286
 SHA512:
-  metadata.gz: 5da9ab4636b65d268ed99c45679433c37fe6c7097c7af6c26bbc8a03e08362f3ac6709da209c43950428a6f2b43b1df3a37242e4f28602ca378ec6d40f9063cf
-  data.tar.gz: d538da07fdd101f86077ad08d2415fc87fab6df2d89327c6df530b56b4f93deaee633095d0fec1633cfc55ae50faa64fb7697614920dcd83bee24a8e33a6b8d3
+  metadata.gz: 061588463242d2d1d11827a339dc17a7903b07631b7194a7ce43639e1d3c4c1a96ec7a24cd62a79e7bb8fa0354a59539ae7fc026377acc22be801f816b6bd3e0
+  data.tar.gz: 19da642b98496489815a1f2e741cda7e8f6fc9885c2becf896e09be7f48b7cdf0d85a5c0c8fb9e9bcd2aac26ecfed2fdcb7bdbb4d114d52faff356ca56eddf73

data/Gemfile.lock

@@ -8,7 +8,7 @@ GIT
 PATH
   remote: .
   specs:
-    taskinator (0.0.4)
+    taskinator (0.0.5)
       connection_pool (>= 2.0.0)
       json (>= 1.8.1)
       redis (>= 3.0.6)
@@ -82,9 +82,9 @@ GEM
       rspec-core (~> 3.1.0)
       rspec-expectations (~> 3.1.0)
       rspec-mocks (~> 3.1.0)
-    rspec-core (3.1.2)
+    rspec-core (3.1.3)
       rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.0)
+    rspec-expectations (3.1.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.1.0)
     rspec-mocks (3.1.0)

data/lib/taskinator/definition/builder.rb

@@ -31,16 +31,18 @@ module Taskinator
 
       # dynamically defines tasks, using the given @iterator method
       # the definition will be evaluated for each yielded item
-      def for_each(iterator_method, options={}, &block)
-        raise ArgumentError, 'iterator_method' if iterator_method.nil?
-        raise NoMethodError, iterator_method unless @executor.respond_to?(iterator_method)
+      def for_each(method, options={}, &block)
+        raise ArgumentError, 'method' if method.nil?
+        raise NoMethodError, method unless @executor.respond_to?(method)
         raise ArgumentError, 'block' unless block_given?
 
-        @executor.send(iterator_method, *@args) do |*args|
+        @executor.send(method, *@args) do |*args|
           Builder.new(@process, @definition, args).instance_eval(&block)
         end
       end
 
+      alias_method :transform, :for_each
+
       # defines a task which executes the given @method
       def task(method, options={})
         raise ArgumentError, 'method' if method.nil?

data/lib/taskinator/job_worker.rb

@@ -14,6 +14,7 @@ module Taskinator
         task.complete!
       rescue Exception => e
         task.fail!(e)
+        raise e
       end
     end
   end

data/lib/taskinator/persistence.rb

@@ -282,13 +282,15 @@ module Taskinator
           if values.is_a?(Array)
 
             values = values.collect {|value|
-              value.respond_to?(:find) ? value.find : value
+              # is it a global id?
+              value.respond_to?(:model_id) && value.respond_to?(:find) ? value.find : value
             }
 
           elsif values.is_a?(Hash)
 
             values.each {|key, value|
-              values[key] = value.find if value.respond_to?(:find)
+              # is it a global id?
+              values[key] = value.find if value.respond_to?(:model_id) && value.respond_to?(:find)
             }
 
           end

data/lib/taskinator/process_worker.rb

@@ -11,6 +11,7 @@ module Taskinator
         process.start!
       rescue Exception => e
         process.fail!(e)
+        raise e
       end
     end
   end

data/lib/taskinator/queues.rb

@@ -3,12 +3,42 @@ module Taskinator
 
     def self.create_adapter(adapter, config={})
       begin
-        send("create_#{adapter}_adapter", config)
+        LoggedAdapter.new(send("create_#{adapter}_adapter", config))
       rescue NoMethodError
         raise "The queue adapter `#{adapter}` is not yet supported or it's runtime isn't loaded."
       end
     end
 
+    class LoggedAdapter < Delegator
+
+      attr_reader :adapter
+
+      def initialize(adapter)
+        Taskinator.logger.info("Initialized '#{adapter.class.name}' queue adapter")
+        @adapter = adapter
+      end
+
+      def __getobj__
+        adapter
+      end
+
+      def enqueue_process(process)
+        Taskinator.logger.info("Enqueuing process #{process}")
+        adapter.enqueue_process(process)
+      end
+
+      def enqueue_task(task)
+        Taskinator.logger.info("Enqueuing task #{task}")
+        adapter.enqueue_task(task)
+      end
+
+      def enqueue_job(job)
+        Taskinator.logger.info("Enqueuing job #{job}")
+        adapter.enqueue_job(job)
+      end
+
+    end
+
   end
 end
 

data/lib/taskinator/task.rb

@@ -170,8 +170,18 @@ module Taskinator
         @args = args
       end
 
+      def enqueue
+        Taskinator.queue.enqueue_job(self)
+      end
+
       def perform(&block)
         yield(job, args)
+        @is_complete = true
+      end
+
+      # NOTE: this _does not_ work when checking out-of-process
+      def can_complete_task?
+        defined?(@is_complete) && @is_complete
       end
 
       def accept(visitor)

data/lib/taskinator/task_worker.rb

@@ -12,6 +12,7 @@ module Taskinator
         task.complete! if task.can_complete?
       rescue Exception => e
         task.fail!(e)
+        raise e
       end
     end
   end

data/lib/taskinator/version.rb

@@ -1,3 +1,3 @@
 module Taskinator
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/examples/queue_adapter_examples.rb

@@ -3,26 +3,41 @@ require 'spec_helper'
 shared_examples_for "a queue adapter" do |adapter_name, adapter_type|
 
   subject { adapter_type.new({}) }
+  let(:job) { double('job') }
 
   it "should instantiate adapter" do
     Taskinator.queue_adapter = adapter_name
-    expect(Taskinator.queue).to be_a(adapter_type)
+    expect(Taskinator.queue.adapter).to be_a(adapter_type)
   end
 
-  it { expect(subject).to respond_to(:enqueue_process) }
+  describe "#enqueue_process" do
+    it { expect(subject).to respond_to(:enqueue_process) }
 
-  it "should enqueue a process" do
-    expect {
-      subject.enqueue_process(double('process', :uuid => 'xx-xx-xx-xx'))
-    }.to_not raise_error
+    it "should enqueue a process" do
+      expect {
+        subject.enqueue_process(double('process', :uuid => 'xx-xx-xx-xx'))
+      }.to_not raise_error
+    end
   end
 
-  it { expect(subject).to respond_to(:enqueue_task) }
+  describe "#enqueue_task" do
+    it { expect(subject).to respond_to(:enqueue_task) }
 
-  it "should enqueue a task" do
-    expect {
-      subject.enqueue_task(double('task', :uuid => 'xx-xx-xx-xx'))
-    }.to_not raise_error
+    it "should enqueue a task" do
+      expect {
+        subject.enqueue_task(double('task', :uuid => 'xx-xx-xx-xx'))
+      }.to_not raise_error
+    end
+  end
+
+  describe "#enqueue_job" do
+    it { expect(subject).to respond_to(:enqueue_job) }
+
+    it "should enqueue a job" do
+      expect {
+        subject.enqueue_job(double('job', :uuid => 'xx-xx-xx-xx', :job => job))
+      }.to_not raise_error
+    end
   end
 
 end

data/spec/spec_helper.rb

@@ -42,6 +42,10 @@ RSpec.configure do |config|
   config.order = :random
   config.fail_fast = (ENV["FAIL_FAST"] == 1)
 
+  config.before(:each) do
+    Taskinator.queue_adapter = :test_queue
+  end
+
   config.before(:each, :redis => true) do
     Taskinator.redis = { :namespace => 'taskinator:test' }
     Taskinator.redis do |conn|

data/spec/support/test_queue.rb

@@ -0,0 +1,38 @@
+module Taskinator
+  module Queues
+
+    def self.create_test_queue_adapter(config={})
+      TestQueueAdapter::new()
+    end
+
+    class TestQueueAdapter
+
+      attr_reader :processes
+      attr_reader :tasks
+      attr_reader :jobs
+
+      def initialize
+        clear
+      end
+
+      def clear
+        @processes = []
+        @tasks = []
+        @jobs = []
+      end
+
+      def enqueue_process(process)
+        @processes << process
+      end
+
+      def enqueue_task(task)
+        @tasks << task
+      end
+
+      def enqueue_job(job)
+        @jobs << job
+      end
+
+    end
+  end
+end

data/spec/taskinator/job_worker_spec.rb

@@ -65,7 +65,9 @@ describe Taskinator::JobWorker do
     allow(Taskinator::Task).to receive(:fetch).with(uuid) { job }
     allow(job).to receive(:start!) { raise NotImplementedError }
     expect(job).to receive(:fail!).with(NotImplementedError)
-    subject.perform
+    expect {
+      subject.perform
+    }.to raise_error(NotImplementedError)
   end
 
 end

data/spec/taskinator/process_spec.rb

@@ -64,6 +64,11 @@ describe Taskinator::Process do
           subject.enqueue!
           expect(subject.current_state.name).to eq(:enqueued)
         }
+        it {
+          expect {
+            subject.enqueue!
+          }.to change { Taskinator.queue.processes.length }.by(1)
+        }
       end
 
       describe "#start!" do

data/spec/taskinator/process_worker_spec.rb

@@ -43,7 +43,9 @@ describe Taskinator::ProcessWorker do
     allow(Taskinator::Process).to receive(:fetch).with(uuid) { process }
     allow(process).to receive(:start!) { raise NotImplementedError }
     expect(process).to receive(:fail!).with(NotImplementedError)
-    subject.perform
+    expect {
+      subject.perform
+    }.to raise_error(NotImplementedError)
   end
 
 end

data/spec/taskinator/queues/sidekiq_spec.rb

@@ -2,7 +2,9 @@ require 'spec_helper'
 
 describe Taskinator::Queues::SidekiqAdapter do
 
-  it_should_behave_like "a queue adapter", :sidekiq, Taskinator::Queues::SidekiqAdapter
+  it_should_behave_like "a queue adapter", :sidekiq, Taskinator::Queues::SidekiqAdapter do
+    let(:job) { double('job', :get_sidekiq_options => {}) }
+  end
 
   let(:adapter) { Taskinator::Queues::SidekiqAdapter }
   let(:uuid) {  SecureRandom.uuid }

data/spec/taskinator/task_spec.rb

@@ -61,6 +61,11 @@ describe Taskinator::Task do
           subject.enqueue!
           expect(subject.current_state.name).to eq(:enqueued)
         }
+        it {
+          expect {
+            subject.enqueue!
+          }.to change { Taskinator.queue.tasks.length }.by(1)
+        }
       end
 
       describe "#start!" do
@@ -216,6 +221,14 @@ describe Taskinator::Task do
     let(:process) { Class.new(Taskinator::Process).new(definition) }
     subject { Taskinator::Task.define_job_task(process, TestJob, {:a => 1, :b => 2}) }
 
+    describe "#enqueue!" do
+      it {
+        expect {
+          subject.enqueue!
+        }.to change { Taskinator.queue.jobs.length }.by(1)
+      }
+    end
+
     describe "#perform" do
       it {
         block = SpecSupport::Block.new()

data/spec/taskinator/task_worker_spec.rb

@@ -59,7 +59,9 @@ describe Taskinator::TaskWorker do
     allow(Taskinator::Task).to receive(:fetch).with(uuid) { task }
     allow(task).to receive(:start!) { raise NotImplementedError }
     expect(task).to receive(:fail!).with(NotImplementedError)
-    subject.perform
+    expect {
+      subject.perform
+    }.to raise_error(NotImplementedError)
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: taskinator
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Chris Stefano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-11 00:00:00.000000000 Z
+date: 2014-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -253,6 +253,7 @@ files:
 - spec/support/delayed_job.rb
 - spec/support/spec_support.rb
 - spec/support/test_flow.rb
+- spec/support/test_queue.rb
 - spec/taskinator/api_spec.rb
 - spec/taskinator/complex_process_spec.rb
 - spec/taskinator/definition/builder_spec.rb
@@ -305,6 +306,7 @@ test_files:
 - spec/support/delayed_job.rb
 - spec/support/spec_support.rb
 - spec/support/test_flow.rb
+- spec/support/test_queue.rb
 - spec/taskinator/api_spec.rb
 - spec/taskinator/complex_process_spec.rb
 - spec/taskinator/definition/builder_spec.rb