ruote 0.9.19 → 0.9.20

data/lib/openwfe/expressions/fe_filter_definition.rb

@@ -1,41 +1,27 @@
-#
 #--
-# Copyright (c) 2007, 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/filterdef'
 
@@ -102,13 +88,12 @@ module OpenWFE
     #
     def apply (workitem)
 
-      filter = build_filter workitem
-      filter_name = lookup_attribute :name, workitem
+      filter = build_filter(workitem)
+      filter_name = lookup_attribute(:name, workitem)
 
-      set_variable filter_name, filter \
-        if filter_name and filter
+      set_variable(filter_name, filter) if filter_name and filter
 
-      reply_to_parent workitem
+      reply_to_parent(workitem)
     end
 
     protected
@@ -123,25 +108,22 @@ module OpenWFE
 
         # filter attributes
 
-        type = lookup_downcase_attribute :type, workitem
-        closed = lookup_downcase_attribute :closed, workitem
+        type = lookup_downcase_attribute(:type, workitem)
+        closed = lookup_downcase_attribute(:closed, workitem)
 
-        filter.closed = (type == "closed" or closed == "true")
+        filter.closed = (type == 'closed' or closed == 'true')
 
-        add = lookup_downcase_attribute :add, workitem
-        remove = lookup_downcase_attribute :remove, workitem
+        add = lookup_downcase_attribute(:add, workitem)
+        remove = lookup_downcase_attribute(:remove, workitem)
 
-        filter.add_allowed = (add == "true")
-        filter.remove_allowed = (remove == "true")
+        filter.add_allowed = (add == 'true')
+        filter.remove_allowed = (remove == 'true')
 
         # field by field
 
-        @children.each do |fei|
-
-          rawexp = get_expression_pool.fetch_expression fei
-          get_expression_pool.remove fei
+        raw_expression_children.each do |rawchild|
 
-          add_field filter, rawexp, workitem
+          add_field(filter, rawchild, workitem)
         end
 
         filter
@@ -150,17 +132,18 @@ module OpenWFE
       #
       # builds and add a field (a line) of the filter.
       #
-      def add_field (filter, rawexp, workitem)
+      def add_field (filter, rawchild, workitem)
 
+        rawexp = RawExpression.new_raw(
+          nil, nil, @environment_id, @application_context, rawchild)
         rawexp.load_attributes
 
-        regex = rawexp.lookup_attribute :regex, workitem
-        regex = rawexp.lookup_attribute :name, workitem unless regex
+        regex = rawexp.lookup_attribute(:regex, workitem)
+        regex = rawexp.lookup_attribute(:name, workitem) unless regex
 
-        permissions =
-          rawexp.lookup_downcase_attribute :permissions, workitem
+        permissions = rawexp.lookup_downcase_attribute(:permissions, workitem)
 
-        filter.add_field regex, permissions
+        filter.add_field(regex, permissions)
       end
   end
 

data/lib/openwfe/expressions/fe_fqv.rb

@@ -1,45 +1,32 @@
-#
 #--
-# 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 'json' # gem 'json_pure'
 
 require 'openwfe/util/xml'
+require 'openwfe/util/json'
 require 'openwfe/expressions/flowexpression'
 
 
@@ -80,7 +67,7 @@ module OpenWFE
     def apply (workitem)
 
       name = @fei.expression_name[0, 1]
-      text = fetch_text_content workitem
+      text = fetch_text_content(workitem)
 
       method = MAP[name]
 
@@ -94,9 +81,9 @@ module OpenWFE
     protected
 
       MAP = {
-        "f" => :field,
-        "q" => :quote,
-        "v" => :variable
+        'f' => :field,
+        'q' => :quote,
+        'v' => :variable
       }
 
       def field (text, workitem)
@@ -114,7 +101,7 @@ module OpenWFE
 
   #
   # The 'a' or 'attribute' expression. Directly describing some
-  # variable or list content in XML or in YAML.
+  # variable or list content in XML, YAML or JSON.
   #
   #   _set :field => "list" do
   #     _a """
@@ -157,6 +144,17 @@ module OpenWFE
   #     a '[1,2,false,"my name"]'
   #   end
   #
+  # or
+  #
+  #   <process-definition name="test" revision="44b9">
+  #     <set-fields>
+  #       <a>{"customer":{"name":"Zigue","age":34},"approved":false}</a>
+  #     </set-fields>
+  #     <sequence>
+  #       <print>${f:customer.name} (${f:customer.age}) ${f:approved}</print>
+  #     </sequence>
+  #   </process-definition>
+  #
   #
   class AttributeExpression < FlowExpression
 
@@ -167,17 +165,15 @@ module OpenWFE
 
     def apply (workitem)
 
-      child = @children.first
+      child = raw_children.first
 
       text = if child.is_a?(String)
 
-        #child
-        fetch_text_content workitem
+        fetch_text_content(workitem)
 
-      elsif child.is_a?(FlowExpressionId)
+      elsif child.is_a?(Array)
 
-        exp = get_expression_pool.fetch_expression child
-        ExpressionTree.to_s exp.raw_representation
+        ExpressionTree.to_s(child)
 
       else
 
