From e0bf7a3c61cfe336bd7202edd97f15b08abef13d Mon Sep 17 00:00:00 2001
From: Catalina Astengo <catalina@nav.com>
Date: Mon, 17 Jul 2023 10:57:03 -0600
Subject: [PATCH 1/2] fix(ex): starts with and ends with evaluates to false
 with nil

---
 impl/ex/lib/predicator/machine.ex | 11 +++++++++++
 impl/ex/test/predicator_test.exs  |  9 +++++++++
 2 files changed, 20 insertions(+)

diff --git a/impl/ex/lib/predicator/machine.ex b/impl/ex/lib/predicator/machine.ex
index 7fa203c..41a0d84 100644
--- a/impl/ex/lib/predicator/machine.ex
+++ b/impl/ex/lib/predicator/machine.ex
@@ -289,12 +289,23 @@ defmodule Predicator.Machine do
     put_instruction(machine, val in min..max)
   end
 
+  def accept_instruction(machine = %__MODULE__{stack: [_match | [nil | _rest_of_stack]]}, [
+        "compare" | ["STARTSWITH" | _]
+      ]), do: put_instruction(machine, false)
+
   def accept_instruction(machine = %__MODULE__{stack: [match | [stack_val | _rest_of_stack]]}, [
         "compare" | ["STARTSWITH" | _]
       ]) do
     put_instruction(machine, String.starts_with?(stack_val, match))
   end
 
+  def accept_instruction(
+        machine = %__MODULE__{stack: [_end_match | [nil | _rest_of_stack]]},
+        ["compare" | ["ENDSWITH" | _]]
+      ) do
+    put_instruction(machine, false)
+  end
+
   def accept_instruction(
         machine = %__MODULE__{stack: [end_match | [stack_val | _rest_of_stack]]},
         ["compare" | ["ENDSWITH" | _]]
diff --git a/impl/ex/test/predicator_test.exs b/impl/ex/test/predicator_test.exs
index fe7362f..cc47779 100644
--- a/impl/ex/test/predicator_test.exs
+++ b/impl/ex/test/predicator_test.exs
@@ -66,6 +66,7 @@ defmodule PredicatorTest do
       assert Predicator.matches?("!7 between 5 and 10") == false
       assert Predicator.matches?("age between 5 and 10", age: 14) == false
       assert Predicator.matches?("!age between 5 and 10", age: 7) == false
+      assert Predicator.matches?("age between 5 and 10", age: nil) == false
     end
   end
 
@@ -113,6 +114,7 @@ defmodule PredicatorTest do
       assert Predicator.matches?("!'joaquin' starts with 'joa'") == false
       assert Predicator.matches?("name starts with 'stuff'", name: "joaquin") == false
       assert Predicator.matches?("!name starts with 'joa'", name: "joaquin") == false
+      assert Predicator.matches?("name starts with 'joa'", name: nil) == false
     end
   end
 
@@ -157,6 +159,7 @@ defmodule PredicatorTest do
       assert Predicator.matches?("!'foobar' ends with 'bar'") == false
       assert Predicator.matches?("foobar ends with 'bar'", foobar: "world") == false
       assert Predicator.matches?("!foobar ends with 'bar'", foobar: "foobar") == false
+      assert Predicator.matches?("foobar ends with 'bar'", foobar: nil) == false
     end
   end
 
@@ -189,6 +192,7 @@ defmodule PredicatorTest do
       assert Predicator.matches?("foo = 1", foo: 2) == false
       assert Predicator.matches?("!1 = 1") == false
       assert Predicator.matches?("!foo = 1", foo: 1) == false
+      assert Predicator.matches?("foo = 1", foo: nil) == false
     end
   end
 
@@ -254,6 +258,7 @@ defmodule PredicatorTest do
       assert Predicator.matches?("12 < 1") == false
       assert Predicator.matches?("!foo < 1", foo: 0) == false
       assert Predicator.matches?("foo < 1", foo: 1) == false
+      assert Predicator.matches?("foo < 1", foo: nil) == false
     end
   end
 
@@ -301,6 +306,7 @@ defmodule PredicatorTest do
       assert Predicator.matches?("!foo in [0, 1, 2, 3]", foo: 0) == false
       assert Predicator.matches?("foo in ['foo', 'bar']", foo: "foobar") == false
       assert Predicator.matches?("!foo in ['foo', 'bar']", foo: "foo") == false
+      assert Predicator.matches?("foo in ['foo', 'bar']", foo: nil) == false
     end
   end
 
@@ -338,6 +344,7 @@ defmodule PredicatorTest do
       assert Predicator.matches?("foo not in [1, 2, 3]", foo: 0) == true
       assert Predicator.matches?("foo not in ['foo', 'bar']", foo: "foobar") == true
       assert Predicator.matches?("!foo not in ['foo', 'bar']", foo: "foo") == true
+      assert Predicator.matches?("foo not in ['foo', 'bar']", foo: nil) == true
     end
 
     test "evaluates to false" do
@@ -487,6 +494,7 @@ defmodule PredicatorTest do
       assert Predicator.matches?("!'foo' is present", [], eval_opts) == false
       assert Predicator.matches?("foo is present", [foo: ""], eval_opts) == false
       assert Predicator.matches?("!foo is present", [foo: "bar"], eval_opts) == false
+      assert Predicator.matches?("foo is present", [foo: nil], eval_opts) == false
     end
   end
 
@@ -512,6 +520,7 @@ defmodule PredicatorTest do
       assert Predicator.matches?("!'foo' is blank", [], eval_opts) == true
       assert Predicator.matches?("foo is blank", [foo: ""], eval_opts) == true
       assert Predicator.matches?("!foo is blank", [foo: "bar"], eval_opts) == true
+      assert Predicator.matches?("foo is blank", [foo: nil], eval_opts) == true
     end
 
     test "evaluates to false", %{eval_opts: eval_opts} do

From 5516aa098ae88f66c81782e234f744728a120ea6 Mon Sep 17 00:00:00 2001
From: Catalina Astengo <catalina@nav.com>
Date: Mon, 17 Jul 2023 13:55:58 -0600
Subject: [PATCH 2/2] chore(ruby): bump ruby version from 2.7 to 3.0

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 79599dc..e7a1c67 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -15,7 +15,7 @@ jobs:
       - uses: actions/checkout@v1
       - uses: actions/setup-ruby@v1
         with:
-          ruby-version: '2.7'
+          ruby-version: '3.0'
       - uses: MeilCli/danger-action@v2
         with:
           plugins_file: 'Gemfile'