ruote 2.3.0.1 → 2.3.0.2

data/lib/ruote/svc/expression_map.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2005-2012, John Mettraux, jmettraux@gmail.com
+# Copyright (c) 2005-2013, John Mettraux, jmettraux@gmail.com
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

data/lib/ruote/svc/participant_list.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2005-2012, John Mettraux, jmettraux@gmail.com
+# Copyright (c) 2005-2013, John Mettraux, jmettraux@gmail.com
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -173,17 +173,18 @@ module Ruote
       pinfo = participant_name.is_a?(String) ?
         lookup_info(participant_name, workitem) : participant_name
 
-      pinfo ?
-        instantiate(pinfo, opts) : nil
+      instantiate(pinfo, opts)
     end
 
-    # Given a participant name, returns
+    # Given a participant name, returns participant details.
     #
     # Returns nil if there is no participant registered that covers the given
     # participant name.
     #
     def lookup_info(pname, workitem)
 
+      return nil unless pname
+
       wi = workitem ?
         Ruote::Workitem.new(workitem.merge('participant_name' => pname)) :
         nil
@@ -205,10 +206,12 @@ module Ruote
       nil
     end
 
-    # Returns an instance of a participant
+    # Returns an instance of a participant.
     #
     def instantiate(pinfo, opts={})
 
+      return nil unless pinfo
+
       pa_class_name, options = pinfo
 
       if rp = options['require_path']

data/lib/ruote/svc/tracker.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2005-2012, John Mettraux, jmettraux@gmail.com
+# Copyright (c) 2005-2013, John Mettraux, jmettraux@gmail.com
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -39,18 +39,109 @@ module Ruote
       @context = context
     end
 
-    # The context calls this method for each successfully processed msg
-    # in the worker.
+    # The worker calls this method via the context before each msg gets
+    # processed.
     #
-    def on_msg(message)
+    def on_pre_msg(msg)
+
+      on_message(true, msg)
+    end
+
+    # The worker calls this method via the context after each successful
+    # msg processing.
+    #
+    def on_msg(msg)
+
+      on_message(false, msg)
+    end
+
+    # Adds a tracker (usually when a 'listen' expression gets applied).
+    #
+    # The tracker_id may be nil (one will then get generated).
+    #
+    # Returns the tracker_id.
+    #
+    def add_tracker(wfid, action, tracker_id, conditions, msg)
+
+      tracker_id ||= [
+        'tracker', wfid, action,
+        Ruote.generate_subid(conditions.hash.to_s + msg.hash.to_s)
+      ].collect(&:to_s).join('_')
+
+      conditions =
+        conditions && conditions.remap { |(k, v), h| h[k] = Array(v) }
+
+      doc = @context.storage.get_trackers
+
+      doc['trackers'][tracker_id] =
+        { 'wfid' => wfid,
+          'action' => action,
+          'id' => tracker_id,
+          'conditions' => conditions,
+          'msg' => msg }
+
+      r = @context.storage.put(doc)
+
+      add_tracker(wfid, action, tracker_id, conditions, msg) if r
+        # the put failed, have to redo the work
+
+      tracker_id
+    end
+
+    # Removes a tracker (usually when a 'listen' expression replies to its
+    # parent expression or is cancelled).
+    #
+    def remove_tracker(fei_sid_or_id, wfid=nil)
+
+      tracker_id =
+        if fei_sid_or_id.is_a?(String)
+          fei_sid_or_id
+        else
+          Ruote.to_storage_id(fei_sid_or_id)
+        end
+
+      remove([ tracker_id ], wfid)
+    end
+
+    protected
+
+    # Removes a set of tracker ids and updated the tracker document.
+    #
+    def remove(tracker_ids, wfid)
+
+      return if tracker_ids.empty?
+
+      doc ||= @context.storage.get_trackers(wfid)
+
+      return if (doc['trackers'].keys & tracker_ids).empty?
+
+      doc['wfid'] = wfid
+        # a little helper for some some storage implementations like ruote-swf
+        # they need to know what workflow execution is targetted.
+
+      tracker_ids.each { |ti| doc['trackers'].delete(ti) }
+      r = @context.storage.put(doc)
+
+      remove(tracker_ids, wfid) if r
+        # the put failed, have to redo the work
+    end
+
+    # The method behind on_pre_msg and on_msg. Filters msgs against trackers.
+    # Triggers trackers if there is a match.
+    #
+    def on_message(pre, message)
 
-      m_error = message['error']
       m_wfid = message['wfid'] || (message['fei']['wfid'] rescue nil)
+      m_error = message['error']
+
       m_action = message['action']
+      m_action = "pre_#{m_action}" if pre
 
       msg = m_action == 'error_intercepted' ? message['msg'] : message
 
-      @context.storage.get_trackers['trackers'].each do |tracker_id, tracker|
+      ids_to_remove = []
+
+      trackers.each do |tracker_id, tracker|
 
         # filter msgs
 
@@ -64,79 +155,84 @@ module Ruote
 
         if tracker_id == 'on_error' || tracker_id == 'on_terminate'
 
-          fields = msg['workitem']['fields']
+          fs = msg['workitem']['fields']
 
-          next if m_action == 'error_intercepted' && fields['__error__']
-          next if m_action == 'terminated' && (fields['__error__'] || fields['__terminate__'])
+          next if m_action == 'error_intercepted' && fs['__error__']
+          next if m_action == 'terminated' && (fs['__error__'] || fs['__terminate__'])
         end
 
-        # prepare and emit/put 'reaction' message
+        # remove the message post-trigger?
 
-        m = Ruote.fulldup(tracker['msg'])
+        ids_to_remove << tracker_id if tracker['msg'].delete('_auto_remove')
 
-        action = m.delete('action')
+        # OK, have to pull the trigger (or alter the message) then
 
-        m['wfid'] = m_wfid if m['wfid'] == 'replace'
-        m['wfid'] ||= @context.wfidgen.generate
-
-        m['workitem'] = msg['workitem'] if m['workitem'] == 'replace'
-
-        if t_action == 'error_intercepted'
-          m['workitem']['fields']['__error__'] = m_error
-        elsif tracker_id == 'on_error' && m_action == 'error_intercepted'
-          m['workitem']['fields']['__error__'] = m_error
-        elsif tracker_id == 'on_terminate' && m_action == 'terminated'
-          m['workitem']['fields']['__terminate__'] = { 'wfid' => m_wfid }
+        if pre && tracker['msg']['_alter']
+          alter(m_wfid, m_error, m_action, msg, tracker)
+        else
+          trigger(m_wfid, m_error, m_action, msg, tracker)
         end
+      end
 
-        if m['variables'] == 'compile'
-          fexp = Ruote::Exp::FlowExpression.fetch(@context, msg['fei'])
-          m['variables'] = fexp ? fexp.compile_variables : {}
-        end
+      remove(ids_to_remove, nil)
+    end
 
-        @context.storage.put_msg(action, m)
+    # Alters the msg, only called in "pre" mode.
+    #
+    def alter(m_wfid, m_error, m_action, msg, tracker)
+
+      case tracker['msg'].delete('_alter')
+        when 'merge' then msg.merge!(tracker['msg'])
+        #else ...
       end
     end
 
-    # Adds a tracker (usually when a 'listen' expression gets applied).
+    # Prepares the message that gets placed on the ruote msg queue.
     #
-    def add_tracker(wfid, action, id, conditions, msg)
+    def trigger(m_wfid, m_error, m_action, msg, tracker)
 
-      conditions =
-        conditions && conditions.remap { |(k, v), h| h[k] = Array(v) }
+      t_action = tracker['action']
+      tracker_id = tracker['id']
 
-      doc = @context.storage.get_trackers
+      m = Ruote.fulldup(tracker['msg'])
 
-      doc['trackers'][id] =
-        { 'wfid' => wfid,
-          'action' => action,
-          'id' => id,
-          'conditions' => conditions,
-          'msg' => msg }
+      action = m.delete('action')
 
-      r = @context.storage.put(doc)
+      m['wfid'] = m_wfid if m['wfid'] == 'replace'
+      m['wfid'] ||= @context.wfidgen.generate
 
-      add_tracker(wfid, action, id, conditions, msg) if r
-        # the put failed, have to redo the work
-    end
+      m['workitem'] = msg['workitem'] if m['workitem'] == 'replace'
 
-    # Removes a tracker (usually when a 'listen' expression replies to its
-    # parent expression or is cancelled).
-    #
-    def remove_tracker(fei, doc=nil)
+      if t_action == 'error_intercepted'
+        m['workitem']['fields']['__error__'] = m_error
+      elsif tracker_id == 'on_error' && m_action == 'error_intercepted'
+        m['workitem']['fields']['__error__'] = m_error
+      elsif tracker_id == 'on_terminate' && m_action == 'terminated'
+        m['workitem']['fields']['__terminate__'] = { 'wfid' => m_wfid }
+      end
 
-      doc ||= @context.storage.get_trackers
+      if m['variables'] == 'compile'
+        fexp = Ruote::Exp::FlowExpression.fetch(@context, msg['fei'])
+        m['variables'] = fexp ? fexp.compile_variables : {}
+      end
 