@@ -188,20 +184,20 @@ module OpenWFE
 
       result = if text[0, 3] == '---'
 
-        from_yaml text
+        from_yaml(text)
 
       elsif text.match(XML_REGEX)
 
-        from_xml text
+        from_xml(text)
       end
 
-      result = from_json(text) if result == nil
-
-      #p [ :result, result, text ]
+      result = OpenWFE::Json::from_json(text) if result == nil
+        # warning : if 'json' or 'active_support' are not present
+        # from_json() will always return nil
 
       workitem.set_result(result) if result != nil
 
-      reply_to_parent workitem
+      reply_to_parent(workitem)
     end
 
     protected
@@ -210,7 +206,7 @@ module OpenWFE
 
         begin
 
-          YAML.load text
+          YAML.load(text)
 
         rescue Exception => e
           linfo { "from_yaml() failed : #{e}" }
@@ -222,28 +218,13 @@ module OpenWFE
 
         begin
 
-          OpenWFE::Xml.from_xml text
+          OpenWFE::Xml.from_xml(text)
 
         rescue Exception => e
           linfo { "from_xml() failed : #{e}" }
           nil
         end
       end
-
-      def from_json (text)
-
-        begin
-
-          return JSON.parse(text) if defined?(JSON)
-
-          return ActiveSupport::JSON.decode(text) \
-            if defined?(ActiveSupport::JSON)
-
-        rescue Exception => e
-          linfo { "from_json() failed : #{e}" }
-          nil
-        end
-      end
   end
 
 end

data/lib/openwfe/expressions/fe_http.rb

@@ -1,41 +1,27 @@
-#
 #--
-# Copyright (c) 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) 2008-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/verbs'
 require 'openwfe/expressions/flowexpression'

data/lib/openwfe/expressions/fe_if.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/workitem'
 require 'openwfe/flowexpressionid'
@@ -114,12 +100,11 @@ module OpenWFE
         # since OpenWFEru 0.9.16 previous __result__ values
         # are not erased before an 'if'.
 
-      test = eval_condition :test, workitem, :not
+      test = eval_condition(:test, workitem, :not)
 
-      if @children.length < 1
-        #workitem.set_result test if test
+      if raw_children.length < 1
         workitem.set_result((test != nil and test != false))
-        reply_to_parent workitem
+        reply_to_parent(workitem)
         return
       end
 
@@ -127,7 +112,8 @@ module OpenWFE
         #
         # if the "test" attribute is not used, test will be null
 
-      store_itself
+      #store_itself
+        # now done in apply_*
 
       # a warning
 
@@ -135,7 +121,7 @@ module OpenWFE
 
       lwarn {
         "apply() 'if' with more than #{maxchildren} children"
-      } if @children.size > maxchildren
+      } if raw_children.size > maxchildren
 
       # apply next step
 
@@ -143,12 +129,12 @@ module OpenWFE
         #
         # apply then or else (condition result known)
         #
-        apply_consequence test, workitem, 0
+        apply_consequence(test, workitem, 0)
       else
         #
         # apply condition
         #
-        get_expression_pool.apply @children.first, workitem
+        apply_child(0, workitem)
       end
     end
 
@@ -161,9 +147,10 @@ module OpenWFE
 
       @condition_replied = true
 
-      store_itself
+      #store_itself
+        # now done in apply_c*
 
-      apply_consequence result, workitem
+      apply_consequence(result, workitem)
     end
 
     #
@@ -175,7 +162,7 @@ module OpenWFE
     def reply_to_parent (workitem)
 
       clean_children
-      super workitem
+      super(workitem)
     end
 
     protected
@@ -194,10 +181,10 @@ module OpenWFE
 
         index = index + offset
 
-        if index >= @children.length
-          reply_to_parent workitem
+        if index >= raw_children.length
+          reply_to_parent(workitem)
         else
-          get_expression_pool.apply @children[index], workitem
+          apply_child(index, workitem)
         end
       end
   end
@@ -253,21 +240,17 @@ module OpenWFE
 
       @offset = nil
 
-      trigger_child workitem, true
+      trigger_child(workitem, true)
     end
 
     def reply (workitem)
 
       if @evaluating_condition
 
-        result = workitem.get_boolean_result
-
-        #ldebug { "reply() result : '#{result.to_s}' (#{result.class})" }
-
-        trigger_child workitem, !result
+        trigger_child(workitem, ( ! workitem.get_boolean_result))
       else
 
-        reply_to_parent workitem
+        reply_to_parent(workitem)
       end
     end
 
@@ -286,8 +269,8 @@ module OpenWFE
         #ldebug { "trigger_child() is_condition ? #{is_condition}" }
         #ldebug { "trigger_child() next offset is #{@offset}" }
 
-        unless @children[@offset]
-          reply_to_parent workitem
+        unless raw_children[@offset]
+          reply_to_parent(workitem)
           return
         end
 
@@ -295,7 +278,8 @@ module OpenWFE
 
         store_itself
 
-        get_expression_pool.apply(@children[@offset], workitem)
+        #get_expression_pool.apply(@children[@offset], workitem)
+        apply_child(@offset, workitem)
       end
   end