openwferu 0.9.16 → 0.9.17

data/lib/openwfe/util/ometa.rb

@@ -1,6 +1,6 @@
 #
 #--
-# Copyright (c) 2006-2007, John Mettraux, OpenWFE.org
+# Copyright (c) 2006-2008, John Mettraux, OpenWFE.org
 # All rights reserved.
 # 
 # Redistribution and use in source and binary forms, with or without 
@@ -30,8 +30,6 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #++
 #
-#  $Id: definitions.rb 2725 2006-06-02 13:26:32Z jmettraux $
-#
 
 #
 # "made in Japan"

data/lib/openwfe/util/workqueue.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 

data/lib/openwfe/utils.rb

@@ -1,6 +1,6 @@
 #
 #--
-# Copyright (c) 2005-2007, John Mettraux, OpenWFE.org
+# Copyright (c) 2005-2008, John Mettraux, OpenWFE.org
 # All rights reserved.
 # 
 # Redistribution and use in source and binary forms, with or without 
@@ -57,14 +57,6 @@ module OpenWFE
         xmlElt.elements.detect { |elt| elt.name == elementName }
     end
 
-    #
-    # Used in tests, is equivalent to Perl's die() method.
-    #
-    def OpenWFE.die (text)
-        puts text
-        exit 1
-    end
-
     #
     # see 
     # http://wiki.rubygarden.org/Ruby/page/show/Make_A_Deep_Copy_Of_An_Object
@@ -88,6 +80,10 @@ module OpenWFE
     def OpenWFE.fulldup (object)
 
         return nil if object == nil
+    
+        return object.fulldup if object.respond_to?("fulldup")
+            # trusting client objects providing a fulldup() implementation
+            # Tomaso Tosolini 2007.12.11
 
         return object if object.kind_of?(Float)
         return object if object.kind_of?(Fixnum)
@@ -115,7 +111,7 @@ module OpenWFE
 
         begin
             o = object.class.new
-        rescue ArgumentError
+        rescue ArgumentError => ae
             return deep_clone(object)
         end
 
@@ -270,7 +266,7 @@ module OpenWFE
     # Sets the name of the current thread (the attribute :name if it is
     # a ruby thread, the java thread name if we're in JRuby)
     #
-    def set_current_thread_name (name)
+    def OpenWFE.set_current_thread_name (name)
        if defined?(JRUBY_VERSION)
            require 'java'
            java.lang.Thread.current_thread.name = "#{name} (Ruby Thread)"
@@ -349,6 +345,9 @@ module OpenWFE
     end
 
 
+    #
+    # (2008.03.12 Deprecated, kept here for a while
+    # for backward compatibility)
     #
     # A simple Hash that accepts String or Symbol as lookup keys []
     #
@@ -474,6 +473,29 @@ module OpenWFE
         container[key[i+1..-1]] = value
     end
 
+    #
+    # This method is used within the InFlowWorkItem and the CsvTable classes.
+    #
+    def OpenWFE.unset_attribute (container, key)
+
+        i = key.rindex(".")
+
+        if not i
+            container.delete key
+            return
+        end
+
+        container = lookup_attribute container, key[0..i-1]
+
+        if container.is_a?(Array)
+
+            container.delete_at key[i+1..-1].to_i
+        else
+
+            container.delete key[i+1..-1]
+        end
+    end
+
     #
     # Returns true if this host is currently online (has access to the web / 
     # internet).

data/lib/openwfe/version.rb

@@ -1,6 +1,6 @@
 #
 #--
-# Copyright (c) 2005-2007, John Mettraux, OpenWFE.org
+# Copyright (c) 2005-2008, John Mettraux, OpenWFE.org
 # All rights reserved.
 # 
 # Redistribution and use in source and binary forms, with or without 
@@ -32,5 +32,5 @@
 #
 
 module OpenWFE
-    OPENWFERU_VERSION = '0.9.16'
+    OPENWFERU_VERSION = '0.9.17'
 end

data/lib/openwfe/workitem.rb

@@ -1,6 +1,6 @@
 #
 #--
-# Copyright (c) 2005-2007, John Mettraux, OpenWFE.org
+# Copyright (c) 2005-2008, John Mettraux, OpenWFE.org
 # All rights reserved.
 # 
 # Redistribution and use in source and binary forms, with or without 
@@ -72,10 +72,12 @@ module OpenWFE
         # Sets the last_modified field to now
         #
         def touch
+
             @last_modified = Time.now
         end
 
         def to_h
