rufus-decision 1.0 → 1.1.0

data/lib/rufus/hashes.rb

@@ -1,6 +1,5 @@
-#
 #--
-# Copyright (c) 2008, John Mettraux, jmettraux@gmail.com
+# Copyright (c) 2008-2009, John Mettraux, jmettraux@gmail.com
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -19,19 +18,17 @@
 # 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.
-#++
 #
+# Made in Japan.
+#++
 
-#
-# "made in Japan"
-#
-# John Mettraux at openwfe.org
-#
 
+require 'fileutils'
 require 'rufus/treechecker'
 
 
 module Rufus
+module Decision
 
   #
   # In the Java world, this class would be considered abstract.
@@ -46,6 +43,8 @@ module Rufus
   #
   class HashFilter
 
+    attr_reader :parent_hash
+
     def initialize (parent_hash)
 
       @parent_hash = parent_hash
@@ -67,59 +66,59 @@ module Rufus
 
     protected
 
-      def do_split (element)
+    def do_split (element)
 
-        return [ nil, element ] unless element.is_a?(String)
+      return [ nil, element ] unless element.is_a?(String)
 
-        a = element.split(':', 2)
-        return [ nil ] + a if a.length == 1
-        a
-      end
+      a = element.split(':', 2)
+      return [ nil ] + a if a.length == 1
+      a
+    end
 
-      def handles_prefix? (p)
+    def handles_prefix? (p)
 
-        false
-      end
+      false
+    end
 
-      def do_eval (key, p, k)
+    def do_eval (key, p, k)
 
-        raise NotImplementedError.new(
-          "missing do_eval(key, p, k) implementation")
-      end
+      raise NotImplementedError.new(
+        "missing do_eval(key, p, k) implementation")
+    end
 
-      def do_lookup (key, p, k)
+    def do_lookup (key, p, k)
 
-        if handles_prefix?(p)
+      if handles_prefix?(p)
 
-          do_eval(key, p, k)
+        do_eval(key, p, k)
 
-        elsif @parent_hash.respond_to?(:do_lookup)
+      elsif @parent_hash.respond_to?(:do_lookup)
 
-          @parent_hash.do_lookup key, p, k
+        @parent_hash.do_lookup(key, p, k)
 
-        else
+      else
 
-          @parent_hash[key]
-        end
+        @parent_hash[key]
       end
+    end
 
-      def do_put (key, value, p, v)
+    def do_put (key, value, p, v)
 
-        val = value
+      val = value
 
-        if handles_prefix?(p)
+      if handles_prefix?(p)
 
-          @parent_hash[key] = do_eval(value, p, v)
+        @parent_hash[key] = do_eval(value, p, v)
 
-        elsif @parent_hash.respond_to?(:do_put)
+      elsif @parent_hash.respond_to?(:do_put)
 
-          @parent_hash.do_put key, value, p, v
+        @parent_hash.do_put key, value, p, v
 
-        else
+      else
 
-          @parent_hash[key] = value
-        end
+        @parent_hash[key] = value
       end
+    end
   end
 
   #
@@ -146,33 +145,33 @@ module Rufus
 
     def initialize (parent_hash)
 
-      super parent_hash
+      super(parent_hash)
     end
 
     protected
 
-      RP = [ 'r', 'ruby', 'reval' ]
+    RP = %w{ r ruby reval }
 
-      def handles_prefix? (prefix)
+    def handles_prefix? (prefix)
 
-        RP.include?(prefix)
-      end
+      RP.include?(prefix)
+    end
 
-      #
-      # Ready for override.
-      #
-      def get_binding
+    # Ready for override.
+    #
+    def get_binding
 
-        binding()
-      end
+      binding()
+    end
 
-      def do_eval (key, p, k)
+    def do_eval (key, p, k)
 
-        #Rufus::eval_safely(k, @safe_level, get_binding)
-        Rufus::check_and_eval(k, get_binding)
-      end
+      Rufus::Decision.check_and_eval(k, get_binding)
+    end
   end
 
+  # An abstract syntax tree check (prior to any ruby eval)
+  #
   TREECHECKER = Rufus::TreeChecker.new do
 
     exclude_fvccall :abort, :exit, :exit!
@@ -200,6 +199,9 @@ module Rufus
   end
   TREECHECKER.freeze
 
