Merge pull request #215 from turnhub/bug/fix-parse-number-function

fix(eval): parse_number()

lib/expression/eval.ex

@@ -264,15 +264,15 @@ defmodule Expression.Eval do
   def parse_number(%{"__value__" => value}), do: parse_number(value)
 
   def parse_number(value) when is_binary(value) do
-    with {_integer, _rem} <- Integer.parse(value),
-         {decimal, _rem} <- Decimal.parse(value) do
-      if Decimal.integer?(decimal) do
-        Decimal.to_integer(decimal)
-      else
-        Decimal.to_float(decimal)
-      end
-    else
-      _error -> value
+    case Integer.parse(value) do
+      {integer, ""} ->
+        integer
+
+      _other ->
+        case Float.parse(value) do
+          {float, ""} -> float
+          _error -> value
+        end
     end
   end
 

test/expression/eval_test.exs

@@ -115,7 +115,7 @@ defmodule Expression.EvalTest do
 
   describe "lambdas" do
     test "with map" do
-      {:ok, ast, "", _, _, _} = Parser.parse("@map(foo, &([&1,'Button']))")
+      {:ok, ast, "", _, _, _} = Parser.parse("@map(foo, &([&1, 'Button']))")
 
       assert [[1, "Button"], [2, "Button"], [3, "Button"]] ==
                Eval.eval!(ast, %{"foo" => [1, 2, 3]})
@@ -138,6 +138,16 @@ defmodule Expression.EvalTest do
                Eval.eval!(ast, %{"foo" => [1, 2, 3]})
     end
 
+    test "with kernel operators" do
+      {:ok, ast, "", _, _, _} = Parser.parse("@map(foo, &(&1 == \"1. selected\"))")
+
+      assert Eval.eval!(ast, %{"foo" => ["1. selected", "1. selected wrong", "other"]}) == [
+               true,
+               false,
+               false
+             ]
+    end
+
     test "lambda with joins" do
       assert [["one", "Button one"], ["two", "Button two"], ["three", "Button three"]] ==
                Expression.evaluate!("@map(choices, &([&1, 'Button ' & &1]))", %{

test/expression_test.exs

@@ -97,6 +97,9 @@ defmodule ExpressionTest do
       assert true == Expression.evaluate_as_boolean!("@(\"1\" * 2 == 2)")
       assert true == Expression.evaluate_as_boolean!("@(\"0.1\" * 0.2 == 0.020000000000000004)")
 
+      assert true == Expression.evaluate_as_boolean!("@(\"1. A\" == x)", %{"x" => "1. A"})
+      assert false == Expression.evaluate_as_boolean!("@(\"1. A wrong\" == x)", %{"x" => "1. A"})
+
       assert_raise RuntimeError, "expression is not a number: `\"NaN\"`", fn ->
         Expression.evaluate_as_boolean!("@(1 * \"NaN\" == 2)")
       end