ruote 0.9.18 → 0.9.19

data/lib/openwfe/expressions/fe_define.rb

@@ -43,150 +43,150 @@ require 'openwfe/expressions/fe_sequence'
 
 module OpenWFE
 
+  #
+  # The <process-definition> expression.
+  #
+  #   <process-definition name="myprocess" revision="2">
+  #     <sequence>
+  #       <participant ref="alpha" />
+  #       <subprocess ref="sub0" />
+  #     </sequence>
+  #     <process-definition name="sub0">
+  #       <participant ref="bravo" />
+  #     </process-definition>
+  #   </process-definition>
+  #
+  # In a Ruby process definition :
+  #
+  #   class Test0 < OpenWFE::ProcessDefinition
+  #
+  #     sequence do
+  #       sub0
+  #       sub1
+  #       sub2
+  #       sub3
+  #     end
+  #
+  #     process_definition :name => "sub0" do
+  #       _print "sub0"
+  #     end
+  #     define :name => "sub1" do
+  #       _print "sub1"
+  #     end
+  #     process_definition "sub2" do
+  #       _print "sub2"
+  #     end
+  #     define "sub3" do
+  #       _print "sub3"
+  #     end
+  #   end
+  #
+  # It is most often used with its "process-definition" name, but "define"
+  # and "workflow-definition" are accepted as well.
+  #
+  class DefineExpression < SequenceExpression
+
+    is_definition
+
+    names :define, :process_definition, :workflow_definition
+
     #
-    # The <process-definition> expression.
-    #
-    #     <process-definition name="myprocess" revision="2">
-    #         <sequence>
-    #             <participant ref="alpha" />
-    #             <subprocess ref="sub0" />
-    #         </sequence>
-    #         <process-definition name="sub0">
-    #             <participant ref="bravo" />
-    #         </process-definition>
-    #     </process-definition>
-    #
-    # In a Ruby process definition :
-    #
-    #     class Test0 < OpenWFE::ProcessDefinition
+    # A pointer to the body expression of this process definition.
     #
-    #         sequence do
-    #             sub0
-    #             sub1
-    #             sub2
-    #             sub3
-    #         end
+    attr_accessor :body_fei
+
+    #--
+    # Evaluates the definition, but doesn't apply its body, will
+    # simply return the body fei.
     #
-    #         process_definition :name => "sub0" do
-    #             _print "sub0"
-    #         end
-    #         define :name => "sub1" do
-    #             _print "sub1"
-    #         end
-    #         process_definition "sub2" do
-    #             _print "sub2"
-    #         end
-    #         define "sub3" do
-    #             _print "sub3"
-    #         end
-    #     end
+    #def evaluate (workitem)
+    #  @eval_only = true
+    #  apply workitem
+    #  @body_fei
+    #end
+    #++
+
     #
-    # It is most often used with its "process-definition" name, but "define"
-    # and "workflow-definition" are accepted as well.
+    # Called at the end of the 'evaluation', the 'apply' operation on
+    # the body of the definition is done here.
     #
-    class DefineExpression < SequenceExpression
-
-        is_definition
-
-        names :define, :process_definition, :workflow_definition
-
-        #
-        # A pointer to the body expression of this process definition.
-        #
-        attr_accessor :body_fei
-
-        #--
-        # Evaluates the definition, but doesn't apply its body, will
-        # simply return the body fei.
-        #
-        #def evaluate (workitem)
-        #    @eval_only = true
-        #    apply workitem
-        #    @body_fei
-        #end
-        #++
+    def reply_to_parent (workitem)
 
-        #
-        # Called at the end of the 'evaluation', the 'apply' operation on
-        # the body of the definition is done here.
-        #
-        def reply_to_parent (workitem)
+      #return if @eval_only
 
-            #return if @eval_only
+      #puts "/// \n   bf #{@body_fei} \n   wi.fei #{workitem.fei}"
 
-            #puts "/// \n   bf #{@body_fei} \n   wi.fei #{workitem.fei}"
+      return super(workitem) \
+        if @body_fei == nil or @body_fei == workitem.fei
+        #unless @body_fei
 
-            return super(workitem) \
-                if @body_fei == nil or @body_fei == workitem.fei
-                #unless @body_fei
+      #_fei = @body_fei
+      #@body_fei = nil
+      #store_itself
+      #get_expression_pool.apply _fei, workitem
 
-            #_fei = @body_fei
-            #@body_fei = nil
-            #store_itself
-            #get_expression_pool.apply _fei, workitem
-
-            get_expression_pool.apply @body_fei, workitem
-        end
+      get_expression_pool.apply @body_fei, workitem
+    end
 
-        #
-        # Overrides the set_variable in FlowExpression to
-        # make sure to intercept requests for binding subprocesses
-        # at the engine level and to store a copy of the raw expression,
-        # not only the flow expression id.
-        #
-        def set_variable (name, fei)
+    #
+    # Overrides the set_variable in FlowExpression to
+    # make sure to intercept requests for binding subprocesses
+    # at the engine level and to store a copy of the raw expression,
+    # not only the flow expression id.
+    #
+    def set_variable (name, fei)
 