+  # Given a string (of ruby code), first makes sure it doesn't contain
+  # harmful code, then evaluates it.
+  #
   def self.check_and_eval (ruby_code, bndng=binding())
 
     TREECHECKER.check(ruby_code)
@@ -209,12 +211,6 @@ module Rufus
     eval(ruby_code, bndng)
   end
 
-  private
-
-    def Rufus.unescape (text)
-
-      text.gsub("\\\\\\$\\{", "\\${")
-    end
-
+end
 end
 

data/test/decision_0_test.rb

@@ -1,37 +1,28 @@
 
 #
-# Testing rufus-deciision
-#
-# John Mettraux at openwfe.org
+# Testing rufus-decision
 #
 # Sun Oct 29 15:41:44 JST 2006
 #
 
 require 'test/unit'
 
-require 'dmixin'
+require File.dirname(__FILE__) + '/test_base.rb'
 
 
-class DecisionTest < Test::Unit::TestCase
+class Decision0Test < Test::Unit::TestCase
   include DecisionTestMixin
 
-  #def setup
-  #end
-
-  #def teardown
-  #end
-
-  CSV0 = \
-"""
+  CSV0 = %{
 ,,
 in:fx,in:fy,out:fz
 ,,
 a,b,0
 c,d,1
 e,f,2
-"""
+}
 
-  def test_csv_0
+  def test_0
 
     wi = {
       "fx" => "c",
@@ -46,15 +37,13 @@ e,f,2
     do_test(CSV0, wi, {}, { "fz" => nil }, false)
   end
 
-  CSV0B = \
-"""
-
+  CSV0B = %{
 in:fx,in:fy,out:fz
 
 a,b,0
 c,d,1
 e,f,2
-"""
+}
 
   def test_0b
 
@@ -67,32 +56,24 @@ e,f,2
 
   # test 1 moved to decision_1_test.rb
 
-  CSV2 = \
-"""
+  CSV2 = %{
 in:fx, in:fy, out:fz
 ,,
 a,   b,   0
 c,   d,   1
 e,   f,   2
-"""
+}
 
   def test_2
 
-    wi = {
-      "fx" => "c",
-      "fy" => "d"
-    }
+    wi = { "fx" => "c", "fy" => "d" }
     do_test(CSV2, wi, {}, { "fz" => "1" }, false)
 
-    wi = {
-      "fx" => "a",
-      "fy" => "d"
-    }
+    wi = { "fx" => "a", "fy" => "d" }
     do_test(CSV2, wi, {}, { "fz" => nil }, false)
   end
 
-  CSV3 = \
-"""
+  CSV3 = %{
 in:weather, in:month, out:take_umbrella?
 ,,
 raining,  ,     yes
@@ -100,7 +81,7 @@ sunny,    ,     no
 cloudy,   june,   yes
 cloudy,   may,    yes
 cloudy,   ,     no
-"""
+}
 
   def test_3
 
@@ -143,24 +124,24 @@ cloudy,   ,     no
 
   def test_3c
 
-     table = Rufus::DecisionTable.new("""
-       in:topic,in:region,out:team_member
-       sports,europe,Alice
-       sports,,Bob
-       finance,america,Charly
-       finance,europe,Donald
-       finance,,Ernest
-       politics,asia,Fujio
-       politics,america,Gilbert
-       politics,,Henry
-       ,,Zach
-     """)
-
-     h = {}
-     h["topic"] = "politics"
-     table.transform! h
-
-     assert_equal "Henry",  h["team_member"]
+    table = Rufus::DecisionTable.new(%{
+      in:topic,in:region,out:team_member
+      sports,europe,Alice
+      sports,,Bob
+      finance,america,Charly
+      finance,europe,Donald
+      finance,,Ernest
+      politics,asia,Fujio
+      politics,america,Gilbert
+      politics,,Henry
+      ,,Zach
+    })
+
+    h = {}
+    h["topic"] = "politics"
+    table.transform! h
+
+    assert_equal "Henry",  h["team_member"]
   end
 
   CSV3D = "http://spreadsheets.google.com/pub?key=pCkopoeZwCNsMWOVeDjR1TQ&output=csv&gid=0"
@@ -194,95 +175,83 @@ cloudy,   ,     no
 
   def test_3e
 
