ruote 0.9.19 → 0.9.20

data/lib/openwfe/expressions/fe_reserve.rb

@@ -1,43 +1,26 @@
-#
 #--
-# Copyright (c) 2007-2008, John Mettraux, OpenWFE.org
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
+# Copyright (c) 2007-2009, John Mettraux, jmettraux@gmail.com
 #
-# . Redistributions of source code must retain the above copyright notice, this
-#   list of conditions and the following disclaimer.
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
 #
-# . 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.
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
 #
-# . 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.
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
 #
-# 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.
+# Made in Japan.
 #++
-#
-
-#
-# "made in Japan"
-#
-# John Mettraux at openwfe.org
-#
-
-#require 'thread'
 
 
 module OpenWFE
@@ -70,12 +53,6 @@ module OpenWFE
   #
   class ReserveExpression < FlowExpression
 
-    #
-    # A mutex for the whole class, it's meant to prevent 'reserve'
-    # from reserving a workflow mutex simultaneaously.
-    #
-    #@@mutex = Mutex.new
-
     names :reserve
 
     #
@@ -95,24 +72,20 @@ module OpenWFE
 
     def apply (workitem)
 
-      return reply_to_parent(workitem) \
-        if @children.size < 1
+      return reply_to_parent(workitem) if has_no_expression_child
 
-      @mutex_name = lookup_string_attribute :mutex, workitem
-
-      #FlowMutex.synchronize do
+      @mutex_name = lookup_string_attribute(:mutex, workitem)
 
       mutex = lookup_variable(@mutex_name) || FlowMutex.new(@mutex_name)
 
-      mutex.register self, workitem
-      #end
+      mutex.register(self, workitem)
     end
 
     def reply (workitem)
 
-      lookup_variable(@mutex_name).release self
+      lookup_variable(@mutex_name).release(self)
 
-      reply_to_parent workitem
+      reply_to_parent(workitem)
     end
 
     #
@@ -123,7 +96,7 @@ module OpenWFE
 
       super
 
-      lookup_variable(@mutex_name).release self
+      lookup_variable(@mutex_name).release(self)
     end
 
     #
@@ -131,8 +104,7 @@ module OpenWFE
     #
     def enter (workitem=nil)
 
-      get_expression_pool.apply(
-        @children[0], workitem || @applied_workitem)
+      apply_child(first_expression_child, workitem || @applied_workitem)
     end
   end
 
@@ -169,14 +141,14 @@ module OpenWFE
 
       @feis << fexp.fei
 
-      fexp.set_variable @mutex_name, self
+      fexp.set_variable(@mutex_name, self)
 
       if @feis.size == 1
         #
         # immediately let the expression enter the critical section
         #
-        fexp.store_itself
-        fexp.enter workitem
+        #fexp.store_itself
+        fexp.enter(workitem)
       else
         #
         # later...
@@ -190,17 +162,14 @@ module OpenWFE
 
       next_fei = nil
 
-      #@@class_mutex.synchronize do
-
       current_fei = @feis.delete_at 0
 
-      releaser.set_variable @mutex_name, self
+      releaser.set_variable(@mutex_name, self)
 
       log.warn "release() BAD! c:#{current_fei} r:#{releaser.fei}" \
         if releaser.fei != current_fei
 
       next_fei = @feis.first
-      #end
 
       return unless next_fei
 

data/lib/openwfe/expressions/fe_save.rb

@@ -1,50 +1,31 @@
-#
 #--
-# Copyright (c) 2007-2008, John Mettraux, OpenWFE.org
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
+# Copyright (c) 2007-2009, John Mettraux, jmettraux@gmail.com
 #
-# . Redistributions of source code must retain the above copyright notice, this
-#   list of conditions and the following disclaimer.
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
 #
-# . 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.
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
 #
-# . 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.
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
 #
-# 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.
+# Made in Japan.
 #++
-#
-
-#
-# "made in Japan"
-#
-# John Mettraux at openwfe.org
-#
 
 require 'openwfe/workitem'
 require 'openwfe/expressions/merge'
 
 
-#
-# save and restore
-#
-
 module OpenWFE
 
   #
@@ -71,23 +52,23 @@ module OpenWFE
 
     def apply (workitem)
 
-      field = lookup_string_attribute :to_field, workitem
-      variable = lookup_string_attribute :to_variable, workitem
+      field = lookup_string_attribute(:to_field, workitem)
+      variable = lookup_string_attribute(:to_variable, workitem)
 
       wi = workitem.dup
 
       if field
 
-        workitem.set_attribute field, wi.attributes
+        workitem.set_attribute(field, wi.attributes)
 
       elsif variable
 
-        set_variable variable, wi
+        set_variable(variable, wi)
       end
 
       # else, simply don't save
 
-      reply_to_parent workitem
+      reply_to_parent(workitem)
     end
   end
 
@@ -186,7 +167,7 @@ module OpenWFE
 
       source = if from_field
 
