condition.rb in ruote-0.9.20

- old
+ new

@@ -1,43 +1,29 @@
-#
 #--
-# Copyright (c) 2007-2008, John Mettraux, OpenWFE.org
-# All rights reserved.
+# Copyright (c) 2007-2009, John Mettraux, jmettraux@gmail.com
 #
-# 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
-#
 
 require 'openwfe/util/treechecker'
 
 
 module OpenWFE
@@ -63,11 +49,11 @@
     # This is the method brought to expression classes including this
     # mixin. Easy evaluation of a conditon expressed in an attribute.
     #
     def eval_condition (attname, workitem, nattname=nil)
 
-      positive = nil
+      #positive = nil
       negative = nil
 
       positive = do_eval_condition(attname, workitem)
       negative = do_eval_condition(nattname, workitem) if nattname
 
@@ -87,44 +73,37 @@
     #
     # Returns the Symbol the attribute if present.
     #
     def determine_condition_attribute (attname)
 
-      attname = [ attname ] unless attname.is_a?(Array)
+      #attname = [ attname ] unless attname.is_a?(Array)
+      attname = Array(attname)
 
       attname.each do |aname|
         aname = aname.intern if aname.is_a?(String)
         return aname if has_attribute(aname)
-        return aname if has_attribute("r" + aname.to_s)
+        return aname if has_attribute("r#{aname.to_s}")
       end
 
       nil
     end
 
     protected
 
       def do_eval_condition (attname, workitem)
 
-        #attname = pick_attribute(attname) \
-        #  if attname.is_a?(Array)
-
         conditional = lookup_attribute(attname, workitem)
-        rconditional = lookup_attribute("r"+attname.to_s, workitem)
+        rconditional = lookup_attribute("r#{attname.to_s}", workitem)
 
         return do_eval(rconditional, workitem) \
           if rconditional and not conditional
 
-        return nil \
-          unless conditional
+        return nil if conditional.nil?
 
-        ldebug { "do_eval_condition() 0 for  >#{conditional}<" }
+        conditional = unescape(conditional)
 
-        conditional = unescape conditional
-
-        ldebug { "do_eval_condition() 1 for  >#{conditional}<" }
-
-        r = eval_set conditional
+        r = eval_set(conditional)
         return r if r != nil
 
         begin
           return to_boolean(do_eval(conditional, workitem))
         rescue Exception => e
@@ -132,12 +111,10 @@
           ldebug { "do_eval_condition() e : #{e}" }
         end
 
         conditional = do_quote(conditional)
 
-        ldebug { "do_eval_condition() 2 for  >#{conditional}<" }
-
         to_boolean(do_eval(conditional, workitem))
       end
 
       SET_REGEX = /(\S*?)( is)?( not)? set$/
 
@@ -185,22 +162,22 @@
       #
       # unescapes '>' and '<'
       #
       def unescape (s)
 
-        s.gsub("&amp;", "&").gsub("&gt;", ">").gsub("&lt;", "<")
+        s.to_s.gsub('&amp;', '&').gsub('&gt;', '>').gsub('&lt;', '<')
       end
 
       #
       # Quotes the given string so that it can easily get evaluated
       # as Ruby code (a string comparison actually).
       #
       def do_quote (string)
 
         op = find_operator string
 
-        return '"' + string + '"' unless op
+        return "\"#{string}\"" unless op
 
         op, i = op
 
         s = '"'
         s << string[0..i-1].strip
@@ -216,35 +193,33 @@
       # Returns the operator and its index (position) in the string.
       # Returns nil if not operator was found in the string.
       #
       def find_operator (string)
 
-        [ "==", "!=", "<=", ">=", "<", ">" ].each do |op|
-          i = string.index op
-          next unless i
-          return [ op, i ]
+        %w{ == != <= >= < > }.each do |op|
+          i = string.index(op)
+          return [ op, i ] if i
         end
+
         nil
       end
 
       #
-      # Evalutates the given code (after security checks)
+      # Evaluates the given code (after security checks)
       #
       def do_eval (s, workitem)
 
-        #TreeChecker.check_conditional s
         get_tree_checker.check_conditional s
 
         # ok, green for eval
 
         wi = workitem
         fe = self
           #
           # wi and fe are thus available as well
           # (as self and workitem)
 
-        #Rufus::eval_safely(s, 4, binding())
-        eval s, binding()
+        eval(s, binding())
       end
   end
 
 end
 