-     table = Rufus::DecisionTable.new("""
-       in:topic,in:region,out:team_member
-       sports,europe,Alice
-     """)
+    table = Rufus::DecisionTable.new(%{
+      in:topic,in:region,out:team_member
+      sports,europe,Alice
+    })
 
-     h0 = {}
-     h0["topic"] = "politics"
-     h1 = table.transform! h0
+    h0 = {}
+    h0["topic"] = "politics"
+    h1 = table.transform! h0
 
-     assert_equal h0.object_id, h1.object_id
+    assert_equal h0.object_id, h1.object_id
 
-     h0 = {}
-     h0["topic"] = "politics"
-     h1 = table.transform h0
+    h0 = {}
+    h0["topic"] = "politics"
+    h1 = table.transform h0
 
-     assert_not_equal h0.object_id, h1.object_id
+    assert_not_equal h0.object_id, h1.object_id
   end
 
-#  CSV4 = \
-#'''
-#"in:weather", "in:month", "out:take_umbrella?"
-#"","",""
-#"raining","","yes"
-#"sunny","","no"
-#"cloudy","june","yes"
-#"cloudy","may","yes"
-#"cloudy","","no"
-#'''
-
-  #def test_4
-  #  h = {}
-  #  h["weather"] = "raining"
-  #  h["month"] = "december"
-  #  do_test(CSV4, h, { "take_umbrella?" => "yes" }, false)
-  #  h = {}
-  #  h["weather"] = "cloudy"
-  #  h["month"] = "june"
-  #  do_test(CSV4, h, { "take_umbrella?" => "yes" }, false)
-  #  h = {}
-  #  h["weather"] = "cloudy"
-  #  h["month"] = "march"
-  #  do_test(CSV4, h, { "take_umbrella?" => "no" }, false)
-  #end
-
-  CSV5 = \
-"""
-through,ignorecase,,
-,,,
-in:fx, in:fy, out:fX, out:fY
-,,,
-a,   ,    true,
-,    a,   ,     true
-b,   ,    false,
-,    b,   ,     false
-"""
 
-  def test_5
+  def test_through_and_ignorecase
 
-    wi = {
-      "fx" => "a",
-      "fy" => "a"
+    table = %{
+      through,ignorecase,,
+      ,,,
+      in:fx, in:fy, out:fX, out:fY
+      ,,,
+      a,   ,    true,
+      ,    a,   ,     true
+      b,   ,    false,
+      ,    b,   ,     false
     }
-    do_test(CSV5, wi, {}, { "fX" => "true", "fY" => "true" }, false)
 
-    wi = {
-      "fx" => "a",
-      "fy" => "b"
-    }
-    do_test(CSV5, wi, {}, { "fX" => "true", "fY" => "false" }, false)
+    wi = { 'fx' => 'a', 'fy' => 'a' }
+    do_test(table, wi, {}, { 'fX' => 'true', 'fY' => 'true' }, false)
 
-    wi = {
-      "fx" => "A",
-      "fy" => "b"
+    wi = { 'fx' => 'a', 'fy' => 'b' }
+    do_test(table, wi, {}, { 'fX' => 'true', 'fY' => 'false' }, false)
+
+    wi = { 'fx' => 'A', 'fy' => 'b' }
+    do_test(table, wi, {}, { 'fX' => 'true', 'fY' => 'false' }, false)
+  end
+
+  def test_through_and_ignorecase_set_at_table_initialization
+
+    table = %{
+      in:fx, in:fy, out:fX, out:fY
+      ,,,
+      a,   ,    true,
+      ,    a,   ,     true
+      b,   ,    false,
+      ,    b,   ,     false
     }
-    do_test(CSV5, wi, {}, { "fX" => "true", "fY" => "false" }, false)
+
+    table = Rufus::Decision::Table.new(
+      table, :through => true, :ignore_case => true)
+
+    wi = { 'fx' => 'a', 'fy' => 'a' }
+    do_test(table, wi, {}, { 'fX' => 'true', 'fY' => 'true' }, false)
+
+    wi = { 'fx' => 'a', 'fy' => 'b' }
+    do_test(table, wi, {}, { 'fX' => 'true', 'fY' => 'false' }, false)
+
+    wi = { 'fx' => 'A', 'fy' => 'b' }
+    do_test(table, wi, {}, { 'fX' => 'true', 'fY' => 'false' }, false)
   end
 
   #
   # TEST 6
 
-  CSV6 = \
-"""
+  CSV6 = %{
 ,
 in:fx, out:fy
 ,
 <10,a
 <=100,b
 ,c
-"""
+}
 
   def test_6
 
@@ -300,15 +269,14 @@ in:fx, out:fy
   #
   # TEST 7
 
-  CSV7 = \
-"""
+  CSV7 = %{
 ,
 in:fx, out:fy
 ,
 >100,a
 >=10,b
 ,c
-"""
+}
 
   def test_7
 