-      doc['trackers'].delete(Ruote.to_storage_id(fei))
+      @context.storage.put_msg(action, m)
+    end
 
-      r = @context.storage.put(doc)
+    # Returns the trackers currently registered.
+    #
+    # Note: this is called from on_pre_msg and on_msg, hence two times
+    # for a single msg. We trust the storage implementation to cache it
+    # for us.
+    #
+    def trackers
 
-      remove_tracker(fei, r) if r
-        # the put failed, have to redo the work
+      @context.storage.get_trackers['trackers']
     end
 
-    protected
-
+    # Given a msg and a hash of conditions, returns true if the msg
+    # matches the conditions.
+    #
     def does_match?(msg, conditions)
 
       return true unless conditions
@@ -151,12 +247,14 @@ module Ruote
           vv = Ruote.regex_or_s(vv)
 
           val = case k
+
             when 'class' then msg['error']['class']
             when 'message' then msg['error']['message']
-            else msg[k]
+
+            else Ruote.lookup(msg, k)
           end
 
-          val && (vv.is_a?(String) ? (vv == val) : vv.match(val))
+          val && (vv.is_a?(Regexp) ? vv.match(val) : vv == val)
         end
       end
 

data/lib/ruote/svc/treechecker.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2005-2012, John Mettraux, jmettraux@gmail.com
+# Copyright (c) 2005-2013, John Mettraux, jmettraux@gmail.com
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

data/lib/ruote/tree_dot.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2005-2012, John Mettraux, jmettraux@gmail.com
+# Copyright (c) 2005-2013, John Mettraux, jmettraux@gmail.com
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

data/lib/ruote/util/deep.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2005-2012, John Mettraux, jmettraux@gmail.com
+# Copyright (c) 2005-2013, John Mettraux, jmettraux@gmail.com
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -111,6 +111,7 @@ module Ruote
         # ensure that all keys are strings
 
         unless k.is_a?(String)
+
           coll.delete(k)
           k = k.to_s
           coll[k] = v
@@ -125,8 +126,9 @@ module Ruote
           else
             block.call(coll, k, v)
           end
+        end
 
-        elsif v.is_a?(Array) || v.is_a?(Hash)
+        if v.is_a?(Array) || v.is_a?(Hash)
 
           deep_mutate(v, keys, coll, &block)
         end

data/lib/ruote/util/filter.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2005-2012, John Mettraux, jmettraux@gmail.com
+# Copyright (c) 2005-2013, John Mettraux, jmettraux@gmail.com
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

data/lib/ruote/util/hashdot.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2005-2012, John Mettraux, jmettraux@gmail.com
+# Copyright (c) 2005-2013, John Mettraux, jmettraux@gmail.com
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

data/lib/ruote/util/look.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2005-2012, John Mettraux, jmettraux@gmail.com
+# Copyright (c) 2005-2013, John Mettraux, jmettraux@gmail.com
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

data/lib/ruote/util/lookup.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2005-2012, John Mettraux, jmettraux@gmail.com
+# Copyright (c) 2005-2013, John Mettraux, jmettraux@gmail.com
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

data/lib/ruote/util/misc.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2005-2012, John Mettraux, jmettraux@gmail.com
+# Copyright (c) 2005-2013, John Mettraux, jmettraux@gmail.com
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -200,5 +200,55 @@ module Ruote
 
     o.is_a?(Array) ? o : o.to_s.split(/\s*,\s*/).collect { |e| e.strip }
   end
+
+  # A bit like #inspect but produces a tighter output (ambiguous to machines).
+  #
+  def self.insp(o, opts={})
+
+    case o
+      when nil
+        'nil'
+      when Hash
+        trim = opts[:trim] || []
+        '{' +
+        o.reject { |k, v|
+          v.nil? && trim.include?(k.to_s)
+        }.collect { |k, v|
+          "#{k}: #{insp(v)}"
+        }.join(', ') +
+        '}'
+      when Array
+        '[' + o.collect { |e| insp(e) }.join(', ') + ']'
+      when String
+        o.match(/\s/) ? o.inspect : o
+      else
+        o.inspect
+    end
+  end
+
+  def self.pps(o, w=79)
+
+    PP.pp(o, StringIO.new, w).string
+  end
+
+  #--
+  # [de]camelize
+  #++
+
+  # Our own quick camelize implementation (no need to require active support).
+  #
+  def self.camelize(s, first_up=false)
+
+    s = s.capitalize if first_up
+
+    s.gsub(/(_.)/) { |x| x[1, 1].upcase }
+  end
+
+  # Quick decamelize implementation.
+  #
+  def self.decamelize(s)
+
+    s.gsub(/(.)([A-Z])/, '\1_\2').downcase
+  end
 end