bumbleworks 0.0.29 → 0.0.30

data/lib/bumbleworks.rb

@@ -121,19 +121,19 @@ module Bumbleworks
     # sending it, so it can be properly stored in workitem fields (and
     # re-instantiated later).
     #
-    def launch!(process_definition_name, options = {})
-      extract_entity_from_options!(options)
-      Bumbleworks::Ruote.launch(process_definition_name, options)
+    def launch!(process_definition_name, *args)
+      extract_entity_from_fields!(args.first || {})
+      Bumbleworks::Ruote.launch(process_definition_name, *args)
     end
 
   private
 
-    def extract_entity_from_options!(options)
+    def extract_entity_from_fields!(fields)
       begin
-        if entity = options.delete(:entity)
-          options[:entity_id] = entity.respond_to?(:identifier) ? entity.identifier : entity.id
-          options[:entity_type] = entity.class.name
-          raise InvalidEntity, "Entity#id must be non-null" unless options[:entity_id]
+        if entity = fields.delete(:entity)
+          fields[:entity_id] = entity.respond_to?(:identifier) ? entity.identifier : entity.id
+          fields[:entity_type] = entity.class.name
+          raise InvalidEntity, "Entity#id must be non-null" unless fields[:entity_id]
         end
       rescue NoMethodError => e
         raise InvalidEntity, "Entity must respond to #id and #class.name"

data/lib/bumbleworks/ruote.rb

@@ -1,5 +1,7 @@
 require "ruote"
 
+Dir[File.join(File.dirname(__FILE__), 'ruote', 'exp', '*.rb')].each { |f| require f }
+
 module Bumbleworks
   class Ruote
     class CancelTimeout < StandardError; end
@@ -41,6 +43,7 @@ module Bumbleworks
       end
 
       def launch(name, *args)
+        set_catchall_if_needed
         dashboard.launch(dashboard.variables[name], *args)
       end
 

data/lib/bumbleworks/ruote/exp/broadcast_event_expression.rb

@@ -0,0 +1,17 @@
+require 'ruote/exp/flow_expression'
+
+module Ruote::Exp
+  class BroadcastEventExpression < FlowExpression
+    names :broadcast_event
+
+    def consider_tag
+      update_tree
+      h.updated_tree[1]['tag'] = attribute_text.to_s
+      super
+    end
+
+    def apply
+      reply_to_parent(h.applied_workitem)
+    end
+  end
+end

data/lib/bumbleworks/ruote/exp/wait_for_event_expression.rb

@@ -0,0 +1,31 @@
+require 'ruote/exp/flow_expression'
+require 'ruote/exp/fe_await'
+
+module Ruote::Exp
+  class WaitForEventExpression < AwaitExpression
+    names :wait_for_event
+
+    def apply
+      update_tree
+      h.updated_tree[1]['global'] = true
+      h.updated_tree[1]['left_tag'] = attribute_text.to_s
+      h.updated_tree[1]['merge'] = 'drop'
+      super
+    end
+
+    def reply(workitem)
+      update_tree
+      if translated_where = attribute(:where, nil, :escape => true)
+        if translated_where.to_s == 'entities_match'
+          translated_where = '${f:entity_id} == ${f:receiver.entity_id} && ${f:entity_type} == ${f:receiver.entity_type}'
+        else
+          translated_where.gsub!('${event:', '${f:')
+          translated_where.gsub!('${this:', '${f:receiver.')
+        end
+        h.updated_tree[1]['where'] = translated_where
+      end
+      workitem['fields']['receiver'] = h.applied_workitem['fields']
+      super
+    end
+  end
+end

data/lib/bumbleworks/version.rb

@@ -1,3 +1,3 @@
 module Bumbleworks
-  VERSION = "0.0.29"
+  VERSION = "0.0.30"
 end

data/spec/lib/bumbleworks/ruote/exp/broadcast_event_expression_spec.rb

