ruote 0.9.18 → 0.9.19

data/lib/openwfe/expressions/iterator.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.
 #++
 #
@@ -40,182 +40,182 @@
 
 module OpenWFE
 
-    #
-    # Iterator instances keep track of the position of an iteration.
-    # This class is meant to be used both by <iterator> and 
-    # <concurrent-iterator>.
-    #
-    class Iterator
-
-        ITERATOR_COUNT = "__ic__"
-        ITERATOR_POSITION = "__ip__"
-
-        attr_accessor :iteration_index
-        attr_accessor :iteration_list
-        attr_accessor :to_field
-        attr_accessor :to_variable
-        attr_accessor :value_separator
+  #
+  # Iterator instances keep track of the position of an iteration.
+  # This class is meant to be used both by <iterator> and
+  # <concurrent-iterator>.
+  #
+  class Iterator
 
-        #
-        # Builds a new iterator, serving a given iterator_expression. 
-        # The second parameter is the workitem (as applied to the iterator
-        # expression).
-        #
-        def initialize (iterator_expression, workitem)
+    ITERATOR_COUNT = "__ic__"
+    ITERATOR_POSITION = "__ip__"
 
-            @to_field = iterator_expression\
-                .lookup_attribute(:to_field, workitem)
-            @to_variable = iterator_expression\
-                .lookup_attribute(:to_variable, workitem)
+    attr_accessor :iteration_index
+    attr_accessor :iteration_list
+    attr_accessor :to_field
+    attr_accessor :to_variable
+    attr_accessor :value_separator
 
-            @value_separator = iterator_expression\
-                .lookup_attribute(:value_separator, workitem)
-
-            @value_separator = /,\s*/ unless @value_separator
-
-            @iteration_index = 0
+    #
+    # Builds a new iterator, serving a given iterator_expression.
+    # The second parameter is the workitem (as applied to the iterator
+    # expression).
+    #
+    def initialize (iterator_expression, workitem)
 
-            #raw_list = iterator_expression.lookup_vf_attribute(
-            #    workitem, :value, :prefix => :on)
-            #raw_list ||= iterator_expression.lookup_attribute(:on, workitem)
+      @to_field = iterator_expression\
+        .lookup_attribute(:to_field, workitem)
+      @to_variable = iterator_expression\
+        .lookup_attribute(:to_variable, workitem)
 
-            raw_list = 
-                iterator_expression.lookup_vf_attribute(
-                    workitem, :value, :prefix => :on) ||
-                iterator_expression.lookup_vf_attribute(
-                    workitem, nil, :prefix => :on)
+      @value_separator = iterator_expression\
+        .lookup_attribute(:value_separator, workitem)
 
-            @iteration_list = extract_iteration_list raw_list
+      @value_separator = /,\s*/ unless @value_separator
 
-            workitem.attributes[ITERATOR_COUNT] = @iteration_list.length
-        end
+      @iteration_index = 0
 
-        #
-        # Has the iteration a next element ?
-        #
-        def has_next?
+      #raw_list = iterator_expression.lookup_vf_attribute(
+      #  workitem, :value, :prefix => :on)
+      #raw_list ||= iterator_expression.lookup_attribute(:on, workitem)
 
-            @iteration_index < @iteration_list.size
-        end
+      raw_list =
+        iterator_expression.lookup_vf_attribute(
+          workitem, :value, :prefix => :on) ||
+        iterator_expression.lookup_vf_attribute(
+          workitem, nil, :prefix => :on)
 
-        #
-        # Returns the size of this iterator, or rather, the size of the
-        # underlying iteration list.
-        #
-        def size
+      @iteration_list = extract_iteration_list raw_list
 
-            @iteration_list.size
-        end
+      workitem.attributes[ITERATOR_COUNT] = @iteration_list.length
+    end
 
-        #
-        # Prepares the iterator expression and the workitem for the next 
-        # iteration.
-        #
-        def next (workitem)
+    #
+    # Has the iteration a next element ?
+    #
+    def has_next?
 
-            position_at workitem, @iteration_index
-        end
+      @iteration_index < @iteration_list.size
+    end
 
-        #
-        # Positions the iterator back at position 0.
-        #
-        def rewind (workitem)
+    #
+    # Returns the size of this iterator, or rather, the size of the
+    # underlying iteration list.
+    #
+    def size
 
-            position_at workitem, 0
-        end
+      @iteration_list.size
+    end
 
-        #
-        # Jumps to a given position in the iterator
-        #
-        def jump (workitem, index)
+    #
+    # Prepares the iterator expression and the workitem for the next
+    # iteration.
+    #
+    def next (workitem)
 
-            index = if index < 0
-                0
-            elsif index >= @iteration_list.size
-                @iteration_list.size
-            else
-                index
-            end
+      position_at workitem, @iteration_index
+    end
 
-            position_at workitem, index
-        end
+    #
+    # Positions the iterator back at position 0.
+    #
+    def rewind (workitem)
 
-        #
-        # Jumps a certain number of positions in the iterator.
-        #
-        def skip (workitem, offset)
+      position_at workitem, 0
+    end
 
-            jump workitem, @iteration_index + offset
-        end
+    #
+    # Jumps to a given position in the iterator
+    #
+    def jump (workitem, index)
 
