bumbleworks 0.0.50 → 0.0.51

data/lib/bumbleworks/participant.rb

@@ -1,10 +1,5 @@
-require "bumbleworks/participant/storage_participant"
-require "bumbleworks/participant/local_participant"
-require "bumbleworks/participant/base"
-require "bumbleworks/participant/error_handler"
-require "bumbleworks/participant/entity_interactor"
-
-module Bumbleworks
-  module Participant
-  end
-end
+require "bumbleworks/participants/storage_participant"
+require "bumbleworks/participants/local_participant"
+require "bumbleworks/participants/participant"
+require "bumbleworks/participants/error_dispatcher"
+require "bumbleworks/participants/entity_interactor"

data/lib/bumbleworks/participants/entity_interactor.rb

@@ -0,0 +1,27 @@
+module Bumbleworks
+  class EntityInteractor < Bumbleworks::Participant
+    def on_workitem
+      method_name = workitem.fields['params']['method'] ||
+        workitem.fields['params']['to'] ||
+        workitem.fields['params']['for']
+      result_field = workitem.fields['params']['and_save_as']
+      arguments = workitem.fields['params']['arguments'] ||
+        workitem.fields['params']['with']
+      result = call_method(method_name, :save_as => result_field, :args => arguments)
+      reply
+    end
+
+    def call_method(method_name, options = {})
+      result = if options[:args]
+        options[:args] = [options[:args]] if options[:args].is_a?(Hash)
+        entity.send(method_name, *options[:args])
+      else
+        entity.send(method_name)
+      end
+      if result && options[:save_as]
+        workitem.fields[options[:save_as]] = result
+      end
+      result
+    end
+  end
+end

data/lib/bumbleworks/participants/error_dispatcher.rb

@@ -0,0 +1,12 @@
+module Bumbleworks
+  class ErrorDispatcher < Bumbleworks::Participant
+    def on_workitem
+      return if (error_handlers = Bumbleworks.error_handlers).empty?
+
+      error_handlers.each do |error_handler|
+        error_handler.new(workitem).on_error
+      end
+      reply
+    end
+  end
+end

data/lib/bumbleworks/participants/local_participant.rb

@@ -0,0 +1,9 @@
+require "ruote/part/local_participant"
+require "bumbleworks/workitem_entity_storage"
+
+module Bumbleworks
+  module LocalParticipant
+    include ::Ruote::LocalParticipant
+    include WorkitemEntityStorage
+  end
+end

data/lib/bumbleworks/participants/participant.rb

@@ -0,0 +1,9 @@
+module Bumbleworks
+  class Participant
+    include LocalParticipant
+
+    def on_cancel
+      # default no-op method
+    end
+  end
+end

data/lib/bumbleworks/participants/storage_participant.rb

@@ -0,0 +1,9 @@
+module Bumbleworks
+  class StorageParticipant < ::Ruote::StorageParticipant
+    def on_workitem
+      return_value = super
+      Bumbleworks::Task.new(self[workitem.sid]).on_dispatch
+      return return_value
+    end
+  end
+end

data/lib/bumbleworks/ruote.rb

@@ -29,7 +29,7 @@ module Bumbleworks
       #
       def start_worker!(options = {})
         set_up_storage_history
-        register_error_handler
+        register_error_dispatcher
         dashboard.noisy = options[:verbose] == true
         worker = ::Ruote::Worker.new(dashboard.context)
         if options[:join] == true
@@ -101,23 +101,23 @@ module Bumbleworks
       def register_participants(&block)
         dashboard.register(&block) if block
         register_entity_interactor
-        register_error_handler
+        register_error_dispatcher
         set_catchall_if_needed
         dashboard.participant_list
       end
 
       def register_entity_interactor
         unless dashboard.participant_list.any? { |part| part.regex == "^(ask|tell)_entity$" }
-          entity_interactor = ::Ruote::ParticipantEntry.new(["^(ask|tell)_entity$", ["Bumbleworks::Participant::EntityInteractor", {}]])
+          entity_interactor = ::Ruote::ParticipantEntry.new(["^(ask|tell)_entity$", ["Bumbleworks::EntityInteractor", {}]])
           dashboard.participant_list = dashboard.participant_list.unshift(entity_interactor)
         end
       end
 
-      def register_error_handler
-        unless dashboard.participant_list.any? { |part| part.regex == '^error_handler_participant$' }
-          error_handler_participant = ::Ruote::ParticipantEntry.new(['^error_handler_participant$', ["Bumbleworks::Participant::ErrorHandler", {}]])
-          dashboard.participant_list = dashboard.participant_list.unshift(error_handler_participant)
-          dashboard.on_error = 'error_handler_participant'
+      def register_error_dispatcher
+        unless dashboard.participant_list.any? { |part| part.regex == '^error_dispatcher$' }
+          error_dispatcher = ::Ruote::ParticipantEntry.new(['^error_dispatcher$', ["Bumbleworks::ErrorDispatcher", {}]])
+          dashboard.participant_list = dashboard.participant_list.unshift(error_dispatcher)
+          dashboard.on_error = 'error_dispatcher'
         end
       end
 