@@ -0,0 +1,24 @@
+describe Ruote::Exp::BroadcastEventExpression do
+  before :each do
+    Bumbleworks.reset!
+    Bumbleworks.storage = {}
+    Bumbleworks.start_worker!
+    Bumbleworks.dashboard.add_service('tracer', @tracer = Tracer.new)
+  end
+
+  it 'uses attribute text as tag' do
+    Bumbleworks.define_process 'waiter' do
+      await :left_tag => :the_event, :global => true
+      echo 'amazing'
+    end
+
+    Bumbleworks.define_process 'sender' do
+      broadcast_event :the_event
+    end
+
+    waiter = Bumbleworks.launch!('waiter')
+    sender = Bumbleworks.launch!('sender')
+    Bumbleworks.dashboard.wait_for(waiter)
+    @tracer.should == ['amazing']
+  end
+end

data/spec/lib/bumbleworks/ruote/exp/wait_for_event_expression_spec.rb

@@ -0,0 +1,79 @@
+describe Ruote::Exp::WaitForEventExpression do
+  before :each do
+    Bumbleworks.reset!
+    Bumbleworks.storage = {}
+    Bumbleworks.start_worker!
+    Bumbleworks.dashboard.add_service('tracer', @tracer = Tracer.new)
+  end
+
+  it 'waits for event' do
+    Bumbleworks.define_process 'waiter' do
+      concurrence :wait_for => 2 do
+        sequence do
+          wait_for_event :nothing_ever_happens_to_me
+          echo 'nothing'
+        end
+        sequence do
+          wait_for_event :yay_it_happened
+          echo 'yay'
+        end
+        sequence do
+          wait_for_event /^yay/
+          noop
+          echo 'yay2'
+        end
+      end
+    end
+
+    Bumbleworks.define_process 'sender' do
+      echo 'get ready', :tag => 'not yet'
+      echo 'oh my gosh almost there'
+      echo 'hello', :tag => 'yay_it_happened'
+    end
+
+    waiter = Bumbleworks.launch!('waiter')
+    sender = Bumbleworks.launch!('sender')
+    Bumbleworks.dashboard.wait_for(waiter)
+    @tracer.should == ['get ready', 'oh my gosh almost there', 'hello', 'yay', 'yay2']
+  end
+
+  it 'checks where clause' do
+    Bumbleworks.define_process 'waiter' do
+      wait_for_event :the_event, :where => '${this:special} == ${event:special}'
+      echo 'specials! ${f:special}'
+    end
+
+    Bumbleworks.define_process 'sender' do
+      noop :tag => 'the_event'
+    end
+
+    waiter1 = Bumbleworks.launch!('waiter', 'special' => 1)
+    waiter2 = Bumbleworks.launch!('waiter', 'special' => 2)
+    waiter3 = Bumbleworks.launch!('waiter', 'special' => 3)
+    sender1 = Bumbleworks.launch!('sender', 'not_special' => 1)
+    sender2 = Bumbleworks.launch!('sender', 'special' => 3)
+
+    Bumbleworks.dashboard.wait_for(waiter3)
+    @tracer.should == ['specials! 3']
+  end
+
+  it 'checks entity match' do
+    Bumbleworks.define_process 'waiter' do
+      wait_for_event :the_event, :where => :entities_match
+      echo 'entities! ${f:entity_type},${f:entity_id}'
+    end
+
+    Bumbleworks.define_process 'sender' do
+      noop :tag => 'the_event'
+    end
+
+    waiter1 = Bumbleworks.launch!('waiter', 'entity_type' => 'Pigeon', 'entity_id' => 1)
+    waiter2 = Bumbleworks.launch!('waiter', 'entity_type' => 'Rhubarb', 'entity_id' => 2)
+    waiter3 = Bumbleworks.launch!('waiter', 'entity_type' => 'Rhubarb', 'entity_id' => 1)
+    sender1 = Bumbleworks.launch!('sender', 'entity_type' => 'Pigeon', 'entity_id' => 2)
+    sender2 = Bumbleworks.launch!('sender', 'entity_type' => 'Rhubarb', 'entity_id' => 1)
+
+    Bumbleworks.dashboard.wait_for(waiter3)
+    @tracer.should == ['entities! Rhubarb,1']
+  end
+end

data/spec/lib/bumbleworks/ruote_spec.rb

@@ -1,11 +1,11 @@
 describe Bumbleworks::Ruote do
   before :each do
     Bumbleworks.reset!
+    Bumbleworks.storage = {}
   end
 
   describe ".cancel_all_processes!" do
     before :each do
-      Bumbleworks.storage = {}
       Bumbleworks::Ruote.register_participants
       Bumbleworks.start_worker!
     end
