openwferu 0.9.16 → 0.9.17

data/lib/openwfe/expool/threadedexpstorage.rb

@@ -61,30 +61,18 @@ module OpenWFE
 
             get_scheduler.unschedule(@thread_id) if @thread_id
 
-            process_queue()
+            process_queue
                 #
                 # flush every remaining events (especially the :delete ones)
         end
 
-        #
-        # calls process_queue() before the call the super class each_of_kind()
-        # method
-        #
-        def each_of_kind (kind, &block)
-
-            #ldebug { "each_of_kind()" }
-
-            process_queue()
-            super
-        end
-
         #
         # calls process_queue() before the call the super class each()
-        # method
+        # method.
         #
-        def each (wfid_prefix=nil, &block)
+        def find_expressions (options)
 
-            process_queue()
+            process_queue
             super
         end
 
@@ -179,11 +167,11 @@ module OpenWFE
 
                 get_expression_pool.add_observer(:update) do |event, fei, fe|
                     ldebug { ":update  for #{fei.to_debug_s}" }
-                    queue(event, fei, fe)
+                    queue event, fei, fe
                 end
                 get_expression_pool.add_observer(:remove) do |event, fei|
                     ldebug { ":remove  for #{fei.to_debug_s}" }
-                    queue(event, fei)
+                    queue event, fei
                 end
             end
     end

data/lib/openwfe/expool/wfidgen.rb

@@ -1,6 +1,6 @@
 #
 #--
-# Copyright (c) 2007, John Mettraux, OpenWFE.org
+# Copyright (c) 2007-2008, John Mettraux, OpenWFE.org
 # All rights reserved.
 # 
 # Redistribution and use in source and binary forms, with or without 
@@ -39,9 +39,10 @@
 
 require 'thread'
 
+require 'rufus/mnemo'
+
 require 'openwfe/service'
 require 'openwfe/rudefinitions'
-require 'openwfe/util/kotoba'
 
 
 module OpenWFE
@@ -54,6 +55,7 @@ module OpenWFE
     class DefaultWfidGenerator < Service
 
         def initialize (service_name, application_context)
+
             super
 
             @last = -1
@@ -72,13 +74,16 @@ module OpenWFE
         # The launchitem parameter is not used by this generator.
         #
         def generate (launchitem=nil)
+
             wfid = nil
+
             @mutex.synchronize do
                 wfid = now
                 wfid = @last + 1 if wfid <= @last
                 @last = wfid
                 save_last
             end
+
             to_string(wfid)
         end
 
@@ -87,6 +92,7 @@ module OpenWFE
         # This method is overriden in extension of this class.
         #
         def to_string (numeric_id)
+
             numeric_id.to_s
         end
 
@@ -94,6 +100,7 @@ module OpenWFE
         # Is a simple call to OpenWFE::split_wfid()
         #
         def split_wfid (wfid)
+
             OpenWFE.split_wfid(wfid)
         end
 
@@ -102,10 +109,12 @@ module OpenWFE
         # a wfid following this 'defaut' scheme.
         #
         def self.split_wfid (wfid)
+
             r = []
             0.upto(wfid.length-1) do |i|
                 r << wfid[i, 1]
             end
+
             r
         end
 
@@ -115,6 +124,7 @@ module OpenWFE
         # file is closed.
         #
         def stop
+
             #linfo { "stop() stopping '#{@service_name}'" }
             @last_f.close if @last_f
         end
@@ -175,6 +185,8 @@ module OpenWFE
     # "20070318-jonowoguya" or "20071224-jesoshimoha" that are a bit
     # easier to grasp than full integer wfids.
     #
+    # Now relying on the 'rufus-mnemo' gem.
+    #
     class KotobaWfidGenerator < DefaultWfidGenerator
 
         #
@@ -196,7 +208,7 @@ module OpenWFE
 
             s = sprintf "%4d%02d%02d", t.year, t.month, t.day
             s << "-"
-            s << Kotoba::from_integer(i)
+            s << Rufus::Mnemo::from_integer(i)
             s
         end
 
@@ -206,7 +218,8 @@ module OpenWFE
         # Returns the 'kotoba' wfid split into its syllables
         #
         def self.split_wfid (wfid)
-            Kotoba::split(wfid[9..-1])
+
+            Rufus::Mnemo::split(wfid[9..-1])
         end
 
         #
@@ -220,7 +233,7 @@ module OpenWFE
 
             s = wfid[9..-1]
 
-            i = Kotoba::to_integer(s)
+            i = Rufus::Mnemo::to_integer(s)
 
             hour = (i / (10000 * 60 * 60)) % 24
             min = (i / (10000 * 60)) % 60
@@ -233,6 +246,7 @@ module OpenWFE
         end
 
         def self.from_time (t)
+
             to_string(t.to_f * 10 * 1000).to_i
         end
     end
