sparkql 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f8f460c07a1a833cd0a80040f686b12a9579db3bc0ae60d1cc7aa1c73fe644d
-  data.tar.gz: 66a6701ad74dc5454d9e4dd2a14c0ea133715e10ba5babb676c90aed62e917bd
+  metadata.gz: d4f82b65f3fa050b24c53c7c5cb1e4a113d99e5e4ada4510695179c100aac711
+  data.tar.gz: 6fb9758b1883beadbbf9f864a9b1b782bfbc6f29b1a0061f9f66f33e1a0ed0b3
 SHA512:
-  metadata.gz: 661e847ae1aa0f336706d94129c0afdc7d0ba040c0c8f62b7a6e9248dcc990d8f0179ef153355e050bae2b8a2f676c7e358081280418986c6c0bbf27393ac572
-  data.tar.gz: 4b64da6af2453236ec0b9c0e240238241609c79e0d4b8cca2c126ecc9b5e3b7e9c585836cc0dceb9a5136cb9decb993bffdef0145720de8dd734b2b2f291f340
+  metadata.gz: 9752471d2b83c520c9ac52fa6fbc0219ffd914648bd8801f7953f41799a31ecd3de242e9a62e89cf5a7752c29337e85b14cba254779583ad914ac3cc4c06dc5b
+  data.tar.gz: 3ccd9092e28b7fd3064768deb46eb4d7d5205be213adad251bb568958d4975e109080a74759613fb6c0e425a0ddda0ca7af37253b71bbe2ce18fd57891e0f6e3

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+v1.3.2, 2025-08-06
+-------------------
+  * [BUGFIX] More Evaluator fixes
+  * [BUGFIX] fixed the build.
+
 v1.3.1, 2025-08-06
 -------------------
   * [BUGFIX] Evaluator fix for Not expressions

data/VERSION

@@ -1 +1 @@
-1.3.1
+1.3.2

data/lib/sparkql/evaluator.rb

@@ -60,20 +60,22 @@ class Sparkql::Evaluator
         # with a level -1 here to turn the top level expressions into a block
         # group for processing.
         current_level = level
+        last_block_group = block_group
         while current_level >= 0
           current_level -= 1
           levels[current_level] ||= []
           last_block_group_id = levels[current_level].last
           if last_block_group_id
-            block_groups[last_block_group_id][:expressions] << block_group
+            block_groups[last_block_group_id][:expressions] << last_block_group
             break
           else
             block_id = "placeholder_for_#{block}_#{current_level}"
-            placeholder_block = block_builder(block_group, current_level)
-            placeholder_block[:expressions] << block_group
+            placeholder_block = block_builder(last_block_group, current_level)
+            placeholder_block[:expressions] << last_block_group
 
             levels[current_level] << block_id
             block_groups[block_id] = placeholder_block
+            last_block_group = placeholder_block
           end
         end
       end

data/test/unit/evaluator_test.rb

@@ -81,6 +81,10 @@ class EvaluatorTest < Test::Unit::TestCase
     assert !sample("Test Eq true And ((Test Eq true And Test Eq false) Or Test Eq false) And Test Eq true")
     assert !sample("Test Eq true And ((Test Eq true And Test Eq false) Or Test Eq false) Or Test Eq false")
     assert sample("Test Eq true And ((Test Eq true And Test Eq false) Or Test Eq false) Or Test Eq true")
+    assert !sample("(Test Eq true Or Test Eq true) And Test Eq false")
+    assert !sample("(Test Eq true Or Test Eq true) And (Test Eq false)")
+    assert sample("(Test Eq true Or Test Eq true) And (Test Eq false Or Test Eq true)")
+    assert !sample("(Test Eq true Or Test Eq true) And (Test Eq false Or Test Eq false)")
   end
 
   def test_nots

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sparkql
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Wade McEwen