+
             h = {}
             h[:type] = self.class.name
             h[:last_modified] = @last_modified
@@ -84,12 +86,48 @@ module OpenWFE
         end
 
         def WorkItem.from_h (h)
-            wi = eval("#{h[:type]}.new")
+
+            #wi = eval("#{h[:type]}.new")
+            wi = OpenWFE.get_class(h).new
             wi.last_modified = h[:last_modified]
             wi.attributes = h[:attributes]
             wi
         end
 
+        #
+        # A shortcut for 
+        #
+        #     workitem.attributes['key']
+        #
+        # is
+        #
+        #     workitem['key']
+        #
+        # (Note that
+        #
+        #     workitem.key
+        #
+        # will raise an exception if there is no attribute key).
+        #
+        def [] (key)
+
+            @attributes[key]
+        end
+
+        #
+        # A shortcut for 
+        #
+        #     workitem.attributes['key'] = value
+        #
+        # is
+        #
+        #     workitem['key'] = value
+        #
+        def []= (key, value)
+
+            @attributes[key] = value
+        end
+
         #
         # In order to simplify code like :
         #
@@ -119,15 +157,14 @@ module OpenWFE
                 raise "Missing attribute '#{methodname}' in workitem"
             end
 
-            if methodname == "[]" and args.length == 1
-                value = @attributes[args[0]]
-                return value if value
-                raise "Missing attribute '#{methodname}' in workitem"
-            end
-
-            if methodname == "[]=" and args.length == 2
-                return @attributes[args[0]] = args[1]
-            end
+            #if methodname == "[]" and args.length == 1
+            #    value = @attributes[args[0]]
+            #    return value if value
+            #    raise "Missing attribute '#{methodname}' in workitem"
+            #end
+            #if methodname == "[]=" and args.length == 2
+            #    return @attributes[args[0]] = args[1]
+            #end
 
             if args.length == 1 and methodname[-1, 1] == "="
                 return @attributes[methodname[0..-2]] = args[0]
@@ -188,9 +225,17 @@ module OpenWFE
             OpenWFE.set_attribute(@attributes, key, value)
         end
 
+        #
+        # unset_attribute() accomodates itself with nested key constructs.
+        #
+        def unset_attribute (key)
+            OpenWFE.unset_attribute(@attributes, key)
+        end
+
         alias :lookup_field :lookup_attribute
         alias :has_field? :has_attribute?
         alias :set_field :set_attribute
+        alias :unset_field :unset_attribute
 
     end
 
@@ -283,6 +328,7 @@ module OpenWFE
         # Rebuilds an InFlowWorkItem from its hash version.
         #
         def InFlowWorkItem.from_h (h)
+
             wi = super
             wi.dispatch_time = h[:dispatch_time]
             wi.history = h[:history]
@@ -294,6 +340,7 @@ module OpenWFE
         # Sets the '__result__' field of this workitem
         #
         def set_result (result)
+
             @attributes[FIELD_RESULT] = result
         end
 
@@ -301,6 +348,7 @@ module OpenWFE
         # Makes sure the '__result__' field of this workitem is empty.
         #
         def unset_result
+
             @attributes.delete FIELD_RESULT
         end
 
@@ -310,6 +358,7 @@ module OpenWFE
         #     workitem.attributes["__result__"]
         #
         def get_result
+
             @attributes[FIELD_RESULT]
         end
 
@@ -317,9 +366,10 @@ module OpenWFE
         # Returns true or false.
         #
         def get_boolean_result
+
             r = get_result
             return false unless r
-            return (r == true or r == "true")
+            (r == true or r == "true")
         end
     end
 
@@ -332,6 +382,7 @@ module OpenWFE
     class CancelItem < InFlowItem
 
         def initialize (workitem)
+
             super()
             @flow_expression_id = workitem.fei.dup
         end
@@ -402,12 +453,14 @@ module OpenWFE
         # serializable to other formats).
         #
         def to_h
+
             h = super
             h[:workflow_definition_url] = @workflow_definition_url
             h
         end
 
         def LaunchItem.from_h (h)
+
             li = super
             li.workflow_definition_url = h[:workflow_definition_url]
             li
@@ -419,10 +472,19 @@ module OpenWFE
     # LaunchItem).
     #
     def OpenWFE.workitem_from_h (h)
-        wi_class = h[:type]
-        wi_class = eval(wi_class)
+
+        #wi_class = eval(h[:type])
+        wi_class = get_class(h)
         wi_class.from_h(h)
     end
 
