Merge pull request #12 from amdirent/master

Add support for exponent operator and floats

lib/json_logic/operation.rb

@@ -79,17 +79,18 @@ class Operation
         result.nil? ? v.last : result
       },
       '?:'    => ->(v, d) { LAMBDAS['if'].call(v, d) },
-      '>'     => ->(v, d) { v.map(&:to_i).each_cons(2).all? { |i, j| i > j } },
-      '>='    => ->(v, d) { v.map(&:to_i).each_cons(2).all? { |i, j| i >= j } },
-      '<'     => ->(v, d) { v.map(&:to_i).each_cons(2).all? { |i, j| i < j } },
-      '<='    => ->(v, d) { v.map(&:to_i).each_cons(2).all? { |i, j| i <= j } },
-      'max'   => ->(v, d) { v.map(&:to_i).max },
-      'min'   => ->(v, d) { v.map(&:to_i).min },
-      '+'     => ->(v, d) { v.map(&:to_i).reduce(:+) },
-      '-'     => ->(v, d) { v.map!(&:to_i); v.size == 1 ? -v.first : v.reduce(:-) },
-      '*'     => ->(v, d) { v.map(&:to_i).reduce(:*) },
+      '>'     => ->(v, d) { v.map(&:to_f).each_cons(2).all? { |i, j| i > j } },
+      '>='    => ->(v, d) { v.map(&:to_f).each_cons(2).all? { |i, j| i >= j } },
+      '<'     => ->(v, d) { v.map(&:to_f).each_cons(2).all? { |i, j| i < j } },
+      '<='    => ->(v, d) { v.map(&:to_f).each_cons(2).all? { |i, j| i <= j } },
+      'max'   => ->(v, d) { v.map(&:to_f).max },
+      'min'   => ->(v, d) { v.map(&:to_f).min },
+      '+'     => ->(v, d) { v.map(&:to_f).reduce(:+) },
+      '-'     => ->(v, d) { v.map!(&:to_f); v.size == 1 ? -v.first : v.reduce(:-) },
+      '*'     => ->(v, d) { v.map(&:to_f).reduce(:*) },
       '/'     => ->(v, d) { v.map(&:to_f).reduce(:/) },
       '%'     => ->(v, d) { v.map(&:to_i).reduce(:%) },
+      '^'     => ->(v, d) { v.map(&:to_f).reduce(:**) },
       'merge' => ->(v, d) { v.flatten },
       'in'    => ->(v, d) { v[1].include? v[0] },
       'cat'   => ->(v, d) { v.map(&:to_s).join },

lib/json_logic/truthy.rb

@@ -35,6 +35,12 @@ def falsy?
   end
 end
 
+class Float
+  def falsy?
+    zero?
+  end
+end
+
 class Array
   def falsy?
     empty?

test/json_logic_test.rb

@@ -45,6 +45,17 @@ def test_add_operation
     assert_equal([6], JSONLogic.apply(rules, data))
   end
 
+  def test_exponent_operation
+    exp = JSON.parse(%Q|{"^": [{"var": "num"}, 3]}|)
+    data1 = JSON.parse(%Q|{"num": 2}|)
+    data2 = JSON.parse(%Q|{"num": 3}|)
+    data3 = JSON.parse(%Q|{"num": 4}|)
+
+    assert_equal(8, JSONLogic.apply(exp, data1).to_i)
+    assert_equal(27, JSONLogic.apply(exp, data2).to_i)
+    assert_equal(64, JSONLogic.apply(exp, data3).to_i)
+  end
+
   def test_array_with_logic
     assert_equal [1, 2, 3], JSONLogic.apply([1, {"var" => "x"}, 3], {"x" => 2})