ruote 0.9.19 → 0.9.20

data/lib/openwfe/expressions/timeout.rb

@@ -1,49 +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 'rufus/otime'
 
 
-#
-# Managing timeout for expressions like 'participant' and 'when'
-#
-
 module OpenWFE
 
   #
@@ -53,24 +35,25 @@ module OpenWFE
   module TimeoutMixin
     include Rufus::Schedulable
 
-    attr_accessor \
-      :timeout_at,
-      :timeout_job_id
+    attr_accessor :timeout_at
+    attr_accessor :timeout_job_id
 
     #
     # Looks for the "timeout" attribute in its process definition
     # and then sets the @timeout_at field (if there is a timeout).
     #
-    def determine_timeout (timeout_attname=:timeout)
+    def determine_timeout (workitem, timeout_attname=:timeout)
 
       #@timeout_at = nil
       #@timeout_job_id = nil
 
-      timeout = lookup_attribute(timeout_attname, @applied_workitem)
-      return unless timeout
+      s_timeout = lookup_attribute(timeout_attname, @applied_workitem)
+      return unless s_timeout
 
-      timeout = Rufus::parse_time_string(timeout)
+      timeout = Rufus::parse_time_string(s_timeout)
       @timeout_at = Time.new.to_f + timeout
+
+      stamp_workitem(workitem, s_timeout)
     end
 
     #
@@ -85,9 +68,9 @@ module OpenWFE
     #
     # Combines a call to determine_timeout and to reschedule.
     #
-    def schedule_timeout (timeout_attname=:timeout)
+    def schedule_timeout (workitem, timeout_attname=:timeout)
 
-      determine_timeout(timeout_attname)
+      determine_timeout(workitem, timeout_attname)
       to_reschedule(get_scheduler)
     end
 
@@ -99,7 +82,7 @@ module OpenWFE
     # No method override in a mixin...
     #
     #def reply_to_parent (workitem)
-    #  unschedule_timeout()
+    #  unschedule_timeout(workitem)
     #  super(workitem)
     #end
     #++
@@ -109,7 +92,7 @@ module OpenWFE
     #
     def set_timedout_flag (workitem)
 
-      workitem.attributes["__timed_out__"] = "true"
+      workitem.attributes['__timed_out__'] = 'true'
     end
 
     #
@@ -117,61 +100,84 @@ module OpenWFE
     #
     def remove_timedout_flag (workitem)
 
-      workitem.attributes.delete("__timed_out__")
+      workitem.attributes.delete('__timed_out__')
     end
 
     protected
 
-      #
-      # prefixed with "to_" for easy mix in
-      #
-      def to_reschedule (scheduler)
-
-        #return if @timeout_job_id
-          #
-          # already rescheduled
-
-        return unless @timeout_at
-          #
-          # no need for a timeout
-
-        @timeout_job_id = "timeout_#{self.fei.to_s}"
-
-        scheduler.schedule_at(
-          @timeout_at,
-          { :schedulable => self,
-            :job_id => @timeout_job_id,
-            :do_timeout! => true,
-            :tags => [ "timeout", self.class.name ] })
-
-        ldebug do
-          "to_reschedule() will timeout at " +
-          "#{Rufus::to_iso8601_date(@timeout_at)}" +
-          " @timeout_job_id is #{@timeout_job_id}" +
-          " (oid #{object_id})"
-        end
-
-        #store_itself()
-          #
-          # done in the including expression
-      end
+    def stamp_workitem (wi, timeout)
+
+      return unless wi
 
-      #
-      # Unschedules the timeout
-      #
-      def unschedule_timeout ()
+      key = "#{@fei.wfid}__#{@fei.expid}"
+
+      stamp = [
+        self.class.name, @fei.expname, Time.now.to_f, timeout, @timeout_at
+      ]
+
+      (wi.attributes['__timeouts__'] ||= {})[key] = stamp
+    end
 
-        ldebug do
-          "unschedule_timeout() " +
-          "@timeout_job_id is #{@timeout_job_id}" +
-          " (oid #{object_id})"
-        end
+    def unstamp_workitem (wi)
 
-        #ldebug_callstack "unschedule_timeout()"
+      return unless wi
 