@@ -130,8 +130,8 @@ module Bumbleworks
       def set_catchall_if_needed
         last_participant = dashboard.participant_list.last
         unless last_participant && last_participant.regex == "^.+$" &&
-            ["Ruote::StorageParticipant", "Bumbleworks::Participant::StorageParticipant"].include?(last_participant.classname)
-          catchall = ::Ruote::ParticipantEntry.new(["^.+$", ["Bumbleworks::Participant::StorageParticipant", {}]])
+            ["Ruote::StorageParticipant", "Bumbleworks::StorageParticipant"].include?(last_participant.classname)
+          catchall = ::Ruote::ParticipantEntry.new(["^.+$", ["Bumbleworks::StorageParticipant", {}]])
           dashboard.participant_list = dashboard.participant_list.push(catchall)
         end
       end

data/lib/bumbleworks/version.rb

@@ -1,3 +1,3 @@
 module Bumbleworks
-  VERSION = "0.0.50"
+  VERSION = "0.0.51"
 end

data/spec/integration/sample_application_spec.rb

@@ -12,11 +12,11 @@ describe 'Bumbleworks Sample Application' do
     it 'registers participants' do
       Bumbleworks.dashboard.participant_list.should have(5).items
       Bumbleworks.dashboard.participant_list.map(&:classname).should == [
-        'Bumbleworks::Participant::ErrorHandler',
-        'Bumbleworks::Participant::EntityInteractor',
+        'Bumbleworks::ErrorDispatcher',
+        'Bumbleworks::EntityInteractor',
         'HoneyParticipant',
         'MolassesParticipant',
-        'Bumbleworks::Participant::StorageParticipant'
+        'Bumbleworks::StorageParticipant'
       ]
     end
 

data/spec/lib/bumbleworks/participant/base_spec.rb

@@ -1,6 +1,6 @@
-describe Bumbleworks::Participant::Base do
-  it 'includes Bumbleworks::Participant::LocalParticipant' do
-    described_class.included_modules.should include(Bumbleworks::Participant::LocalParticipant)
+describe Bumbleworks::Participant do
+  it 'includes Bumbleworks::LocalParticipant' do
+    described_class.included_modules.should include(Bumbleworks::LocalParticipant)
   end
 
   it 'defines #on_cancel' do

data/spec/lib/bumbleworks/participant/entity_interactor_spec.rb

@@ -1,4 +1,4 @@
-describe Bumbleworks::Participant::EntityInteractor do
+describe Bumbleworks::EntityInteractor do
   let(:entity) { double('entity', :cheek_depth => 'crazy deep') }
   let(:workitem) { Ruote::Workitem.new('fields' => { 'params' => { 'method' => 'cheek_depth' }}) }
   subject { part = described_class.new; part.stub(:entity => entity, :reply => nil); part }

data/spec/lib/bumbleworks/participant/{error_handler_spec.rb → error_dispatcher_spec.rb}

@@ -1,4 +1,4 @@
-describe Bumbleworks::Participant::ErrorHandler do
+describe Bumbleworks::ErrorDispatcher do
   describe '#on_workitem' do
     let(:workitem) { double('workitem') }
     let(:instances) { [double(:on_error => nil), double(:on_error => nil)] }

data/spec/lib/bumbleworks/participant/local_participant_spec.rb

@@ -1,4 +1,4 @@
-describe Bumbleworks::Participant::LocalParticipant do
+describe Bumbleworks::LocalParticipant do
   it 'includes Ruote::LocalParticipant' do
     described_class.included_modules.should include(Ruote::LocalParticipant)
   end

data/spec/lib/bumbleworks/ruote_spec.rb

@@ -222,7 +222,7 @@ describe Bumbleworks::Ruote do
     end
 
     it 'registers error handler' do
-      described_class.should_receive(:register_error_handler)
+      described_class.should_receive(:register_error_dispatcher)
       described_class.start_worker!
     end
 
@@ -231,15 +231,15 @@ describe Bumbleworks::Ruote do
       described_class.start_worker!
     end
 
