using sourcify for BlockParticipant - step 1

motivation : http://groups.google.com/group/openwferu-users/browse_thread/thread/5cb41f958d91308b

step 2 is running a security check on the code befare evaluation.

TODO.txt

@@ -459,5 +459,12 @@
     launch a process with a designed 'supervisor' ?
 
 [ ] ci : ruote-amqp
+[ ] ci : ruote-mongodb
 [ ] ci : jruby
 
+[ ] StorageParticipant#reply : raise if workitem not found ?
+[ ] StorageParticipant#reply : accept fei ?
+
+[ ] eft_18 weak with jruby-1.5.1
+
+

lib/ruote/engine.rb

@@ -521,14 +521,18 @@ def load_definition (path)
     # containing the participant implementation. 'require' will load and eval
     # the ruby code only once, 'load' each time.
     #
-    def register_participant (regex, participant=nil, opts={}, &block)
+    def register_participant (regex, participant=nil, opts=nil, &block)
+
+      if participant.is_a?(Hash)
+        opts = participant
+        participant = nil
+      end
+
+      opts ||= {}
 
       pa = @context.plist.register(regex, participant, opts, block)
 
-      @context.storage.put_msg(
-        'participant_registered',
-        'regex' => regex.to_s,
-        'engine_worker_only' => (pa != nil))
+      @context.storage.put_msg('participant_registered', 'regex' => regex.to_s)
 
       pa
     end

lib/ruote/exp/fe_participant.rb

@@ -167,8 +167,7 @@ def apply
         'fei' => h.fei,
         'participant_name' => h.participant_name,
         'participant' => h.participant,
-        'workitem' => h.applied_workitem,
-        'for_engine_worker?' => (participant_info.class != Array))
+        'workitem' => h.applied_workitem)
     end
 
     def cancel (flavour)

lib/ruote/part/block_participant.rb

@@ -67,28 +67,39 @@ class BlockParticipant
     include LocalParticipant
 
     attr_accessor :context
-    attr_accessor :do_not_thread
 
-    def initialize (block, opts)
+    def initialize (opts)
 
       @opts = opts
-      @block = block
-      @do_not_thread = false
+    end
+
+    def do_not_thread
+
+      @opts['do_not_thread']
     end
 
     def consume (workitem)
 
-      r = if @block.arity == 1
+      block = @opts['block']
+
+      #block = eval(block, @context.send(:binding))
+        # doesn't work with ruby 1.9.2-p136
+
+      block = eval(block, @context.instance_eval { binding })
+        # works OK with ruby 1.8.7-249 and 1.9.2-p136
+
+      # TODO : security !!
+
+      r = if block.arity == 1
 
-        @block.call(workitem)
+        block.call(workitem)
       else
 
-        @block.call(
+        block.call(
           workitem, Ruote::Exp::FlowExpression.fetch(@context, workitem.h.fei))
       end
 
       if r != nil && r != workitem
-        #workitem.result = r
         workitem.result = (Rufus::Json.dup(r) rescue nil)
       end
 

lib/ruote/part/storage_participant.rb

@@ -119,6 +119,9 @@ def fetch (fei)
 
     # Removes the workitem from the in-memory hash and replies to the engine.
     #
+    # TODO : should it raise if the workitem can't be found ?
+    # TODO : should it accept just the fei ?
+    #
     def reply (workitem)
 
       # TODO: change method name (receiver mess cleanup)
@@ -287,6 +290,23 @@ def self.matches? (hwi, pname, criteria)
       true
     end
 
+    # Mostly a test method. Returns a Hash were keys are participant names
+    # and values are lists of workitems.
+    #
+    def per_participant
+
+      inject({}) { |h, wi| (h[wi.participant_name] ||= []) << wi; h }
+    end
+
+    # Mostly a test method. Returns a Hash were keys are participant names
+    # and values are integers, the count of workitems for a given participant
+    # name.
+    #
+    def per_participant_count
+
+      per_participant.inject({}) { |h, (k, v)| h[k] = v.size; h }
+    end
+
     protected
 
     # Fetches all the workitems. If there is a @store_name, will only fetch

lib/ruote/participant.rb

@@ -1,5 +1,4 @@
 
-require 'ruote/part/hash_participant'
 require 'ruote/part/storage_participant'
 require 'ruote/part/no_op_participant'
 require 'ruote/part/null_participant'

lib/ruote/storage/hash_storage.rb

@@ -111,16 +111,11 @@ def delete (doc)
 
         doc['_rev'] ||= 0
 
-        if prev['_rev'] == drev
+        return prev if prev['_rev'] != drev
 
-          @h[doc['type']].delete(doc['_id'])
+        @h[doc['type']].delete(doc['_id'])
 
-          nil
-
-        else
-
-          prev
-        end
+        nil # success
       end
     end