openwferu 0.9.16 → 0.9.17

data/lib/openwfe/expressions/fe_sleep.rb

@@ -1,6 +1,6 @@
 #
 #--
-# Copyright (c) 2006-2007, John Mettraux, OpenWFE.org
+# Copyright (c) 2006-2008, John Mettraux, OpenWFE.org
 # All rights reserved.
 # 
 # Redistribution and use in source and binary forms, with or without 
@@ -37,15 +37,10 @@
 # John Mettraux at openwfe.org
 #
 
-require 'openwfe/util/otime'
-require 'openwfe/util/scheduler'
+require 'rufus/otime'
 require 'openwfe/expressions/time'
 
 
-#
-# just the 'sleep' expression
-#
-
 module OpenWFE
 
     #
@@ -60,12 +55,26 @@ module OpenWFE
     # will wait for 10 minutes and 12 seconds before sending a workitem
     # to participant 'alpha'.
     #
+    # In a Ruby process definition, that might look like :
+    #
+    #     sleep :for => "3m"
+    #     sleep "3m"
+    #         #
+    #         # both meaning 'sleep for 3 minutes'
+    #
+    #     sleep :until => "Mon Dec 03 10:41:58 +0900 2007"
+    #         #
+    #         # sleep until the given point in time
+    #
+    # If the 'until' attribute points to a time in the past, the sleep
+    # expression will simply let the process resume.
+    # 
+    #
     class SleepExpression < TimeExpression
 
         names :sleep
 
-        attr_accessor \
-            :awakening_time
+        attr_accessor :awakening_time
 
         def apply (workitem)
 
@@ -81,19 +90,20 @@ module OpenWFE
             tuntil = nil
 
             if suntil
+
                 tuntil = suntil
+
             elsif sfor
-                tfor = OpenWFE::parse_time_string(sfor)
+
+                tfor = Rufus::parse_time_string(sfor)
                 #ldebug { "apply() tfor is '#{tfor}'" }
                 tuntil = Time.new.to_f + tfor
             end
 
             #ldebug { "apply() tuntil is '#{tuntil}'" }
 
-            if not tuntil
-                reply_to_parent(workitem)
-                return
-            end
+            return reply_to_parent(workitem) \
+                if not tuntil
 
             @awakening_time = tuntil
             @applied_workitem = workitem.dup
@@ -131,7 +141,7 @@ module OpenWFE
             ldebug do 
                 "[re]schedule() " + 
                 "will sleep until '#{@awakening_time}' " +
-                "(#{OpenWFE::to_iso8601_date(@awakening_time)})"
+                "(#{Rufus::to_iso8601_date(@awakening_time)})"
             end
 
             @scheduler_job_id = "sleep_#{self.fei.to_s}"

data/lib/openwfe/expressions/fe_subprocess.rb

@@ -1,6 +1,6 @@
 #
 #--
-# Copyright (c) 2006-2007, John Mettraux, OpenWFE.org
+# Copyright (c) 2006-2008, John Mettraux, OpenWFE.org
 # All rights reserved.
 # 
 # Redistribution and use in source and binary forms, with or without 
@@ -140,7 +140,7 @@ module OpenWFE
             #puts " ... values are #{params.values.join(', ')}"
 
             sub_fei = get_expression_pool.launch_template(
-                requester, get_next_sub_id, template, workitem, params)
+                requester, nil, get_next_sub_id, template, workitem, params)
 
             if forget
                 reply_to_parent(workitem.dup) 

data/lib/openwfe/expressions/fe_wait.rb

@@ -37,7 +37,8 @@
 # John Mettraux at openwfe.org
 #
 
-require 'openwfe/expressions/time'
+#require 'openwfe/expressions/time'
+require 'openwfe/expressions/fe_when'
 
 
 module OpenWFE
@@ -64,7 +65,7 @@ module OpenWFE
     # expressed directly in Ruby evaluates to true.
     #
     # 'wait' is different than 'when' : when it times out (if a timeout is set,
-    # the block ceases and the flow resumes. On a timeout, 'when' will not
+    # the wait ceases and the flow resumes. On a timeout, 'when' will not
     # execute its nested 'consequence' child.
     #
     class WaitExpression < WaitingExpression

data/lib/openwfe/expressions/fe_when.rb

@@ -1,6 +1,6 @@
 #
 #--
-# Copyright (c) 2006-2007, John Mettraux, OpenWFE.org
+# Copyright (c) 2006-2008, John Mettraux, OpenWFE.org
 # All rights reserved.
 # 
 # Redistribution and use in source and binary forms, with or without 
@@ -38,8 +38,6 @@
 #
 
 require 'openwfe/utils'
-require 'openwfe/util/otime'
-require 'openwfe/util/scheduler'
 require 'openwfe/expressions/time'
 require 'openwfe/expressions/timeout'
 require 'openwfe/expressions/condition'
@@ -102,14 +100,10 @@ module OpenWFE
             :consequence_triggered,
             :condition_sub_id
 
