ruote 0.9.18 → 0.9.19

data/lib/openwfe/rudefinitions.rb

@@ -2,31 +2,31 @@
 #--
 # Copyright (c) 2006-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.
 #++
 #
@@ -43,88 +43,84 @@ require 'openwfe/version'
 
 module OpenWFE
 
-    #
-    # service names
+  #
+  # service names
 
-    S_LOGGER = :logger
+  #S_LOGGER = :logger
 
-    S_ENGINE = 'engine'
-    S_EXPRESSION_MAP = 'expressionMap'
-    S_WFID_GENERATOR = 'wfidGenerator'
-    S_WORKQUEUE = 'workQueue'
-    S_EXPRESSION_POOL = 'expressionPool'
-    S_EXPRESSION_STORAGE = 'expressionStorage'
-    S_PARTICIPANT_MAP = 'participantMap'
-    S_SCHEDULER = 'scheduler'
-    S_ERROR_JOURNAL = 'errorJournal'
+  #
+  # some special expression names
 
-    #
-    # some special expression names
+  EN_ENVIRONMENT = 'environment'
 
-    EN_ENVIRONMENT = 'environment'
+  #
+  # some file storage default values
 
-    # 
-    # some file storage default values
+  DEFAULT_WORK_DIRECTORY = 'work'
 
-    DEFAULT_WORK_DIRECTORY = 'work'
+  #
+  # A mixin for easy OpenWFE service lookup
+  # (assumes the presence of an application context instance var)
+  #
+  module OwfeServiceLocator
+
+    def get_engine
+      @application_context[:s_engine]
+    end
+    def get_scheduler
+      @application_context[:s_scheduler]
+    end
+    def get_expression_map
+      @application_context[:s_expression_map]
+    end
+    def get_wfid_generator
+      @application_context[:s_wfid_generator]
+    end
+    def get_workqueue
+      @application_context[:s_workqueue]
+    end
+    def get_expool
+      @application_context[:s_expression_pool]
+    end
+    def get_expression_pool
+      @application_context[:s_expression_pool]
+    end
+    def get_expression_storage
+      @application_context[:s_expression_storage]
+    end
+    def get_participant_map
+      @application_context[:s_participant_map]
+    end
+    def get_error_journal
+      @application_context[:s_error_journal]
+    end
+    def get_tree_checker
+      @application_context[:s_tree_checker]
+    end
+    def get_def_parser
+      @application_context[:s_def_parser]
+    end
+
+    #
+    # Returns the 'journal' service (or nil if there is no
+    # journal service available).
+    #
+    def get_journal
+      @application_context[:s_journal]
+    end
 
     #
-    # A mixin for easy OpenWFE service lookup
-    # (assumes the presence of an application context instance var)
+    # Returns all the expression storage in the application context
+    # (there is usually a cache and a persisted exp storage).
     #
-    module OwfeServiceLocator
-
-        def get_engine
-            @application_context[S_ENGINE]
-        end
-        def get_scheduler
-            @application_context[S_SCHEDULER]
-        end
-        def get_expression_map
-            @application_context[S_EXPRESSION_MAP]
-        end
-        def get_wfid_generator
-            @application_context[S_WFID_GENERATOR]
-        end
-        def get_workqueue
-            @application_context[S_WORKQUEUE]
-        end
-        def get_expool
-            @application_context[S_EXPRESSION_POOL]
-        end
-        def get_expression_pool
-            @application_context[S_EXPRESSION_POOL]
-        end
-        def get_expression_storage
-            @application_context[S_EXPRESSION_STORAGE]
-        end
-        def get_participant_map
-            @application_context[S_PARTICIPANT_MAP]
-        end
-        def get_error_journal
-            @application_context[S_ERROR_JOURNAL]
-        end
-
-        #
-        # Returns the 'journal' service (or nil if there is no
-        # journal service available).
-        #
-        def get_journal
-            @application_context['journal']
-        end
-        
-        #
-        # Returns all the expression storage in the application context
-        # (there is usually a cache and a persisted exp storage).
-        #
-        def get_expression_storages
-
-            @application_context.inject([]) do |r, (k, v)|
-                r << v if OpenWFE::starts_with(k.to_s, S_EXPRESSION_STORAGE)
-                r
-            end
-        end
+    def get_expression_storages
+
+      @application_context.inject([]) do |r, (k, v)|
+        r << v if k.to_s.match(/^s_expression_storage/)
+        r
+      end
     end
+  end
 
 end
 

data/lib/openwfe/service.rb

@@ -1,32 +1,32 @@
 #
 #--
-# 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 
+#
+# 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.
 #++
 #
@@ -43,61 +43,61 @@ require 'openwfe/contextual'
 
 module OpenWFE
 
+  #
+  # Most of the functionalities of an OpenWFEru service are implemented
+  # here as a mixin. It's then easy to either extend Service or include
+  # ServiceMixin, to compose an OpenWFEru service class.
+  #
+  module ServiceMixin
+    include Contextual
+    include Logging
+
     #