@@ -328,42 +296,44 @@ in:fx, out:fy
     do_test(CSV7, wi, {}, { "fy" => "a" }, false)
   end
 
-  CSV8 = \
-"""
+  CSV8 = %{
 in:efx,in:efy,out:efz
 a,b,0
 c,d,1
 e,f,2
-"""
+}
 
   def test_8
 
     assert_equal CSV8.strip, Rufus::DecisionTable.new(CSV8).to_csv.strip
   end
 
-  CSV9 = \
-"""
-in:fx,in:fy,out:fz
-a,b,0
-c,d,${r: 1 + 2}
-e,f,2
-"""
+  CSV9 = %{
+    in:fx,in:fy,out:fz
+    a,b,0
+    c,d,${r: 1 + 2}
+    e,f,2
+  }
 
-  def test_9
+  def test_ruby_eval
 
-    wi = {
-      "fx" => "c",
-      "fy" => "d"
-    }
-    do_test(CSV9, wi, { :ruby_eval => true }, { "fz" => "3" }, false)
+    wi = { 'fx' => 'c', 'fy' => 'd' }
+    do_test(CSV9, wi, { :ruby_eval => true }, { 'fz' => '3' }, false)
+  end
+
+  def test_ruby_eval_set_at_table_initialization
+
+    table = Rufus::Decision::Table.new(CSV9, :ruby_eval => true)
+
+    wi = { 'fx' => 'c', 'fy' => 'd' }
+    do_test(table, wi, {}, { 'fz' => '3' }, false)
   end
 
-  CSV10 = \
-"""
+  CSV10 = %{
 in:fx,in:fx,out:fz
 >90,<92,ok
 ,,bad
-"""
+}
 
   def test_10
 
@@ -377,11 +347,7 @@ in:fx,in:fx,out:fz
     do_test(CSV10, wi, {}, { "fz" => "bad" }, false)
   end
 
-  #
-  # Fu Zhang's test case
-
-  CSV11 = \
-'''
+  CSV11 = %{
 through
 in:f1,in:f1,in:f2,in:f3,out:o1,out:e1,out:e2
 
@@ -390,19 +356,15 @@ in:f1,in:f1,in:f2,in:f3,out:o1,out:e1,out:e2
 <100,>=95,>2.0,,"Expection1",,
 <100,>=95,,>2.0,,,"Expection2"
 <100,>=95,,>2.0,"Invalid",,
-'''
+}
 
-  def test_11
+  def test_fu_zhang
 
-    wi = { "f1" => 97, "f2" => 5 }
-    do_test CSV11, wi, {}, { "o1" => "Expection1" }, false
+    wi = { 'f1' => 97, 'f2' => 5 }
+    do_test CSV11, wi, {}, { 'o1' => 'Expection1' }, false
   end
 
-  #
-  # 'accumulate'
-
-  CSV12 = \
-"""
+  CSV12 = %{
 accumulate
 ,,,
 in:fx, in:fy, out:fX, out:fY
@@ -411,9 +373,9 @@ a,   ,    red,  green
 ,    a,   blue,   purple
 b,   ,    yellow, beige
 ,    b,   white,  kuro
-"""
+}
 
-  def test_12
+  def test_accumulate
 
     wi = { "fx" => "a", "fy" => "a" }
     do_test CSV12, wi, {}, { "fX" => "red;blue", "fY" => "green;purple" }, false
@@ -453,17 +415,13 @@ b,   ,    yellow, beige
     assert (not r.include?("7"))
   end
 
-  #
-  # Testing ranges
-
-  CSV13 = \
-"""
+  CSV13 = %{
 in:fx,out:fz
 90..92,ok
 ,bad
-"""
+}
 
-  def test_13
+  def test_range
 
     wi = { "fx" => "91" }
     do_test CSV13, wi, {}, { "fz" => "ok" }, false