-            if name[0, 2] == "//"
+      if name[0, 2] == "//"
 
-                raw_exp = get_expression_pool.fetch_expression(fei).dup
-                raw_exp.parent_id = nil
-                raw_exp.fei = raw_exp.fei.dup
-                fei = raw_exp.fei
-                fei.wfid = get_wfid_generator.generate
+        raw_exp = get_expression_pool.fetch_expression(fei).dup
+        raw_exp.parent_id = nil
+        raw_exp.fei = raw_exp.fei.dup
+        fei = raw_exp.fei
+        fei.wfid = get_wfid_generator.generate
 
-                raw_exp.store_itself
-            end
+        raw_exp.store_itself
+      end
 
-            super name, fei
-        end
+      super name, fei
+    end
 
-        protected
+    protected
 
-            #
-            # Determines the flowExpressionId of the next child to apply.
-            #
-            def next_child (current_fei)
+      #
+      # Determines the flowExpressionId of the next child to apply.
+      #
+      def next_child (current_fei)
 
-                next_fei = super
+        next_fei = super
 
-                return nil unless next_fei
+        return nil unless next_fei
 
-                rawchild = get_expression_pool.fetch_expression next_fei
+        rawchild = get_expression_pool.fetch_expression next_fei
 
-                return next_child(next_fei) unless rawchild
+        return next_child(next_fei) unless rawchild
 
-                unless rawchild.is_definition?
+        unless rawchild.is_definition?
 
-                    unless @body_fei
-                        @body_fei = next_fei
-                        store_itself
-                    end
-                    return next_child(next_fei)
-                end
+          unless @body_fei
+            @body_fei = next_fei
+            store_itself
+          end
+          return next_child(next_fei)
+        end
 
-                exp_class = get_expression_map.get_class rawchild
+        exp_class = get_expression_map.get_class rawchild
 
-                if exp_class == DefineExpression
-                    set_variable rawchild.definition_name, next_fei
-                    return next_child(next_fei)
-                end
+        if exp_class == DefineExpression
+          set_variable rawchild.definition_name, next_fei
+          return next_child(next_fei)
+        end
 
-                next_fei
-                    #
-                    # expression is a 'set', a 'filter-definition' or
-                    # something like that, let it get applied
-            end
-    end
+        next_fei
+          #
+          # expression is a 'set', a 'filter-definition' or
+          # something like that, let it get applied
+      end
+  end
 
 end
 

data/lib/openwfe/expressions/fe_do.rb

@@ -2,31 +2,31 @@
 #--
 # Copyright (c) 2007-2008, John Mettraux, OpenWFE.org
 # All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without 
+#
+# Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
-# 
+#
 # . Redistributions of source code must retain the above copyright notice, this
-#   list of conditions and the following disclaimer.  
-# 
-# . Redistributions in binary form must reproduce the above copyright notice, 
-#   this list of conditions and the following disclaimer in the documentation 
+#   list of conditions and the following disclaimer.
+#
+# . Redistributions in binary form must reproduce the above copyright notice,
+#   this list of conditions and the following disclaimer in the documentation
 #   and/or other materials provided with the distribution.
-# 
+#
 # . Neither the name of the "OpenWFE" nor the names of its contributors may be
 #   used to endorse or promote products derived from this software without
 #   specific prior written permission.
-# 
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 #++
 #
@@ -47,122 +47,122 @@ require 'openwfe/expressions/flowexpression'
 
 module OpenWFE
 
-    #
-    # Every expression in OpenWFEru accepts a 'tag' attribute. This tag
-    # can later be referenced by an 'undo' or 'redo' expression.
-    # Tags are active as soon as an expression is applied and they vanish
-    # when the expression replies to its parent expression or is cancelled.
-    #
-    # Calling for the undo of a non-existent tag throws no error, the flow 
-    # simply resumes.
-    #
-    #     concurrence do
-    #         sequence :tag => "side_job" do
-    #             participant "alice"
-    #             participant "bob"
-    #         end
-    #         sequence do
-    #             participant "charly"
-    #             undo :ref => "side_job"
-    #         end
-    #     end
-    #
-    # In this example, as soon as the participant charly is over, the sequence
-    # 'side_job' gets undone (cancelled). If the sequence 'side_job' was
-    # already over, the "undo" will have no effect.
-    #
-    class UndoExpression < FlowExpression
+  #
+  # Every expression in OpenWFEru accepts a 'tag' attribute. This tag
+  # can later be referenced by an 'undo' or 'redo' expression.
+  # Tags are active as soon as an expression is applied and they vanish
+  # when the expression replies to its parent expression or is cancelled.
+  #
+  # Calling for the undo of a non-existent tag throws no error, the flow
+  # simply resumes.
+  #
+  #   concurrence do
+  #     sequence :tag => "side_job" do
+  #       participant "alice"
+  #       participant "bob"
+  #     end
+  #     sequence do
+  #       participant "charly"
+  #       undo :ref => "side_job"
+  #     end
+  #   end
+  #
+  # In this example, as soon as the participant charly is over, the sequence
+  # 'side_job' gets undone (cancelled). If the sequence 'side_job' was
+  # already over, the "undo" will have no effect.
+  #
+  class UndoExpression < FlowExpression
+
+    names :undo
+
+    def apply (workitem)
+
+      tag = lookup_tag(workitem)
+
+      undo_self = false
+
+      if tag
+        #OpenWFE::call_in_thread(fei.expression_name, self) do
+        process_tag tag
+        #end
 