-        #
-        # The current index (whereas @iteration_index already points to
-        # the next element).
-        #
-        def index
+      index = if index < 0
+        0
+      elsif index >= @iteration_list.size
+        @iteration_list.size
+      else
+        index
+      end
 
-            @iteration_index - 1
-        end
+      position_at workitem, index
+    end
 
-        protected
+    #
+    # Jumps a certain number of positions in the iterator.
+    #
+    def skip (workitem, offset)
 
-            #
-            # Positions the iterator absolutely.
-            #
-            def position_at (workitem, position)
+      jump workitem, @iteration_index + offset
+    end
 
-                result = {}
+    #
+    # The current index (whereas @iteration_index already points to
+    # the next element).
+    #
+    def index
 
-                value = @iteration_list[position]
+      @iteration_index - 1
+    end
 
-                return nil unless value
+    protected
 
-                if @to_field
-                    workitem.attributes[@to_field] = value
-                else
-                    result[@to_variable] = value
-                end
+      #
+      # Positions the iterator absolutely.
+      #
+      def position_at (workitem, position)
 
-                workitem.attributes[ITERATOR_POSITION] = position
-                result[ITERATOR_POSITION] = position
+        result = {}
 
-                @iteration_index = position + 1
+        value = @iteration_list[position]
 
-                result
-            end
+        return nil unless value
 
-            #
-            # Extracts the iteration list from any value.
-            #
-            def extract_iteration_list (raw_list)
+        if @to_field
+          workitem.attributes[@to_field] = value
+        else
+          result[@to_variable] = value
+        end
 
-                if is_suitable_list?(raw_list)
-                    raw_list
-                else
-                    extract_list_from_string raw_list.to_s
-                end
-            end
+        workitem.attributes[ITERATOR_POSITION] = position
+        result[ITERATOR_POSITION] = position
 
-            #
-            # Returns true if the given instance can be directly
-            # used as a list.
-            #
-            def is_suitable_list? (instance)
+        @iteration_index = position + 1
 
-                (not instance.is_a?(String)) and \
-                instance.respond_to? :[] and \
-                instance.respond_to? :length
-            end
+        result
+      end
 
-            #
-            # Extracts the list from the string (comma separated list
-            # usually).
-            #
-            def extract_list_from_string (s)
+      #
+      # Extracts the iteration list from any value.
+      #
+      def extract_iteration_list (raw_list)
 
-                s.split @value_separator
-            end
-    end
+        if is_suitable_list?(raw_list)
+          raw_list
+        else
+          extract_list_from_string raw_list.to_s
+        end
+      end
+
+      #
+      # Returns true if the given instance can be directly
+      # used as a list.
+      #
+      def is_suitable_list? (instance)
+
+        (not instance.is_a?(String)) and \
+        instance.respond_to? :[] and \
+        instance.respond_to? :length
+      end
+
+      #
+      # Extracts the list from the string (comma separated list
+      # usually).
+      #
+      def extract_list_from_string (s)
+
+        s.split @value_separator
+      end
+  end
 
 end
 

data/lib/openwfe/expressions/merge.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.
 #++
 #
@@ -42,43 +42,43 @@ require 'openwfe/utils'
 
 module OpenWFE
 
+  #
+  # Gathering methods for mixing (merging) workitems.
+  #
+  module MergeMixin
+
     #
-    # Gathering methods for mixing (merging) workitems.
+    # Merges a source workitem into a target workitem (the fields
+    # of the source will overwrite the fields in the target).
     #
-    module MergeMixin
-
-        #
-        # Merges a source workitem into a target workitem (the fields
-        # of the source will overwrite the fields in the target).
-        #
-        # Returns the resulting (merged) workitem.
-        #
-        def merge_workitems (wiTarget, wiSource, override=false)
-        
-            return wiSource unless wiTarget
-            return wiTarget unless wiSource
-
-            return wiSource if override
-
-            #puts "merge()"
-            #puts "merge() source : " + wiSource.attributes.inspect
-            #puts "merge() target : " + wiTarget.attributes.inspect
-        
-            wiSource.attributes.each do |k, v|
-        
-                #puts "merge() '#{k}' => '#{v}'"
-        
-                nk = OpenWFE::fulldup k
-                nv = OpenWFE::fulldup v
-        
-                wiTarget.attributes[nk] = nv
-            end
-
-            #puts "merge() target after : " + wiTarget.attributes.inspect
-        
-            wiTarget
-        end
+    # Returns the resulting (merged) workitem.
+    #
+    def merge_workitems (wiTarget, wiSource, override=false)
+
+      return wiSource unless wiTarget
+      return wiTarget unless wiSource
+
+      return wiSource if override
+
+      #puts "merge()"
+      #puts "merge() source : " + wiSource.attributes.inspect
+      #puts "merge() target : " + wiTarget.attributes.inspect
+
+      wiSource.attributes.each do |k, v|
+
+        #puts "merge() '#{k}' => '#{v}'"
+
+        nk = OpenWFE::fulldup k
+        nv = OpenWFE::fulldup v
+
+        wiTarget.attributes[nk] = nv
+      end
+
+      #puts "merge() target after : " + wiTarget.attributes.inspect
+
+      wiTarget
     end
+  end
 
 end