ntswf 1.0.4 → 1.0.5

data/lib/ntswf/activity_worker.rb

@@ -10,11 +10,7 @@ module Ntswf
       domain.activity_tasks.poll_for_single_task(activity_task_list) do |task|
         announce("got activity task #{task.activity_type.inspect} #{task.input}")
         begin
-          if task.activity_type == activity_type
-            yield task
-          else
-            raise "unknown activity type: #{task.activity_type.inspect}"
-          end
+          yield task
         rescue => e
           notify(e, activity_type: task.activity_type.inspect, input: task.input)
           details = {

data/lib/ntswf/base.rb

@@ -69,8 +69,21 @@ module Ntswf
       log("#{message.message}\n  #{message.backtrace.join("\n  ")}") if message.kind_of? Exception
     end
 
+    # @return [String] separator for composite *workflow_id*
+    def separator
+      ";"
+    end
+
     protected
 
+    def activity_name
+      "#{default_unit}-activity"
+    end
+
+    def activity_type
+      @activity_type ||= domain.activity_types[activity_name, workflow_version]
+    end
+
     def announce(s)
       $0 = s
       log(s)

data/lib/ntswf/client.rb

@@ -31,11 +31,6 @@ module Ntswf
       )
     end
 
-    # @return [String] separator part of the final *workflow_id*
-    def separator
-      ";"
-    end
-
     protected
 
     def workflow_type

data/lib/ntswf/utils.rb

@@ -8,10 +8,6 @@ module Ntswf
       swf.domains.create(@config.domain, 3, description: description)
     end
 
-    def activity_name
-      "#{default_unit}-activity"
-    end
-
     def register_workflow_type
       domain.workflow_types.register(workflow_name, workflow_version)
     end
@@ -19,9 +15,5 @@ module Ntswf
     def register_activity_type
       domain.activity_types.register(activity_name, workflow_version)
     end
-
-    def activity_type
-      @activity_type ||= domain.activity_types[activity_name, workflow_version]
-    end
   end
 end

data/spec/activity_worker_spec.rb

@@ -0,0 +1,26 @@
+require "ntswf"
+
+describe Ntswf::ActivityWorker do
+  class Worker
+    include Ntswf::ActivityWorker
+  end
+
+  before { Worker.any_instance.stub(announce: nil, log: nil) }
+
+  let(:config) { { unit: "test", activity_task_lists: { "test" => "task_list" } } }
+  let(:worker) { Worker.new config }
+  let(:activity_task) { mock input: "{}" }
+
+  describe "processing an activity task" do
+    before do
+      AWS::SimpleWorkflow::ActivityTaskCollection.any_instance.stub(:poll_for_single_task).
+          and_yield activity_task
+    end
+
+    context "given foreign activity type" do
+      before { activity_task.stub activity_type: :some_random_thing }
+      subject { worker.process_activity_task { :accepted } }
+      it { should eq :accepted }
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ntswf
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-15 00:00:00.000000000 Z
+date: 2014-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -27,6 +27,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A layer around AWS SWF
 email: info@infopark.de
 executables: []
@@ -42,6 +58,7 @@ files:
 - lib/ntswf/client.rb
 - lib/ntswf/base.rb
 - lib/ntswf.rb
+- spec/activity_worker_spec.rb
 homepage: https://github.com/infopark/ntswf
 licenses:
 - LGPLv3
@@ -67,5 +84,6 @@ rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Not That Simple Workflow
-test_files: []
+test_files:
+- spec/activity_worker_spec.rb
 has_rdoc: