lib/openwfe/expressions/iterator.rb in ruote-0.9.19 vs lib/openwfe/expressions/iterator.rb in ruote-0.9.20

@@ -1,56 +1,41 @@
-#
 #--
-# Copyright (c) 2007-2008, John Mettraux, OpenWFE.org
-# All rights reserved.
+# Copyright (c) 2007-2009, John Mettraux, [e-mail]
 #
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
+# 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 of source code must retain the above copyright notice, this
-#   list of conditions and the following disclaimer.
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
 #
-# . 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 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.
 #
-# . 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
-# POSSIBILITY OF SUCH DAMAGE.
+# Made in Japan.
 #++
-#
 
-#
-# "made in Japan"
-#
-# John Mettraux at openwfe.org
-#
 
-
 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__"
+    ITERATOR_COUNT = '__ic__'
+    ITERATOR_POSITION = '__ip__'
 
     attr_accessor :iteration_index
     attr_accessor :iteration_list
     attr_accessor :to_field
     attr_accessor :to_variable
@@ -111,19 +96,19 @@
     # Prepares the iterator expression and the workitem for the next
     # iteration.
     #
     def next (workitem)
 
-      position_at workitem, @iteration_index
+      position_at(workitem, @iteration_index)
     end
 
     #
     # Positions the iterator back at position 0.
     #
     def rewind (workitem)
 
-      position_at workitem, 0
+      position_at(workitem, 0)
     end
 
     #
     # Jumps to a given position in the iterator
     #
@@ -135,19 +120,19 @@
         @iteration_list.size
       else
         index
       end
 
-      position_at workitem, index
+      position_at(workitem, index)
     end
 
     #
     # Jumps a certain number of positions in the iterator.
     #
     def skip (workitem, offset)
 
-      jump workitem, @iteration_index + offset
+      jump(workitem, @iteration_index + offset)
     end
 
     #
     # The current index (whereas @iteration_index already points to
     # the next element).
@@ -166,10 +151,10 @@
 
         result = {}
 
         value = @iteration_list[position]
 
-        return nil unless value
+        return nil if (value == nil)
 
         if @to_field
           workitem.attributes[@to_field] = value
         else
           result[@to_variable] = value