-    it 'does not add another error_handler_participant if already registered' do
+    it 'does not add another error_dispatcher if already registered' do
       described_class.register_participants
       described_class.start_worker!
       described_class.dashboard.participant_list.map(&:classname).should == [
-        'Bumbleworks::Participant::ErrorHandler',
-        'Bumbleworks::Participant::EntityInteractor',
-        'Bumbleworks::Participant::StorageParticipant'
+        'Bumbleworks::ErrorDispatcher',
+        'Bumbleworks::EntityInteractor',
+        'Bumbleworks::StorageParticipant'
       ]
-      Bumbleworks.dashboard.on_error.flatten[2].should == 'error_handler_participant'
+      Bumbleworks.dashboard.on_error.flatten[2].should == 'error_dispatcher'
     end
   end
 
@@ -284,10 +284,10 @@ describe Bumbleworks::Ruote do
       described_class.register_participants &registration_block
       described_class.dashboard.participant_list.should have(6).items
       described_class.dashboard.participant_list.map(&:classname).should == [
-        'Bumbleworks::Participant::ErrorHandler',
-        'Bumbleworks::Participant::EntityInteractor',
+        'Bumbleworks::ErrorDispatcher',
+        'Bumbleworks::EntityInteractor',
         'BeesHoney', 'MapleSyrup', 'NewCatchall',
-        'Bumbleworks::Participant::StorageParticipant'
+        'Bumbleworks::StorageParticipant'
       ]
     end
 
@@ -301,7 +301,7 @@ describe Bumbleworks::Ruote do
       described_class.register_participants &registration_block
       described_class.dashboard.participant_list.should have(4).items
       described_class.dashboard.participant_list.map(&:classname).should == [
-        'Bumbleworks::Participant::ErrorHandler', 'Bumbleworks::Participant::EntityInteractor', 'BeesHoney', 'Ruote::StorageParticipant'
+        'Bumbleworks::ErrorDispatcher', 'Bumbleworks::EntityInteractor', 'BeesHoney', 'Ruote::StorageParticipant'
       ]
     end
 
@@ -310,28 +310,28 @@ describe Bumbleworks::Ruote do
       described_class.register_participants &nil
       described_class.dashboard.participant_list.should have(3).item
       described_class.dashboard.participant_list.map(&:classname).should ==
-        ['Bumbleworks::Participant::ErrorHandler', 'Bumbleworks::Participant::EntityInteractor', 'Bumbleworks::Participant::StorageParticipant']
+        ['Bumbleworks::ErrorDispatcher', 'Bumbleworks::EntityInteractor', 'Bumbleworks::StorageParticipant']
     end
   end
 
-  describe '.register_error_handler', dev:true do
+  describe '.register_error_dispatcher', dev:true do
     it 'registers the error handler participant' do
-      described_class.register_error_handler
-      Bumbleworks.dashboard.participant_list.map(&:classname).should include('Bumbleworks::Participant::ErrorHandler')
+      described_class.register_error_dispatcher
+      Bumbleworks.dashboard.participant_list.map(&:classname).should include('Bumbleworks::ErrorDispatcher')
     end
 
-    it 'it sets the global Ruote on_error to the error_handler_participant' do
-      described_class.register_error_handler
-      Bumbleworks.dashboard.on_error.flatten[2].should == 'error_handler_participant'
+    it 'it sets the global Ruote on_error to the error_dispatcher' do
+      described_class.register_error_dispatcher
+      Bumbleworks.dashboard.on_error.flatten[2].should == 'error_dispatcher'
     end
 
-    it 'does not override existing error_handler_participant' do
+    it 'does not override existing error_dispatcher' do
       described_class.register_participants do
-        error_handler_participant 'Whatever'
+        error_dispatcher 'Whatever'
       end
-      described_class.register_error_handler
+      described_class.register_error_dispatcher
       Bumbleworks.dashboard.participant_list.map(&:classname).should ==
-        ['Bumbleworks::Participant::EntityInteractor', 'Whatever', 'Bumbleworks::Participant::StorageParticipant']
+        ['Bumbleworks::EntityInteractor', 'Whatever', 'Bumbleworks::StorageParticipant']
 
     end
   end
@@ -369,7 +369,7 @@ describe Bumbleworks::Ruote do
       described_class.dashboard.participant_list.should be_empty
       described_class.launch('foo')
       described_class.dashboard.participant_list.should have(1).item
-      described_class.dashboard.participant_list.first.classname.should == 'Bumbleworks::Participant::StorageParticipant'
+      described_class.dashboard.participant_list.first.classname.should == 'Bumbleworks::StorageParticipant'
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bumbleworks
 version: !ruby/object:Gem::Version
-  version: 0.0.50
+  version: 0.0.51
   prerelease: 
 platform: ruby
 authors:
@@ -172,12 +172,12 @@ files:
 - lib/bumbleworks/error_logger.rb
 - lib/bumbleworks/hash_storage.rb
 - lib/bumbleworks/participant.rb