@@ -250,7 +264,7 @@ module OpenWFE
 
         def initialize (service_name, application_context, field_name)
 
-            super(service_name, application_context)
+            super service_name, application_context
 
             @field_name = field_name
         end
@@ -316,13 +330,15 @@ module OpenWFE
         # The launchitem parameter is not used by this generator.
         #
         def generate (launchitem=nil)
-            return `#{@command}`.chomp
+
+            `#{@command}`.chomp
         end
 
         #
         # Is a simple call to OpenWFE::split_wfid()
         #
         def split_wfid (wfid)
+
             OpenWFE.split_wfid(wfid)
         end
 
@@ -334,6 +350,7 @@ module OpenWFE
         # expression storage directory structure).
         #
         def self.split_wfid (wfid)
+
             s = wfid[0, 8]
             a = []
             4.times do |i|
@@ -357,6 +374,7 @@ module OpenWFE
     # here.
     #
     def OpenWFE.split_wfid (wfid)
+
         SPLIT_MAP.each do |regex, clazz|
             return clazz.split_wfid(wfid) if wfid.match(regex) 
         end

data/lib/openwfe/expool/yamlexpstorage.rb

@@ -1,6 +1,6 @@
 #
 #--
-# Copyright (c) 2006-2007, Nicolas Modryzk and John Mettraux, OpenWFE.org
+# Copyright (c) 2006-2008, Nicolas Modryzk and John Mettraux, OpenWFE.org
 # All rights reserved.
 # 
 # Redistribution and use in source and binary forms, with or without 
@@ -44,12 +44,13 @@ require 'openwfe/storage/yamlfilestorage'
 require 'openwfe/expool/threadedexpstorage'
 
 require 'openwfe/expressions/flowexpression'
-require 'openwfe/expressions/raw_xml'
-    #
+#require 'openwfe/expressions/raw_xml'
+    #--
     # making sure classes in those files are loaded
     # before their yaml persistence is tuned
     # (else the reopening of the class is interpreted as
     # a definition of the class...)
+    #++
 
 
 module OpenWFE
@@ -64,58 +65,75 @@ module OpenWFE
         
         def initialize (service_name, application_context)
 
-            super(service_name, application_context, '/expool')
+            super service_name, application_context, '/expool'
 
             observe_expool
         end
 
         #
-        # Iterates on each expression that is of the given kind.
-        # Used for example by the expression pool when rescheduling.
+        # Find expressions matching various criteria. 
+        # (See Engine#list_process_status for an explanation)
         #
-        def each_of_kind (kind, &block)
+        def find_expressions (options)
 
-            each_object_path do |path|
+            wfid_prefix = options[:wfid_prefix]
+            wfid_regex = nil
+            wfid_regex = Regexp.new("^"+wfid_prefix) if wfid_prefix
+
+            options.delete :wfid_prefix
+                # no need to check this in further does_match? calls
 
-                #ldebug { "each_of_kind() path is #{path}" }
+            result = []
 
-                #next unless matches(path, kind)
-                    # was not OK in case of <bob activity="clean office" />
+            each_object_path do |path|
+
+                unless path.match /\/engine_environment.yaml$/
+                    a = self.class.split_file_path path
+                    next unless a
+                        # not an expression file
 
-                expression = load_object path
+                    wfid = a[0]
+                    next if wfid_regex and (not wfid_regex.match(wfid))
+                end
 
-                next unless expression.is_a?(kind)
+                fexp = load_object path
 
-                expression.application_context = @application_context
+                next unless does_match?(options, fexp)
 
-                block.call expression.fei, expression
+                result << fexp
             end
+
+            result
         end
 
-        #
-        # "each flow expression" : this method awaits a block then, for
-        # each flow_expression in this storage, calls that block.
-        #
-        # If wfid_prefix is set, only expressions whose wfid (workflow instance
-        # id (process instance id)) will be taken into account.
-        #
-        def each (wfid_prefix=nil, &block)
+        def fetch_root (wfid)
 
-            each_object_path do |path|
+            fei = FlowExpressionId.new
+            fei.wfid = wfid
+            fei.expid = "0"
+            fei.expression_name = "process-definition"
+
+            root = self[fei]
+
+            return root if root
 
-                a = self.class.split_file_path path
+            #
+            # direct hit missed, scanning...
+
+            each_object_path(compute_dir_path(wfid)) do |p|
+
+                a = self.class.split_file_path p
                 next unless a
 
-                wfid = a[0]
-                next if wfid_prefix and ( ! wfid.match "^#{wfid_prefix}")
+                next unless a[0] == wfid
 
-                flow_expression = load_object path
+                fexp = load_object p
 
-                block.call flow_expression.fei, flow_expression
+                return fexp if fexp.is_a?(DefineExpression)
             end
-        end
 
-        alias :real_each :each
+            nil
+        end
 
         #
         # Returns a human-readable list of the current YAML file paths.
@@ -148,6 +166,15 @@ module OpenWFE
 
         protected
 
+            def compute_dir_path (wfid)
+
+                wfid = FlowExpressionId.to_parent_wfid wfid
+
+                a_wfid = get_wfid_generator.split_wfid wfid
+
+                @basepath + a_wfid[-2] + "/" + a_wfid[-1] + "/"
+            end
+
             def compute_file_path (fei)
                 
                 return @basepath + "/engine_environment.yaml" \
@@ -155,11 +182,7 @@ module OpenWFE
                     
                 wfid = fei.parent_workflow_instance_id
 
-                a_wfid = get_wfid_generator.split_wfid(wfid)
-                
-                @basepath +
-                a_wfid[-2] + "/" +
-                a_wfid[-1] + "/" +
+                compute_dir_path(wfid) +
                 fei.workflow_instance_id + "__" +
                 fei.expression_id + "_" + 
                 fei.expression_name + ".yaml"
@@ -192,7 +215,7 @@ module OpenWFE
 
             super
 
-            start_processing_thread()
+            start_processing_thread
                 #
                 # which sets @thread_id
         end

data/lib/openwfe/expressions/condition.rb

@@ -1,6 +1,6 @@
 #
 #--
-# Copyright (c) 2007, John Mettraux, OpenWFE.org
+# Copyright (c) 2007-2008, John Mettraux, OpenWFE.org
 # All rights reserved.
 # 
 # Redistribution and use in source and binary forms, with or without 
@@ -37,7 +37,7 @@
 # John Mettraux at openwfe.org
 #
 
-require 'openwfe/util/safe'
+require 'rufus/eval' # gem 'rufus-eval'
 
 
 module OpenWFE
@@ -116,34 +116,68 @@ module OpenWFE
                 return nil \
                     unless conditional
 
-                ldebug { "do_eval_condition() 0 for  '#{conditional}'" }
+                ldebug { "do_eval_condition() 0 for  >#{conditional}<" }
 
                 conditional = unescape conditional
 
-                ldebug { "do_eval_condition() 1 for  '#{conditional}'" }
+                ldebug { "do_eval_condition() 1 for  >#{conditional}<" }
+
+                r = eval_set conditional
+                return r if r != nil
 
                 begin
                     return to_boolean(do_eval(conditional, workitem))
                 rescue Exception => e
                     # probably needs some quoting...
+                    ldebug { "do_eval_condition() e : #{e}" }
                 end
 
                 conditional = do_quote(conditional)
 
-                ldebug { "do_eval_condition() 2 for  '#{conditional}'" }
+                ldebug { "do_eval_condition() 2 for  >#{conditional}<" }
 
                 to_boolean(do_eval(conditional, workitem))
             end
 
+            SET_REGEX = /(\S*?)( is)?( not)? set$/
+
+            #
+            # Evals the 'x [ is][ not] set' notation...
+            #
+            def eval_set (cond)
+
+                m = SET_REGEX.match cond
+
+                return nil unless m
+
+                val = m[1]
+                n = m[3]
+
+                ldebug do 
+                    "eval_set() for >#{cond}<  "+
+                    "m[1] is '#{val}', m[3] is '#{n}'"
+                end
+
+                val = val.strip if val
+                val = (val != nil and val != '')
+                n = (n and n.strip == 'not')
+
+                n ? (not val) : val
+            end
+
         private
 
             #
             # Returns true if result is the "true" String or the true 
             # boolean value. Returns false else.
             #
-            def to_boolean (result)
-                ldebug { "to_boolean() result is  '#{result}'" }
-                (result == "true" or result == true)
+            def to_boolean (o)
+
+                ldebug { "to_boolean() o is _#{o}_" }
+
+                #(o == "true" or o == true)
+                o = o.strip if o.is_a?(String)
+                not (o == nil || o == false || o == 'false' || o == '')
             end
 
             #
@@ -181,6 +215,7 @@ module OpenWFE
             # Returns nil if not operator was found in the string.
             #
             def find_operator (string)
+
                 [ "==", "!=", "<=", ">=", "<", ">" ].each do |op|
                     i = string.index op
                     next unless i
@@ -191,15 +226,17 @@ module OpenWFE
 
             #
             # Runs the given given within an instance_eval() at a $SAFE
-            # level of 3.
+            # level of 4.
             #
             def do_eval (s, workitem)
 
-                #OpenWFE::instance_eval_safely(self, s, 3)
-
                 wi = workitem
                 fe = self
-                OpenWFE::eval_safely(s, 3, binding())
+                    #
+                    # wi and fe are thus available as well 
+                    # (as self and workitem)
+
+                Rufus::eval_safely(s, 4, binding())
             end
     end