-        att = workitem.lookup_attribute from_field
+        att = workitem.lookup_attribute(from_field)
 
         lwarn {
           "apply() field '#{from_field}' is NOT a hash, " +
@@ -197,7 +178,7 @@ module OpenWFE
 
       elsif from_variable
 
-        lookup_variable from_variable
+        lookup_variable(from_variable)
 
       elsif value
 
@@ -211,63 +192,63 @@ module OpenWFE
       if source
 
         workitem = if merge_lead
-          do_merge merge_lead, workitem, source
+          do_merge(merge_lead, workitem, source)
         else
-          do_overwrite workitem, source
+          do_overwrite(workitem, source)
         end
       end
       # else, don't restore anything
 
-      reply_to_parent workitem
+      reply_to_parent(workitem)
     end
 
     protected
 
-      #
-      # The default case, restored values simply overwrite current
-      # values.
-      #
-      def do_overwrite (workitem, source)
+    #
+    # The default case, restored values simply overwrite current
+    # values.
+    #
+    def do_overwrite (workitem, source)
 
-        return workitem unless source
-
-        attributes = if source.kind_of?(WorkItem)
-          OpenWFE::fulldup source.attributes
-        else
-          source
-        end
+      return workitem unless source
 
-        to_field = lookup_string_attribute :to_field, workitem
+      attributes = if source.kind_of?(WorkItem)
+        OpenWFE.fulldup(source.attributes)
+      else
+        source
+      end
 
-        if to_field
-          workitem.set_attribute to_field, attributes
-        else
-          workitem.attributes = attributes
-        end
+      to_field = lookup_string_attribute(:to_field, workitem)
 
-        workitem
+      if to_field
+        workitem.set_attribute(to_field, attributes)
+      else
+        workitem.attributes = attributes
       end
 
-      #
-      # If the attribute 'merge-lead' (or 'merge_lead') is specified,
-      # the workitems get merged.
-      #
-      def do_merge (merge_lead, workitem, source)
+      workitem
+    end
 
-        if source.kind_of?(Hash)
-          wi = InFlowWorkItem.new
-          wi.attributes = source
-          source = wi
-        end
+    #
+    # If the attribute 'merge-lead' (or 'merge_lead') is specified,
+    # the workitems get merged.
+    #
+    def do_merge (merge_lead, workitem, source)
 
-        wiTarget, wiSource = if merge_lead == :current
-          [ source, workitem ]
-        else
-          [ workitem, source ]
-        end
+      if source.kind_of?(Hash)
+        wi = InFlowWorkItem.new
+        wi.attributes = source
+        source = wi
+      end
 
-        merge_workitems wiTarget, wiSource
+      wi_target, wi_source = if merge_lead == :current
+        [ source, workitem ]
+      else
+        [ workitem, source ]
       end
+
+      merge_workitems(wi_target, wi_source)
+    end
   end
 
 end

data/lib/openwfe/expressions/fe_sequence.rb

@@ -1,41 +1,27 @@
-#
 #--
-# Copyright (c) 2006-2008, John Mettraux, OpenWFE.org
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
+# Copyright (c) 2006-2009, John Mettraux, jmettraux@gmail.com
 #
-# . Redistributions of source code must retain the above copyright notice, this
-#   list of conditions and the following disclaimer.
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
 #
-# . 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.
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
 #
-# . 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.
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
 #
-# 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.
+# Made in Japan.
 #++
-#
 
-#
-# "made in Japan"
-#
-# John Mettraux at openwfe.org
-#
 
 require 'openwfe/expressions/flowexpression'
 
@@ -63,64 +49,53 @@ module OpenWFE
 
     names :sequence
 
-
     def apply (workitem)
 
-      reply workitem
+      reply(workitem)
     end
 
     def reply (workitem)
 
-      cfei = next_child workitem.fei
+      child_index = next_child_index(workitem.fei)
 
-      return reply_to_parent(workitem) \
-        unless cfei
+      return reply_to_parent(workitem) unless child_index
 
-      #ldebug do
-      #  "reply() self : \n#{self.to_s}\n" +
-      #  "reply() next is #{@current_child_id} : #{cfei.to_debug_s}"
-      #end
+      @children.clear if @children
+        # keeping track of only 1 child, it's a sequence ...
 
-      get_expression_pool.apply cfei, workitem
+      apply_child(child_index, workitem)
     end
 
     protected
 
-      #
-      # Returns the flowExpressionId of the next child to apply, or
-      # nil if the sequence is over.
-      #
-      def next_child (current_fei)
-
-        # using @current_id as 'memo' of the current position
-
-        @current_id = nil \
-          if @current_id and (@children[@current_id] != current_fei)
-            #
-            # the list of children changed, forget the current position
-            # will have to redetermine it ...
-
-        @current_id = if @current_id
-          @current_id + 1
-        elsif current_fei == self.fei
-          0
-        else
-          @children.index(current_fei) + 1
-        end
-
-        loop do
+    #
+    # Returns the child_index (in the raw_children array) of the next child
+    # to apply, or nil if the sequence is over.
+    #
+    def next_child_index (returning_fei)
+
+      next_id = if returning_fei.is_a?(Integer)
+        returning_fei + 1
+      elsif returning_fei == self.fei
+        0
+      else
+        returning_fei.child_id.to_i + 1
+      end
 
-          break if @current_id >= @children.length
+      loop do
 
-          child = @children[@current_id]
+        break if next_id > raw_children.length
 
-          return child if child.is_a?(FlowExpressionId)
+        raw_child = raw_children[next_id]
 
-          @current_id += 1
-        end
+        return next_id \
+          if raw_child.is_a?(Array) or raw_child.is_a?(FlowExpressionId)
 
-        nil
+        next_id += 1
       end
+
+      nil
+    end
   end
 
 end