-        DEFAULT_FREQUENCY = "10s"
-
         def apply (workitem)
 
-            if @children.size < 1
-                reply_to_parent workitem
-                return
-            end
+            return reply_to_parent(workitem) \
+                if @children.size < 1
 
             @condition_sub_id = -1
             @consequence_triggered = false
@@ -123,10 +117,8 @@ module OpenWFE
             #    "reply() @consequence_triggered is '#{@consequence_triggered}'"
             #end
 
-            if @consequence_triggered
-                reply_to_parent(workitem)
-                return
-            end
+            return reply_to_parent(workitem) \
+                if @consequence_triggered
 
             super workitem
         end
@@ -137,12 +129,12 @@ module OpenWFE
 
                 @consequence_triggered = true
 
-                store_itself()
+                store_itself
 
                 i = 1
                 i = 0 if @children.size == 1
 
-                get_expression_pool.apply(@children[i], workitem)
+                get_expression_pool.apply @children[i], workitem
             end
     end
 

data/lib/openwfe/expressions/flowexpression.rb

@@ -1,6 +1,6 @@
 #
 #--
-# Copyright (c) 2006-2007, John Mettraux, OpenWFE.org
+# Copyright (c) 2006-2008, John Mettraux, OpenWFE.org
 # All rights reserved.
 # 
 # Redistribution and use in source and binary forms, with or without 
@@ -111,32 +111,46 @@ module OpenWFE
         #
         attr_accessor :apply_time 
 
+        #
+        # Used by raw expressions to store the not yet interpreted branches
+        # of a process, used by other expressions to store their
+        # representation at 'eval time'.
+        #
+        attr_accessor :raw_representation
+
 
-        def initialize (fei, parent_id, env_id, app_context, attributes)
+        #
+        # The classical no-params constructors.
+        #
+        def initialize
 
-            super()
+            super
                 #
                 # very necessary as this class includes the MonitorMixin
+        end
 
-            @fei = fei
-            @parent_id = parent_id
-            @environment_id = env_id
-            @application_context = app_context
-            @attributes = attributes
+        #
+        # Builds a new instance of an expression
+        #
+        def self.new_exp (fei, parent_id, env_id, app_context, attributes)
 
-            @children = []
+            e = self.new
 
-            @apply_time = nil
+            e.fei = fei
+            e.parent_id = parent_id
+            e.environment_id = env_id
+            e.application_context = app_context
+            e.attributes = attributes
 
-            #ldebug do
-            #    "initialize()\n"+
-            #    "self   : #{@fei}\n"+
-            #    "parent : #{@parent_id}"
-            #end
+            e.children = []
+            e.apply_time = nil
+
+            e
         end
 
-        #
+        #--
         # the two most important methods for flow expressions
+        #++
 
         #
         # this default implementation immediately replies to the
@@ -153,7 +167,7 @@ module OpenWFE
         #
         def reply (workitem)
 
-            reply_to_parent(workitem)
+            reply_to_parent workitem
         end
 
         #
@@ -164,7 +178,7 @@ module OpenWFE
         #
         def reply_to_parent (workitem)
 
-            get_expression_pool.reply_to_parent(self, workitem)
+            get_expression_pool.reply_to_parent self, workitem
         end
 
         #
@@ -182,8 +196,8 @@ module OpenWFE
 
                 next if child.kind_of?(String)
 
-                i = get_expression_pool().cancel(child)
-                inflowitem = i unless inflowitem
+                i = get_expression_pool.cancel child
+                inflowitem ||= i
             end
 
             inflowitem
@@ -214,6 +228,7 @@ module OpenWFE
 
             ldebug { "store_itself() for  #{@fei.to_debug_s}" }
             #ldebug { "store_itself() \n#{OpenWFE::caller_to_s(0, 6)}" }
+
             get_expression_pool.update self
         end
 
@@ -225,13 +240,7 @@ module OpenWFE
         #
         def get_environment
 
-            #return nil if not @environment_id
-            #env, fei = get_expression_pool().fetch(@environment_id)
-            #env
-
-            env = fetch_environment
-            env = get_expression_pool.fetch_engine_environment unless env
-            env
+            fetch_environment || get_expression_pool.fetch_engine_environment
         end
 
         #
@@ -257,7 +266,7 @@ module OpenWFE
         # Just fetches the environment for this expression.
         #
         def fetch_environment
-            
+
             get_expression_pool.fetch_expression @environment_id
         end
 
@@ -287,7 +296,7 @@ module OpenWFE
             #    "   env  #{vi.to_debug_s}"
             #end
 
-            ei == vi
+            (ei == vi)
         end
 
         #
@@ -295,7 +304,7 @@ module OpenWFE
         #
         def paused?
 
-            lookup_variable(VAR_PAUSED) == true
+            (lookup_variable(VAR_PAUSED) == true)
         end
 
         #
@@ -327,6 +336,9 @@ module OpenWFE
         #
         def lookup_variable (varname)
 