-    # Most of the functionalities of an OpenWFEru service are implemented
-    # here as a mixin. It's then easy to either extend Service or include
-    # ServiceMixin, to compose an OpenWFEru service class.
+    # The name of the service
     #
-    module ServiceMixin
-        include Contextual
-        include Logging
-
-        #
-        # The name of the service
-        #
-        attr_accessor :service_name
-
-        #
-        # Inits the service by setting the service name and the application
-        # context. Does also bind the service under the service name in the
-        # application context.
-        #
-        def service_init (service_name, application_context)
-
-            @service_name = service_name
-            @application_context = application_context
-
-            @application_context[@service_name.to_s] = self \
-                if @service_name and @application_context
-        end
-
-        #
-        # Some services (like the scheduler one for example) need to
-        # free some resources upon stopping. This can be achieved by
-        # overwriting this method.
-        #
-        def stop
-        end
+    attr_accessor :service_name
+
+    #
+    # Inits the service by setting the service name and the application
+    # context. Does also bind the service under the service name in the
+    # application context.
+    #
+    def service_init (service_name, application_context)
+
+      @service_name = service_name
+      @application_context = application_context
+
+      @application_context[@service_name] = self \
+        if @service_name and @application_context
     end
 
     #
-    # A service has a service_name and a link to its application_context.
-    # Via the application_context, it can lookup other services (if it
-    # knows their names).
+    # Some services (like the scheduler one for example) need to
+    # free some resources upon stopping. This can be achieved by
+    # overwriting this method.
     #
-    class Service
-        include ServiceMixin
+    def stop
+    end
+  end
+
+  #
+  # A service has a service_name and a link to its application_context.
+  # Via the application_context, it can lookup other services (if it
+  # knows their names).
+  #
+  class Service
+    include ServiceMixin
 
-        def initialize (service_name, application_context)
+    def initialize (service_name, application_context)
 
-            service_init service_name, application_context
-        end
+      service_init service_name, application_context
     end
+  end
 
-    #def register (service)
-    #    service.application_context[service.service_name] = service
-    #    return service
-    #end
+  #def register (service)
+  #  service.application_context[service.service_name] = service
+  #  return service
+  #end
 
 end
 

data/lib/openwfe/storage/yamlcustom.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.
 #++
 #
@@ -41,66 +41,66 @@ require 'yaml'
 
 
 module OpenWFE
-    
-    #
-    # reopening some classes in order to facilitate their
-    # yaml serialization
-    #
-    
-    #
-    # opening for tuning yaml persistence
-    #
-    class FlowExpression
 
-        def to_yaml_properties
+  #
+  # reopening some classes in order to facilitate their
+  # yaml serialization
+  #
 
-            l = super
+  #
+  # opening for tuning yaml persistence
+  #
+  class FlowExpression
 
-            l.delete("@application_context")
+    def to_yaml_properties
 
-            #l.delete("@timeout_job_id")
-            #l.delete("@scheduler_job_id")
-                # scheduler ids should not get persisted
+      l = super
 
-            l
-        end
-    end
+      l.delete("@application_context")
+
+      #l.delete("@timeout_job_id")
+      #l.delete("@scheduler_job_id")
+        # scheduler ids should not get persisted
 
-    #
-    # making sure that the FlowExpressionId is serialized as a unique String
-    #
-    class FlowExpressionId
-
-        yaml_as "tag:ruby.yaml.org,2002:#{self}"
-
-        #--
-        #def to_yaml (opts={})
-        #    @s = to_s
-        #    super
-        #end
-        #def to_yaml_properties
-        #    [ "@s" ]
-        #end
-        #++
-
-        def to_yaml (opts={})
-
-            YAML::quick_emit(self.object_id, opts) do |out|
-                out.map(taguri) do |map|
-                    map.add "s", to_s
-                end
-            end
+      l
+    end
+  end
+
+  #
+  # making sure that the FlowExpressionId is serialized as a unique String
+  #
+  class FlowExpressionId
+
+    yaml_as "tag:ruby.yaml.org,2002:#{self}"
+
+    #--
+    #def to_yaml (opts={})
+    #  @s = to_s
+    #  super
+    #end
+    #def to_yaml_properties
+    #  [ "@s" ]
+    #end
+    #++
+
+    def to_yaml (opts={})
+
+      YAML::quick_emit(self.object_id, opts) do |out|
+        out.map(taguri) do |map|
+          map.add "s", to_s
         end
+      end
+    end
 
-        def FlowExpressionId.yaml_new (klass, tag, val)
+    def FlowExpressionId.yaml_new (klass, tag, val)
 
-            s = val["s"]
-            begin
-                FlowExpressionId.to_fei s
-            rescue Exception => e
-                raise "failed to decode FlowExpressionId out of '#{s}'"
-            end
-        end
+      s = val["s"]
+      begin
+        FlowExpressionId.to_fei s
+      rescue Exception => e
+        raise "failed to decode FlowExpressionId out of '#{s}'"
+      end
     end
-end    
+  end
+end