-        names :undo
+        undo_self = tag.fei.ancestor_of?(@fei)
+      end
 
-        def apply (workitem)
+      reply_to_parent(workitem) unless undo_self
+    end
 
-            tag = lookup_tag(workitem)
+    #
+    # Calls the expression pool cancel() method upon the tagged
+    # expression.
+    #
+    def process_tag (tag)
 
-            undo_self = false
+      ldebug do
+        "process_tag() #{fei.to_debug_s} to undo #{tag.fei.to_debug_s}"
+      end
 
-            if tag
-                #OpenWFE::call_in_thread(fei.expression_name, self) do
-                process_tag tag
-                #end
+      #get_expression_pool.cancel_and_reply_to_parent(
+      #  tag.raw_expression.fei, tag.workitem)
 
-                undo_self = tag.fei.ancestor_of?(@fei)
-            end
+      exp = get_expression_pool.fetch_expression(tag.raw_expression.fei)
 
-            reply_to_parent(workitem) unless undo_self
-        end
+      get_expression_pool.cancel(tag.raw_expression.fei)
 
+      get_expression_pool.reply_to_parent(exp, tag.workitem, false)
         #
-        # Calls the expression pool cancel() method upon the tagged
-        # expression.
-        #
-        def process_tag (tag)
-
-            ldebug do
-                "process_tag() #{fei.to_debug_s} to undo #{tag.fei.to_debug_s}"
-            end
-
-            #get_expression_pool.cancel_and_reply_to_parent(
-            #    tag.raw_expression.fei, tag.workitem)
-
-            exp = get_expression_pool.fetch_expression(tag.raw_expression.fei)
-
-            get_expression_pool.cancel(tag.raw_expression.fei)
-
-            get_expression_pool.reply_to_parent(exp, tag.workitem, false)
-                #
-                # 'remove' is set to false, cancel already removed the
-                # expression
-        end
+        # 'remove' is set to false, cancel already removed the
+        # expression
+    end
 
-        #def reply (workitem)
-        #end
+    #def reply (workitem)
+    #end
 
-        protected
+    protected
 
-            def lookup_tag (workitem)
+      def lookup_tag (workitem)
 
-                tagname = lookup_attribute :ref, workitem
+        tagname = lookup_attribute :ref, workitem
 
-                tag = lookup_variable tagname
+        tag = lookup_variable tagname
 
-                lwarn { "lookup_tag() no tag named '#{tagname}' found" } \
-                    unless tag
+        lwarn { "lookup_tag() no tag named '#{tagname}' found" } \
+          unless tag
 
-                tag
-            end
-    end
+        tag
+      end
+  end
 
-    #
-    # Every expression in OpenWFEru accepts a 'tag' attribute. This tag
-    # can later be referenced by an 'undo' or 'redo' expression.
-    #
-    # Calling for the undo of a non-existent tag throws no error, the flow 
-    # simply resumes.
-    #
-    class RedoExpression < UndoExpression
+  #
+  # Every expression in OpenWFEru accepts a 'tag' attribute. This tag
+  # can later be referenced by an 'undo' or 'redo' expression.
+  #
+  # Calling for the undo of a non-existent tag throws no error, the flow
+  # simply resumes.
+  #
+  class RedoExpression < UndoExpression
 
-        names :redo
+    names :redo
 
-        def process_tag (tag)
+    def process_tag (tag)
 
-            ldebug do
-                "process_tag() #{fei.to_debug_s} to redo #{tag.fei.to_debug_s}"
-            end
+      ldebug do
+        "process_tag() #{fei.to_debug_s} to redo #{tag.fei.to_debug_s}"
+      end
 
-            #
-            # cancel
+      #
+      # cancel
 
-            get_expression_pool.cancel(tag.fei)
+      get_expression_pool.cancel(tag.fei)
 
-            #
-            # [re]apply
+      #
+      # [re]apply
 
-            tag.raw_expression.application_context = @application_context
+      tag.raw_expression.application_context = @application_context
 
-            get_expression_pool.apply tag.raw_expression, tag.workitem
-        end
+      get_expression_pool.apply tag.raw_expression, tag.workitem
     end
+  end
 
 end