openwferu 0.9.8 → 0.9.9

data/README.txt

@@ -1,7 +1,7 @@
 = OpenWFEru, Standard Library Documentation
 
 == Prerequisites
-Ruby 1.8.0 or later
+Ruby 1.8.4 or later
 
 == Supported platforms
 TODO
@@ -61,9 +61,8 @@ libraries:
 [rake] Handle builds, generating documentation, and running unit tests
 [rubygems] Handles creation of the gems
 [rote] A framework being used to help with managing the offline written docs
-[redcloth] Openwferu uses textile-markup for its docs.  Redcloth provides an engine for it.
+[redcloth] OpenWFEru uses textile-markup for its docs.  Redcloth provides an engine for it.
 [tidy] General cleanup
-[libxml-ruby] Allows XSD validation
 
 It's best if you use gems to install these as the process can get rather
 tedious by hand.
@@ -89,10 +88,10 @@ On Ubuntu you can install libxml2 with:
 The main project site lives at rubyforge at:
 http://rubyforge.org/projects/openwferu
 or
-http://ru.openwfe.org
+http://openwferu.rubyforge.org
 
 In the meantime the old site hosted at openwfe.org is at:
 http://www.openwfe.org/openwfe-ruby.html
 
-If you're interested in helping :  http://groups.google.com/group/openwferu-dev/topics
+If you're interested in helping :  http://groups.google.com/group/openwferu-users/topics
 

data/lib/openwfe/engine/engine.rb

@@ -136,29 +136,29 @@ module OpenWFE
         #
         def launch (launch_object, async=false)
 
-            launchitem = nil
+            launchitem = if launch_object.kind_of?(OpenWFE::LaunchItem)
 
-            if launch_object.kind_of? OpenWFE::LaunchItem
+                launch_object
 
-                launchitem = launch_object
+            elsif launch_object.kind_of?(Class)
 
-            elsif launch_object.kind_of? Class
-
-                launchitem = LaunchItem.new(launch_object)
+                LaunchItem.new launch_object
 
             elsif launch_object.kind_of? String
 
-                launchitem = OpenWFE::LaunchItem.new
+                li = OpenWFE::LaunchItem.new
 
-                if launch_object[0] == '<'
-                    launchitem.workflowDefinitionUrl = "field:__definition"
-                    launchitem['definition'] = launch_object
+                if launch_object[0, 1] == '<'
+                    li.workflowDefinitionUrl = "field:__definition"
+                    li['definition'] = launch_object
                 else
-                    launchitem.workflowDefinitionUrl = launch_object
+                    li.workflowDefinitionUrl = launch_object
                 end
+
+                li
             end
 
-            get_expression_pool.launch(launchitem, async)
+            get_expression_pool.launch launchitem, async
         end
 
         #
@@ -170,11 +170,11 @@ module OpenWFE
         #
         def reply (workitem)
 
-            if workitem.kind_of? InFlowWorkItem
+            if workitem.kind_of?(InFlowWorkItem)
 
                 get_expression_pool.reply(workitem.flow_expression_id, workitem)
 
-            elsif workitem.kind_of? LaunchItem
+            elsif workitem.kind_of?(LaunchItem)
 
                 get_expression_pool.launch(workitem, false)
 

data/lib/openwfe/expool/expressionpool.rb

@@ -183,7 +183,7 @@ module OpenWFE
 
             definition = if wfdurl.match "^field:"
                 wfdfield = wfdurl[6..-1]
-                launchitem.attributes.delete(wfdfield)
+                launchitem.attributes.delete wfdfield
             else
                 read_uri(wfdurl)
             end
@@ -191,9 +191,9 @@ module OpenWFE
             raise "didn't find process definition at '#{wfdurl}'" \
                 unless definition
 
-            raw_expression = build_raw_expression(launchitem, definition)
+            raw_expression = build_raw_expression launchitem, definition
 
-            raw_expression.check_parameters(launchitem)
+            raw_expression.check_parameters launchitem
                 #
                 # will raise an exception if there are requirements
                 # and one of them is not met
@@ -246,10 +246,14 @@ module OpenWFE
         end
 
         #
-        # launches a subprocess
+        # Prepares a raw expression from a template.
+        # Returns that raw expression.
         #
-        def launch_template (
-            requesting_expression, sub_id, template, workitem, params=nil)
+        # Used in the concurrent-iterator when building up the children list 
+        # and of course used by the launch_template() method.
+        #
+        def prepare_from_template (
+            requesting_expression, sub_id, template, params=nil)
 
             rawexp = if template.is_a? RawExpression
                 template
@@ -293,34 +297,34 @@ module OpenWFE
                     "#{requesting_expression.fei.workflow_instance_id}.#{sub_id}"
             end
 