+    def OpenWFE.get_class (h)
+
+        cl = h[:type]
+        return nil if cl.index(";")
+        return nil if cl.index(" ")
+        eval(cl)
+    end
+
 end
 

data/lib/openwfe/worklist/storelocks.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,8 +39,8 @@
 #
 
 require 'thread'
+require 'rufus/otime'
 require 'openwfe/contextual'
-require 'openwfe/util/otime'
 
 
 module OpenWFE
@@ -87,7 +87,7 @@ module OpenWFE
             self.application_context = application_context
 
             @lock_max_age = params[:lock_max_age] || DEFAULT_LOCK_MAX_AGE
-            @lock_max_age = OpenWFE::parse_time_string @lock_max_age
+            @lock_max_age = Rufus::parse_time_string @lock_max_age
 
             @locks = {}
             @lock_mutex = Mutex.new
@@ -133,6 +133,7 @@ module OpenWFE
         # Gets a workitem without locking it.
         #
         def get (key)
+
             @store[key]
         end
 
@@ -184,6 +185,7 @@ module OpenWFE
         # Directly forwards the list_workitems() call to the wrapped store.
         #
         def list_workitems (workflow_instance_id=nil)
+
             @store.list_workitems(workflow_instance_id)
         end
 
@@ -191,6 +193,7 @@ module OpenWFE
         # Returns the count of workitems in the store.
         #
         def size
+
             @store.size
         end
 
@@ -198,6 +201,7 @@ module OpenWFE
         # Just calls the consume method of the underlying store.
         #
         def consume (workitem)
+
             @store.consume workitem
         end
 
@@ -207,7 +211,7 @@ module OpenWFE
         # Doesn't care about any order for now.
         #
         def each (&block) # :yields: workitem, locked
-            return unless block
+
             @store.each do |fei, workitem|
                 block.call workitem, locked?(fei)
             end
@@ -247,6 +251,7 @@ module OpenWFE
             # Returns true if the object is locked
             #
             def locked? (key)
+
                 @locks[key] != nil
             end
 

data/lib/openwfe/worklist/storeparticipant.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 

data/test/back_0916_test.rb

@@ -0,0 +1,101 @@
+
+#
+# Testing OpenWFE
+#
+# John Mettraux at openwfe.org
+#
+# Tue Feb 19 10:58:43 JST 2008
+#
+
+require 'test/unit'
+require 'fileutils'
+require 'openwfe/def'
+require 'openwfe/engine/file_persisted_engine'
+
+include OpenWFE
+
+
+class Back0916Test < Test::Unit::TestCase
+
+    WORK = 'work_back'
+
+    def setup
+
+        FileUtils.rm_rf WORK
+        FileUtils.mkdir WORK
+
+        `cd work_back && tar xzvf ../test/expool_20031219_0916.tgz`
+
+        ac = { :work_directory => WORK }
+
+        @engine = FilePersistedEngine.new ac
+
+    end
+
+    def teardown
+
+        $OWFE_LOG.level = Logger::INFO
+        FileUtils.rm_rf WORK
+    end
+
+    def test_0
+
+        #$OWFE_LOG.level = Logger::DEBUG
+
+        trace = []
+
+        @engine.register_participant :alpha do
+            trace << :alpha
+        end
+
+        @engine.reload
+
+        ps = @engine.process_status "20080212-moshijuzuke" # an XML process
+        exp = ps.expressions.first
+        wi = exp.applied_workitem
+        wi.message = "back from obsolesence"
+
+        @engine.reply wi
+
+        sleep 0.350
+
+        assert_equal [ :alpha ], trace
+
+        ps = @engine.process_status "20080212-moshijuzuke" # an XML process
+
+        assert_nil ps
+    end
+
+    def test_1
+
+        #$OWFE_LOG.level = Logger::DEBUG
+
+        trace = []
+
+        #@engine.register_participant :employee do
+        #    trace << :assistant
+        #end
+        #@engine.register_participant :employee do
+        #    trace << :employee
+        #end
+        [ :user_bob, :user_alice ].each do |p|
+            @engine.register_participant p do
+                trace << p
+            end
+        end
+
+        @engine.reload
+
+        ps = @engine.process_status "20080213-depejetzube" # an ruby procdef
+        exp = ps.expressions.first
+        wi = exp.applied_workitem
+
+        @engine.reply wi
+
+        sleep 0.400
+
+        assert_equal [ :user_bob, :user_bob ], trace
+
+        assert_nil @engine.process_status("20080213-depejetzube")
+    end
+end