@@ -43,7 +43,6 @@ describe Bumbleworks::Ruote do
 
   describe ".kill_all_processes!" do
     before :each do
-      Bumbleworks.storage = {}
       Bumbleworks::Ruote.register_participants
       Bumbleworks.start_worker!
     end
@@ -83,24 +82,20 @@ describe Bumbleworks::Ruote do
     end
 
     it 'creates a new dashboard' do
-      Bumbleworks.storage = {}
       described_class.dashboard.should be_an_instance_of(Ruote::Dashboard)
     end
 
     it 'does not start a worker by default' do
-      Bumbleworks.storage = {}
       described_class.dashboard.worker.should be_nil
     end
 
     it 'starts a worker if :start_worker option is true' do
-      Bumbleworks.storage = {}
       described_class.dashboard(:start_worker => true).worker.should_not be_nil
     end
   end
 
   describe '.start_worker!' do
     it 'adds new worker to dashboard and returns worker' do
-      Bumbleworks.storage = {}
       described_class.dashboard.worker.should be_nil
       new_worker = described_class.start_worker!
       new_worker.should be_an_instance_of(Ruote::Worker)
@@ -108,7 +103,6 @@ describe Bumbleworks::Ruote do
     end
 
     it 'joins current thread if :join option is true' do
-      Bumbleworks.storage = {}
       ::Ruote::Dashboard.stub(:new).and_return(dash_double = double('dash', :worker => nil))
       dash_double.should_receive(:noisy=).with(false)
       dash_double.should_receive(:join)
@@ -116,7 +110,6 @@ describe Bumbleworks::Ruote do
     end
 
     it 'returns if :join option not true' do
-      Bumbleworks.storage = {}
       ::Ruote::Dashboard.stub(:new).and_return(dash_double = double('dash', :worker => nil))
       dash_double.should_receive(:noisy=).with(false)
       dash_double.should_receive(:join).never
@@ -124,7 +117,6 @@ describe Bumbleworks::Ruote do
     end
 
     it 'sets dashboard to noisy if :verbose option true' do
-      Bumbleworks.storage = {}
       ::Ruote::Dashboard.stub(:new).and_return(dash_double = double('dash', :worker => nil))
       dash_double.should_receive(:noisy=).with(true)
       described_class.start_worker!(:verbose => true)
@@ -139,7 +131,6 @@ describe Bumbleworks::Ruote do
         catchall 'NewCatchall'
       }
 
-      Bumbleworks.storage = {}
       described_class.dashboard.participant_list.should be_empty
       described_class.register_participants &registration_block
       described_class.dashboard.participant_list.should have(4).items
@@ -152,7 +143,6 @@ describe Bumbleworks::Ruote do
         catchall
       }
 
-      Bumbleworks.storage = {}
       described_class.dashboard.participant_list.should be_empty
       described_class.register_participants &registration_block
       described_class.dashboard.participant_list.should have(2).items
@@ -160,7 +150,6 @@ describe Bumbleworks::Ruote do
     end
 
     it 'adds catchall participant if block is nil' do
-      Bumbleworks.storage = {}
       described_class.dashboard.participant_list.should be_empty
       described_class.register_participants &nil
       described_class.dashboard.participant_list.should have(1).item
@@ -170,6 +159,7 @@ describe Bumbleworks::Ruote do
 
   describe '.storage' do
     it 'raise error when storage is not defined' do
+      Bumbleworks.storage = nil
       expect { described_class.send(:storage) }.to raise_error Bumbleworks::UndefinedSetting
     end
 
@@ -180,4 +170,22 @@ describe Bumbleworks::Ruote do
       described_class.send(:storage)
     end
   end
+
+  describe '.launch' do
+    before :each do
+      @pdef = Bumbleworks.define_process 'foo' do; end
+    end
+
+    it 'tells dashboard to launch process' do
+      described_class.dashboard.should_receive(:launch).with(@pdef.tree, 'variable' => 'neat')
+      described_class.launch('foo', 'variable' => 'neat')
+    end
+
+    it 'sets catchall if needed' 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::StorageParticipant'
+    end
+  end
 end

data/spec/lib/bumbleworks/task_spec.rb

@@ -403,7 +403,7 @@ describe Bumbleworks::Task do
       end
 
       it 'does not raise an error if attempting to claim by same token' do