+            #puts "lv : #{varname}"
+            #puts OpenWFE.caller_to_s(0, 5)
+
             env, var = lookup_environment(varname)
             env[var]
         end
@@ -364,6 +376,8 @@ module OpenWFE
         #
         def lookup_attribute (attname, workitem, options={})
 
+            #p attname
+
             default = options[:default]
             escape = options[:escape]
 
@@ -437,7 +451,7 @@ module OpenWFE
             attname = OpenWFE::symbol_to_name(attname) \
                 if attname.kind_of?(Symbol)
 
-            @attributes[attname] != nil
+            (@attributes[attname] != nil)
         end
 
         #
@@ -512,19 +526,27 @@ module OpenWFE
             parent_fei = nil
             parent = nil
 
-            parent, _fei = get_expression_pool().fetch(@parent_id) \
+            parent, _fei = get_expression_pool.fetch(@parent_id) \
                 if @parent_id
 
             parent_fei = parent.environment_id if parent
 
-            env = Environment.new(
+            env = Environment.new_env(
                 @environment_id, parent_fei, nil, @application_context, nil)
             
-            env.variables.merge!(initial_vars) if initial_vars
+            env.variables.merge! initial_vars if initial_vars
+
+            env[@fei.wfname] = self.raw_representation \
+                if (not @parent_id) and (self.is_a?(RawExpression))
+                    #
+                    # keeping track of the raw representation
+                    # of the top expression (for top recursion)
 
             ldebug { "new_environment() is #{env.fei.to_debug_s}" }
 
-            env.store_itself()
+            env.store_itself
+
+            env
         end
 
         #
@@ -580,7 +602,7 @@ module OpenWFE
 
         #
         # Used like the classical Ruby synchronize, but as the OpenWFE 
-        # expression pool manages its own set of monitores, it's one of those 
+        # expression pool manages its own set of monitors, it's one of those 
         # monitors that is used. But the synchronize code looks like the class 
         # just included the MonitorMixin. No hassle.
         #
@@ -603,12 +625,18 @@ module OpenWFE
             text = ""
 
             children.each do |child|
-                if child.kind_of?(RawExpression)
+
+                if child.is_a?(RawExpression)
+
                     text << child.fei.to_s
-                elsif child.kind_of?(FlowExpressionId)
+
+                elsif child.is_a?(FlowExpressionId)
+
                     text << get_expression_pool\
                         .fetch_expression(child).raw_representation.to_s
+
                 else
+
                     text << child.to_s
                 end
             end
@@ -627,9 +655,8 @@ module OpenWFE
         #
         def lookup_value (workitem, options={})
 
-            v = lookup_vf_attribute(workitem, 'value', options)
-            v = lookup_vf_attribute(workitem, 'val', options) unless v
-            v
+            lookup_vf_attribute(workitem, 'value', options) ||
+            lookup_vf_attribute(workitem, 'val', options)
         end
 
         #
@@ -638,7 +665,7 @@ module OpenWFE
         #
         def lookup_ref (workitem, prefix='')
 
-            ref = lookup_vf_attribute(workitem, 'ref', :prefix => prefix)
+            ref = lookup_vf_attribute workitem, 'ref', :prefix => prefix
             return ref.to_s if ref
             nil
         end
@@ -648,23 +675,37 @@ module OpenWFE
         #
         def lookup_vf_attribute (workitem, att_name, options={})
 
+            att_name = att_name.to_s
+
             prefix = options[:prefix] || ''
-            prefix = "#{prefix.to_s}-" if prefix != ''
+            prefix = prefix.to_s
+
+            dash = (att_name.size > 0 and prefix.size > 0) ? "-" : ""
 
             v = lookup_attribute(
-                "#{prefix}#{att_name}", workitem, options)
+                "#{prefix}#{dash}#{att_name}", workitem, options)
+
+            att_name = "-#{att_name}" if att_name.size > 0
+            prefix = "#{prefix}-" if prefix.size > 0
 
             return v if v
 
             v = lookup_attribute(
-                "#{prefix}variable-#{att_name}", workitem, options)
+                "#{prefix}variable#{att_name}", workitem, options) ||
+                lookup_attribute(
+                "#{prefix}var#{att_name}", workitem, options) ||
+                lookup_attribute(
+                "#{prefix}v#{att_name}", workitem, options)
 
             return lookup_variable(v) if v
 
-            v = lookup_attribute(
-                "#{prefix}field-#{att_name}", workitem, options)
+            f = lookup_attribute(
+                "#{prefix}field#{att_name}", workitem, options) ||
+                lookup_attribute(
+                "#{prefix}f#{att_name}", workitem, options)
 
-            return workitem.attributes[v] if v
+            #return workitem.attributes[f] if f
+            return workitem.attributes[f.to_s] if f
 
             nil
         end
@@ -743,7 +784,7 @@ module OpenWFE
                     ]
                 end
 
-                [ get_environment, varname]
+                [ get_environment, varname ]
             end
 
             #