Merge pull request jamsesso#10 from jamsesso/infinity_nan_stringeqzero

Implement truthy rules for infinity and NaN values, and fix empty string comparison to 0

Author: jamsesso

src/main/java/io/github/jamsesso/jsonlogic/JsonLogic.java

@@ -100,6 +100,28 @@ public static boolean truthy(Object value) {
     }
 
     if (value instanceof Number) {
+      if (value instanceof Double) {
+        Double d = (Double) value;
+
+        if (d.isNaN()) {
+          return false;
+        }
+        else if (d.isInfinite()) {
+          return true;
+        }
+      }
+
+      if (value instanceof Float) {
+        Float f = (Float) value;
+
+        if (f.isNaN()) {
+          return false;
+        }
+        else if (f.isInfinite()) {
+          return true;
+        }
+      }
+
       return ((Number) value).doubleValue() != 0.0;
     }
 

src/main/java/io/github/jamsesso/jsonlogic/evaluator/expressions/EqualityExpression.java

@@ -82,6 +82,10 @@ public Object evaluate(List arguments, Object data) throws JsonLogicEvaluationEx
 
   private boolean compareNumberToString(Number left, String right) {
     try {
+      if (right.trim().isEmpty()) {
+        right = "0";
+      }
+
       return Double.parseDouble(right) == left.doubleValue();
     }
     catch (NumberFormatException e) {

src/main/java/io/github/jamsesso/jsonlogic/evaluator/expressions/InExpression.java

@@ -20,7 +20,7 @@ public String key() {
   @Override
   public Object evaluate(List arguments, Object data) throws JsonLogicEvaluationException {
     if (arguments.size() < 2) {
-      throw new JsonLogicEvaluationException("in expects exactly 2 arguments");
+      return false;
     }
 
     // Handle string in (substring)
@@ -32,6 +32,6 @@ public Object evaluate(List arguments, Object data) throws JsonLogicEvaluationEx
       return new ArrayLike(arguments.get(1)).contains(arguments.get(0));
     }
 
-    throw new JsonLogicEvaluationException("in expects the second argument to be either a string or array");
+    return false;
   }
 }

src/main/java/io/github/jamsesso/jsonlogic/evaluator/expressions/MathExpression.java

@@ -6,7 +6,7 @@
 import java.util.function.BiFunction;
 
 public class MathExpression implements PreEvaluatedArgumentsExpression {
-  public static final MathExpression ADD = new MathExpression("+", (a, b) -> a + b);
+  public static final MathExpression ADD = new MathExpression("+", Double::sum);
   public static final MathExpression SUBTRACT = new MathExpression("-", (a, b) -> a - b, 2);
   public static final MathExpression MULTIPLY = new MathExpression("*", (a, b) -> a * b);
   public static final MathExpression DIVIDE = new MathExpression("/", (a, b) -> a / b, 2);
@@ -52,6 +52,10 @@ public Object evaluate(List arguments, Object data) throws JsonLogicEvaluationEx
       if (key.equals("-") && arguments.get(0) instanceof Number) {
         return -1 * ((Number) arguments.get(0)).doubleValue();
       }
+
+      if (key.equals("/")) {
+        return null;
+      }
     }
 
     // Collect all of the arguments

src/test/java/io/github/jamsesso/jsonlogic/EqualityExpressionTests.java

@@ -21,4 +21,9 @@ public void testSameValueDifferentType() throws JsonLogicException {
   public void testDifferentValueDifferentType() throws JsonLogicException {
     assertEquals(true, jsonLogic.apply("{\"==\": [[], false]}", null));
   }
+
+  @Test
+  public void testEmptyStringAndZeroComparison() throws JsonLogicException {
+    assertEquals(true, jsonLogic.apply("{\"==\": [\" \", 0]}", null));
+  }
 }

src/test/java/io/github/jamsesso/jsonlogic/InExpressionTests.java

@@ -9,6 +9,7 @@
 import java.util.stream.Stream;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 
 public class InExpressionTests {
   private static final JsonLogic jsonLogic = new JsonLogic();
@@ -55,4 +56,14 @@ public void testAllVariables() throws JsonLogicException {
 
     assertEquals(true, jsonLogic.apply("{\"in\": [{\"var\": \"value\"}, {\"var\": \"list\"}]}", data));
   }
+
+  @Test
+  public void testSingleArgument() throws JsonLogicException {
+    assertFalse((boolean) jsonLogic.apply("{\"in\": [\"Spring\"]}", null));
+  }
+
+  @Test
+  public void testBadSecondArgument() throws JsonLogicException {
+    assertFalse((boolean) jsonLogic.apply("{\"in\": [\"Spring\", 3]}", null));
+  }
 }

src/test/java/io/github/jamsesso/jsonlogic/MathExpressionTests.java

@@ -102,4 +102,9 @@ public void testMax() throws JsonLogicException {
 
     assertEquals(3.0, result);
   }
+
+  @Test
+  public void testDivideSingleNumber() throws JsonLogicException {
+    assertEquals(null, jsonLogic.apply("{\"/\": [0]}", null));
+  }
 }

src/test/java/io/github/jamsesso/jsonlogic/TruthyTests.java

@@ -34,5 +34,13 @@ public void testTruthyValues() {
 
     // Null
     assertFalse(JsonLogic.truthy(null));
+
+    // NaN and Infinity
+    assertFalse(JsonLogic.truthy(Double.NaN));
+    assertFalse(JsonLogic.truthy(Float.NaN));
+    assertTrue(JsonLogic.truthy(Double.POSITIVE_INFINITY));
+    assertTrue(JsonLogic.truthy(Double.NEGATIVE_INFINITY));
+    assertTrue(JsonLogic.truthy(Float.POSITIVE_INFINITY));
+    assertTrue(JsonLogic.truthy(Float.NEGATIVE_INFINITY));
   }
 }