-        get_scheduler.unschedule(@timeout_job_id) \
-          if @timeout_job_id
+      stamps = wi.attributes['__timeouts__']
+      return unless stamps
+
+      stamps.delete("#{@fei.wfid}__#{@fei.expid}")
+    end
+
+    #
+    # prefixed with "to_" for easy mix in
+    #
+    def to_reschedule (scheduler)
+
+      #return if @timeout_job_id
+        #
+        # already rescheduled
+
+      return unless @timeout_at
+        #
+        # no need for a timeout
+
+      @timeout_job_id = "timeout_#{self.fei.to_s}"
+
+      scheduler.schedule_at(
+        @timeout_at,
+        { :schedulable => self,
+          :job_id => @timeout_job_id,
+          :do_timeout! => true,
+          :tags => [ "timeout", self.class.name ] })
+
+      ldebug do
+        "to_reschedule() will timeout at " +
+        "#{Rufus::to_iso8601_date(@timeout_at)}" +
+        " @timeout_job_id is #{@timeout_job_id}" +
+        " (oid #{object_id})"
       end
+
+      #store_itself()
+        #
+        # done in the including expression
+    end
+
+    #
+    # Unschedules the timeout
+    #
+    def unschedule_timeout (workitem)
+
+      #ldebug do
+      #  "unschedule_timeout() " +
+      #  "@timeout_job_id is #{@timeout_job_id}" +
+      #  " (oid #{object_id})"
+      #end
+
+      return unless @timeout_job_id
+
+      get_scheduler.unschedule(@timeout_job_id)
+      unstamp_workitem(workitem)
+    end
   end
 
 end

data/lib/openwfe/expressions/value.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
-#
 
 module OpenWFE
 
@@ -54,68 +40,56 @@ module OpenWFE
 
       escape = lookup_boolean_attribute('escape', workitem, false)
 
-      if @children.length < 1
+      if raw_children.length < 1
 
-        workitem.attributes[FIELD_RESULT] =
-          lookup_value workitem, :escape => escape
+        workitem.set_result(lookup_value(workitem, :escape => escape))
 
-        reply workitem
+        reply(workitem)
         return
       end
 
-      child = @children.first
+      child = raw_children.first
 
-      if child.kind_of?(OpenWFE::FlowExpressionId)
+      if child.is_a?(Array) # child is an expression
 
-        handle_child child, workitem
-        return
-      end
+        if get_expression_map.get_class(child[0]) == DefineExpression
 
-      workitem.attributes[FIELD_RESULT] =
-        fetch_text_content workitem, escape
+          workitem.set_result(child) # bind process
 
-      reply workitem
-    end
+          reply(workitem)
+        else
 
-    def lookup_variable_attribute (workitem)
+          apply_child(0, workitem) # apply child
+        end
 
-      lookup [ "variable", "var", "v" ], workitem
-    end
+      else # child is a piece of text
 
-    def lookup_field_attribute (workitem)
+        workitem.set_result(fetch_text_content(workitem, escape))
 
-      lookup [ "field", "fld", "f" ], workitem
+        reply(workitem)
+      end
     end
 
-    protected
-
-      def handle_child (child, workitem)
-
-        raw_child, _fei = get_expression_pool.fetch(child)
-
-        if raw_child.is_definition?
-
-          #body_fei = get_expression_pool.evaluate child, workitem
-          #workitem.attributes[FIELD_RESULT] = body_fei
+    def lookup_variable_attribute (workitem)
 
-          workitem.attributes[FIELD_RESULT] = raw_child
-            #
-            # storing the child raw expression
+      lookup [ 'variable', 'var', 'v' ], workitem
+    end
 
-          reply workitem
-        else
+    def lookup_field_attribute (workitem)
 
-          get_expression_pool.apply raw_child, workitem
-        end
-      end
+      lookup [ 'field', 'fld', 'f' ], workitem
+    end
 
     private
 
       def lookup (name_array, workitem)
 
         name_array.each do |n|
-          v = lookup_string_attribute n, workitem
-          return v if v
+
+          v = lookup_string_attribute(n, workitem)
+
+          return v if v != nil
+            # covers v = false as well
         end
 
         nil

data/lib/openwfe/extras/engine/ar_engine.rb

@@ -0,0 +1,58 @@
+#--
+# Copyright (c) 2007-2009, Tomaso Tosolini and John Mettraux, OpenWFE.org
+#
+# 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:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# 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.
+#
+# Made in Italy.
+#++
+
+
+require 'openwfe/engine/engine'
+require 'openwfe/extras/expool/ar_expstorage'
+require 'openwfe/extras/expool/db_errorjournal'
+
+
+module OpenWFE::Extras
+
+  #
+  # A simple ArPersistedEngine, pure storage, no caching, no optimization.
+  #
+  class ArPersistedEngine < OpenWFE::Engine
+
+    protected
+
+    #
+    # Overrides the method already found in Engine with a persisted
+    # expression storage
+    #
+    def build_expression_storage
+
+      init_storage(ArExpressionStorage)
+    end
+
+    #
+    # Uses a file persisted error journal.
+    #
+    def build_error_journal
+
+      init_service(:s_error_journal, DbErrorJournal)
+    end
+  end
+end
+