-- lib/bumbleworks/participant/base.rb
-- lib/bumbleworks/participant/entity_interactor.rb
-- lib/bumbleworks/participant/error_handler.rb
-- lib/bumbleworks/participant/local_participant.rb
-- lib/bumbleworks/participant/storage_participant.rb
 - lib/bumbleworks/participant_registration.rb
+- lib/bumbleworks/participants/entity_interactor.rb
+- lib/bumbleworks/participants/error_dispatcher.rb
+- lib/bumbleworks/participants/local_participant.rb
+- lib/bumbleworks/participants/participant.rb
+- lib/bumbleworks/participants/storage_participant.rb
 - lib/bumbleworks/process.rb
 - lib/bumbleworks/process_definition.rb
 - lib/bumbleworks/rake_tasks.rb
@@ -221,7 +221,7 @@ files:
 - spec/lib/bumbleworks/hash_storage_spec.rb
 - spec/lib/bumbleworks/participant/base_spec.rb
 - spec/lib/bumbleworks/participant/entity_interactor_spec.rb
-- spec/lib/bumbleworks/participant/error_handler_spec.rb
+- spec/lib/bumbleworks/participant/error_dispatcher_spec.rb
 - spec/lib/bumbleworks/participant/local_participant_spec.rb
 - spec/lib/bumbleworks/participant_registration_spec.rb
 - spec/lib/bumbleworks/process_definition_spec.rb
@@ -256,7 +256,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3856006689923069850
+      hash: 3654012293200384530
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -265,7 +265,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3856006689923069850
+      hash: 3654012293200384530
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -300,7 +300,7 @@ test_files:
 - spec/lib/bumbleworks/hash_storage_spec.rb
 - spec/lib/bumbleworks/participant/base_spec.rb
 - spec/lib/bumbleworks/participant/entity_interactor_spec.rb
-- spec/lib/bumbleworks/participant/error_handler_spec.rb
+- spec/lib/bumbleworks/participant/error_dispatcher_spec.rb
 - spec/lib/bumbleworks/participant/local_participant_spec.rb
 - spec/lib/bumbleworks/participant_registration_spec.rb
 - spec/lib/bumbleworks/process_definition_spec.rb

data/lib/bumbleworks/participant/base.rb

@@ -1,11 +0,0 @@
-module Bumbleworks
-  module Participant
-    class Base
-      include LocalParticipant
-
-      def on_cancel
-        # default no-op method
-      end
-    end
-  end
-end

data/lib/bumbleworks/participant/entity_interactor.rb

@@ -1,29 +0,0 @@
-module Bumbleworks
-  module Participant
-    class EntityInteractor < Bumbleworks::Participant::Base
-      def on_workitem
-        method_name = workitem.fields['params']['method'] ||
-          workitem.fields['params']['to'] ||
-          workitem.fields['params']['for']
-        result_field = workitem.fields['params']['and_save_as']
-        arguments = workitem.fields['params']['arguments'] ||
-          workitem.fields['params']['with']
-        result = call_method(method_name, :save_as => result_field, :args => arguments)
-        reply
-      end
-
-      def call_method(method_name, options = {})
-        result = if options[:args]
-          options[:args] = [options[:args]] if options[:args].is_a?(Hash)
-          entity.send(method_name, *options[:args])
-        else
-          entity.send(method_name)
-        end
-        if result && options[:save_as]
-          workitem.fields[options[:save_as]] = result
-        end
-        result
-      end
-    end
-  end
-end

data/lib/bumbleworks/participant/error_handler.rb

@@ -1,14 +0,0 @@
-module Bumbleworks
-  module Participant
-    class ErrorHandler < Bumbleworks::Participant::Base
-      def on_workitem
-        return if (error_handlers = Bumbleworks.error_handlers).empty?
-
-        error_handlers.each do |error_handler|
-          error_handler.new(workitem).on_error
-        end
-        reply
-      end
-    end
-  end
-end

data/lib/bumbleworks/participant/local_participant.rb

@@ -1,11 +0,0 @@
-require "ruote/part/local_participant"
-require "bumbleworks/workitem_entity_storage"
-
-module Bumbleworks
-  module Participant
-    module LocalParticipant
-      include ::Ruote::LocalParticipant
-      include WorkitemEntityStorage
-    end
-  end
-end

data/lib/bumbleworks/participant/storage_participant.rb

@@ -1,11 +0,0 @@
-module Bumbleworks
-  module Participant
-    class StorageParticipant < ::Ruote::StorageParticipant
-      def on_workitem
-        return_value = super
-        Bumbleworks::Task.new(self[workitem.sid]).on_dispatch
-        return return_value
-      end
-    end
-  end
-end