-            #ldebug do
-            #    p = ""
-            #    p = rawexp.parent_id.to_debug_s if rawexp.parent_id
-            #    "launch_template()\n"+
-            #    "    rawexp.fei is #{rawexp.fei.to_debug_s}\n"+
-            #    "    rawexp.parent_id is #{p}"
-            #end
-            
             #ldebug do
             #    "launch_template() spawning wfid " +
             #    "#{rawexp.fei.workflow_instance_id.to_s}"
             #end
 
-            env = rawexp.new_environment()
-                #
-            params.each { |k, v| env[k] = v } if params
+            env = rawexp.new_environment(params)
                 #
                 # the new scope gets its own environment
 
             rawexp.store_itself()
 
-            workitem.flow_expression_id = rawexp.fei
+            rawexp
+        end
 
-            fei = rawexp.fei
+        #
+        # launches a subprocess
+        #
+        def launch_template (
+            requesting_expression, sub_id, template, workitem, params=nil)
 
-            apply(rawexp, workitem)
+            rawexp = prepare_from_template(
+                requesting_expression, sub_id, template, params)
 
-            return fei
+            workitem.flow_expression_id = rawexp.fei
+
+            apply rawexp, workitem
+
+            rawexp.fei
         end
 
         #
@@ -329,15 +333,15 @@ module OpenWFE
         #
         def evaluate (rawExpression, workitem)
 
-            exp = rawExpression.instantiate_real_expression(workitem)
-            fei = exp.evaluate(workitem)
+            exp = rawExpression.instantiate_real_expression workitem
+            fei = exp.evaluate workitem
 
             #remove(rawExpression)
                 #
                 # not necessary, the raw expression gets overriden by
                 # the real expression
 
-            return fei
+            fei
         end
 
         #
@@ -408,16 +412,23 @@ module OpenWFE
         # Forgets the given expression (makes sure to substitute its
         # parent_id with the GONE_PARENT_ID constant)
         #
-        def forget (exp)
+        def forget (parent_exp, exp)
 
             exp, fei = fetch(exp)
 
+            #ldebug { "forget() forgetting  #{fei}" }
+
             return if not exp
 
             onotify :forget, fei
 
+            parent_exp.children.delete(fei)
+
             exp.parent_id = GONE_PARENT_ID
+            exp.dup_environment
             exp.store_itself()
+
+            ldebug { "forget() forgot      #{fei}" }
         end
 
         #
@@ -479,7 +490,7 @@ module OpenWFE
             #
             # parent still present, reply to it
 
-            reply(exp.parent_id, workitem)
+            reply exp.parent_id, workitem
         end
 
         #
@@ -558,7 +569,7 @@ module OpenWFE
         #
         def fetch_expression (exp)
             exp, _fei = fetch(exp)
-            return exp
+            exp
         end
 
         #
@@ -568,12 +579,13 @@ module OpenWFE
         def fetch_root (exp_or_wfid)
 
             return fetch_expression_with_wfid(exp_or_wfid) \
-                if exp_or_wfid.is_a? String
+                if exp_or_wfid.is_a?(String)
 
             exp = fetch_expression(exp_or_wfid)
 
             return exp unless exp.parent_id
-            return fetch_root(fetch_expression(exp.parent_id))
+
+            fetch_root(fetch_expression(exp.parent_id))
         end
 
         #
@@ -591,7 +603,7 @@ module OpenWFE
                     ee.store_itself()
                 end
 
-                return ee
+                ee
             end
         end
 
@@ -602,7 +614,7 @@ module OpenWFE
         def remove (exp)
 
             exp, _fei = fetch(exp) \
-                if exp.kind_of? FlowExpressionId
+                if exp.kind_of?(FlowExpressionId)
 
             return if not exp
 
@@ -682,8 +694,8 @@ module OpenWFE
 
             get_expression_storage.real_each do |fei, fexp|
 
-                next if fexp.kind_of? Environment
-                next if fexp.kind_of? RawExpression
+                next if fexp.kind_of?(Environment)
+                next if fexp.kind_of?(RawExpression)
                 next unless fexp.apply_time
 
                 pi = fei.parent_wfid
@@ -756,7 +768,7 @@ module OpenWFE
 
                 env, fei = fetch(environment_id)
 
-                env.unbind()
+                env.unbind
 
                 #get_expression_storage().delete(environment_id)
 
@@ -769,11 +781,11 @@ module OpenWFE
             #
             def build_workitem (launchitem)
 
-                wi = InFlowWorkItem.new()
+                wi = InFlowWorkItem.new
 
-                wi.attributes = launchitem.attributes.dup()
+                wi.attributes = launchitem.attributes.dup
 
-                return wi
+                wi
             end
 
             #
@@ -815,9 +827,11 @@ module OpenWFE
                 #    "param of class #{param.class.name}" 
                 #end
 