-        expect{@task.claim('boss')}.not_to raise_error described_class::AlreadyClaimed
+        expect{@task.claim('boss')}.not_to raise_error
       end
 
       it 'calls before_claim and after_claim callbacks' do

data/spec/lib/bumbleworks_spec.rb

@@ -142,9 +142,14 @@ describe Bumbleworks do
       Bumbleworks.launch!(:amazing_process, :hugs => :love)
     end
 
+    it 'sends all args along' do
+      Bumbleworks::Ruote.should_receive(:launch).with(:amazing_process, { :hugs => :love }, { :whiny => :yup }, :peahen)
+      Bumbleworks.launch!(:amazing_process, { :hugs => :love }, { :whiny => :yup }, :peahen)
+    end
+
     it 'expands entity params when entity object provided' do
-      Bumbleworks::Ruote.should_receive(:launch).with(:amazing_process, :entity_id => :wiley_e_coyote, :entity_type => 'LovelyEntity')
-      Bumbleworks.launch!(:amazing_process, :entity => LovelyEntity.new(:wiley_e_coyote))
+      Bumbleworks::Ruote.should_receive(:launch).with(:amazing_process, { :entity_id => :wiley_e_coyote, :entity_type => 'LovelyEntity' }, :et_cetera)
+      Bumbleworks.launch!(:amazing_process, { :entity => LovelyEntity.new(:wiley_e_coyote) }, :et_cetera)
     end
 
     it 'uses "identifier" method instead of id, if entity has one' do

data/spec/support/tracer.rb

@@ -0,0 +1,14 @@
+class Tracer
+  def initialize
+    @trace = []
+  end
+
+  def << s
+    s.strip! if s.is_a?(String)
+    @trace << s
+  end
+
+  def == other
+    @trace == other
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bumbleworks
 version: !ruby/object:Gem::Version
-  version: 0.0.29
+  version: 0.0.30
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-24 00:00:00.000000000 Z
+date: 2013-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruote
@@ -173,6 +173,8 @@ files:
 - lib/bumbleworks/process_definition.rb
 - lib/bumbleworks/rake_tasks.rb
 - lib/bumbleworks/ruote.rb
+- lib/bumbleworks/ruote/exp/broadcast_event_expression.rb
+- lib/bumbleworks/ruote/exp/wait_for_event_expression.rb
 - lib/bumbleworks/simple_logger.rb
 - lib/bumbleworks/storage_adapter.rb
 - lib/bumbleworks/storage_participant.rb
@@ -205,6 +207,8 @@ files:
 - spec/lib/bumbleworks/local_participant_spec.rb
 - spec/lib/bumbleworks/participant_registration_spec.rb
 - spec/lib/bumbleworks/process_definition_spec.rb
+- spec/lib/bumbleworks/ruote/exp/broadcast_event_expression_spec.rb
+- spec/lib/bumbleworks/ruote/exp/wait_for_event_expression_spec.rb
 - spec/lib/bumbleworks/ruote_spec.rb
 - spec/lib/bumbleworks/simple_logger_spec.rb
 - spec/lib/bumbleworks/storage_adapter_spec.rb
@@ -215,6 +219,7 @@ files:
 - spec/lib/bumbleworks_spec.rb
 - spec/spec_helper.rb
 - spec/support/path_helpers.rb
+- spec/support/tracer.rb
 homepage: ''
 licenses:
 - MIT
@@ -262,6 +267,8 @@ test_files:
 - spec/lib/bumbleworks/local_participant_spec.rb
 - spec/lib/bumbleworks/participant_registration_spec.rb
 - spec/lib/bumbleworks/process_definition_spec.rb
+- spec/lib/bumbleworks/ruote/exp/broadcast_event_expression_spec.rb
+- spec/lib/bumbleworks/ruote/exp/wait_for_event_expression_spec.rb
 - spec/lib/bumbleworks/ruote_spec.rb
 - spec/lib/bumbleworks/simple_logger_spec.rb
 - spec/lib/bumbleworks/storage_adapter_spec.rb
@@ -272,4 +279,5 @@ test_files:
 - spec/lib/bumbleworks_spec.rb
 - spec/spec_helper.rb
 - spec/support/path_helpers.rb
+- spec/support/tracer.rb
 has_rdoc: