bumbleworks 0.0.38 → 0.0.39

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

@@ -32,19 +32,20 @@ module Ruote::Exp
         if translated_where.to_s == 'entities_match'
           # Check to see that the event's entity is equal to the current workitem's
           # entity.  If so, this message is intended for us.
-          translated_where = '${f:entity_id} == ${f:receiver.entity_id} && ${f:entity_type} == ${f:receiver.entity_type}'
+          translated_where = '${"f:entity_id} == ${"f:receiver.entity_id} && ${"f:entity_type} == ${"f:receiver.entity_type}'
         else
           # This just gives us a shortcut so the process definition reads more
           # clearly.  You could always use "${f:" and "${f:receiver." in your
           # where clauses, but you have to remember that the former refers to the
           # incoming event's workitem, and the latter is the workitem of the
           # listening process.
-          translated_where.gsub!('${event:', '${f:') # event workitem
-          translated_where.gsub!('${this:', '${f:receiver.') # listening workitem
+          translated_where.gsub!(/\$\{(['"]?)event:/, '${\1f:') # event workitem
+          translated_where.gsub!(/\$\{(['"]?)this:/, '${\1f:receiver.') # listening workitem
         end
         h.updated_tree[1]['where'] = translated_where
       end
       workitem['fields']['receiver'] = h.applied_workitem['fields']
+      debugger
       super
     end
   end

data/lib/bumbleworks/version.rb

@@ -1,3 +1,3 @@
 module Bumbleworks
-  VERSION = "0.0.38"
+  VERSION = "0.0.39"
 end

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

@@ -67,13 +67,13 @@ describe Ruote::Exp::WaitForEventExpression 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)
+    waiter1 = Bumbleworks.launch!('waiter', 'entity_type' => 'Pigeon', 'entity_id' => '43-4boof')
+    waiter2 = Bumbleworks.launch!('waiter', 'entity_type' => 'Rhubarb', 'entity_id' => '13-6zoop')
+    waiter3 = Bumbleworks.launch!('waiter', 'entity_type' => 'Rhubarb', 'entity_id' => 'spitpickle-4boof')
+    sender1 = Bumbleworks.launch!('sender', 'entity_type' => 'Pigeon', 'entity_id' => '13-6zoop')
+    sender2 = Bumbleworks.launch!('sender', 'entity_type' => 'Rhubarb', 'entity_id' => 'spitpickle-4boof')
 
     Bumbleworks.dashboard.wait_for(waiter3)
-    @tracer.should == ['entities! Rhubarb,1']
+    @tracer.should == ['entities! Rhubarb,spitpickle-4boof']
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bumbleworks
 version: !ruby/object:Gem::Version
-  version: 0.0.38
+  version: 0.0.39
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-30 00:00:00.000000000 Z
+date: 2013-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruote
@@ -236,7 +236,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3293207862533626848
+      hash: 513384040334392804
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -245,7 +245,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3293207862533626848
+      hash: 513384040334392804
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23