-                return param if param.is_a? SimpleExpRepresentation
-                return param.make if param.is_a? ProcessDefinition
-                return param.do_make if param.is_a? Class
+                return param \
+                    if param.is_a?(SimpleExpRepresentation)
+
+                return param.do_make \
+                    if param.is_a?(ProcessDefinition) or param.is_a?(Class)
 
                 raise "cannot handle definition of class #{param.class.name}" \
                     unless param.is_a? String
@@ -844,8 +858,8 @@ module OpenWFE
 
                 o = OpenWFE::eval_safely(param, SAFETY_LEVEL)
 
-                return o.make if o.is_a? ProcessDefinition
-                return o.do_make if o.kind_of? Class
+                return o.do_make \
+                    if o.is_a?(ProcessDefinition) or o.is_a?(Class)
 
                 o
             end
@@ -873,7 +887,8 @@ module OpenWFE
                 fei.wfid = get_wfid_generator.generate launchitem
                 fei.expression_id = "0"
                 fei.expression_name = exp_name
-                return fei
+
+                fei
             end
 
             #
@@ -898,8 +913,8 @@ module OpenWFE
                 #puts procdef.raw_expression_class
                 #puts procdef.raw_expression_class.public_methods
 
-                return procdef.raw_expression_class\
-                    .new(fei, nil, nil, @application_context, procdef)
+                procdef.raw_expression_class.new(
+                    fei, nil, nil, @application_context, procdef)
             end
 
     end

data/lib/openwfe/expool/expstorage.rb

@@ -100,7 +100,7 @@ module OpenWFE
         def [] (fei)
 
             #ldebug { "[] size is #{@cache.size}" }
-            ldebug { "[] (sz #{@cache.size}) for #{fei.to_debug_s}" }
+            #ldebug { "[] (sz #{@cache.size}) for #{fei.to_debug_s}" }
 
             fe = @cache[fei]
             return fe if fe

data/lib/openwfe/expressions/condition.rb

@@ -79,22 +79,23 @@ module OpenWFE
             return nil \
                 unless conditional
 
-            #ldebug { "eval_condition() 0 for  '#{conditional}'" }
+            ldebug { "eval_condition() 0 for  '#{conditional}'" }
 
-            conditional = from_xml(conditional)
+            conditional = from_xml conditional
 
-            #ldebug { "eval_condition() 1 for  '#{conditional}'" }
+            ldebug { "eval_condition() 1 for  '#{conditional}'" }
+
+            begin
+                return to_boolean(do_eval(conditional))
+            rescue Exception => e
+                # probably needs some quoting...
+            end
 
             conditional = do_quote(conditional)
 
             ldebug { "eval_condition() 2 for  '#{conditional}'" }
 
-            #result = instance_eval(conditional)
-            result = do_eval(conditional)
-
-            ldebug { "eval_condition() 3 result is  '#{result}'" }
-
-            return (result == "true" or result == true)
+            to_boolean(do_eval(conditional))
         end
 
         #
@@ -121,21 +122,16 @@ module OpenWFE
 
         protected
 
+        private
+
             #
-            # If the attribute name is a list of attribute names, pick
-            # the first one present.
+            # Returns true if result is the "true" String or the true 
+            # boolean value. Returns false else.
             #
-            #def pick_attribute (attnames)
-            #    attnames.each do |attname|
-            #        return attname if has_attribute(attname)
-            #        return attname if has_attribute("r" + attname.to_s)
-            #    end
-            #    return attnames[0]
-            #        #
-            #        # some kind of a default (for error messages)
-            #end
-
-        private
+            def to_boolean (result)
+                ldebug { "to_boolean() result is  '#{result}'" }
+                (result == "true" or result == true)
+            end
 
             def from_xml (string)
 
@@ -145,22 +141,39 @@ module OpenWFE
                 s
             end
 
+            #
+            # Quotes the given string so that it can easily get evaluated
+            # as Ruby code (a string comparison actually).
+            #
             def do_quote (string)
 
-                i = string.index("==")
-                i = string.index("!=") unless i
-                i = string.index("<") unless i
-                i = string.index(">") unless i
+                op = find_operator string
+
+                return '"' + string + '"' unless op
+
+                op, i = op
 
-                return '"' + string + '"' unless i
+                s = '"'
+                s << string[0..i-1].strip
+                s << '" '
+                s << string[i, op.length]
+                s << ' "'
+                s << string[i+op.length..-1].strip
+                s << '"'
+                s
+            end
 
-                '"' +
-                string[0..i-1].strip +
-                '" ' +
-                string[i..i+2] +
-                ' "' +
-                string[i+2..-1].strip +
-                '"'
+            #
+            # Returns the operator and its index (position) in the string.
+            # Returns nil if not operator was found in the string.
+            #
+            def find_operator (string)
+                [ "==", "!=", "<=", ">=", "<", ">" ].each do |op|
+                    i = string.index op
+                    next unless i
+                    return [ op, i ]
+                end
+                nil
             end
 
             #