activerecord-turbopuffer-adapter 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df2e74234ebc02a8a96d03671b9e73747f3f1e90aff7f7f9c69f045d4e180ae3
-  data.tar.gz: e1b01c5524316e248bcf8b4dfe25a204e3f348b35e5a2b2b1be45b8181a868c6
+  metadata.gz: 23fa3cc80f986e56ce18f779fb0d108fc441bc0eb38bc7f8b3eeb23d25ae1c7b
+  data.tar.gz: 1f888b8b3bf5238a24f32d76bfcfa5fe71ef433a3b85c12db4b0f96d36c888f5
 SHA512:
-  metadata.gz: 85fdcfcd50b5b9b862c3da6d7c84f783cdcb5a7be2a97f45333e67084c139830005ed28b7ecfa4c516ec0a6c303a9ef683d2cbb395e1b783fc92490531b0c7e2
-  data.tar.gz: bad6f047b6b96456f5bee489116702bd975ead665ea2acaa04cf816f6ddb155102508b959ed99a94b1532831781172c91953d239e898e1a22c5ed7d23f0383ce
+  metadata.gz: c969a1e7195c56421d923e8d711f81c71028fe8b7ccbdb3b774ccb56671db31b75f5e9a9803bd28886ef503cf7c6477171f4175f799cbe025d65fba41e9a0476
+  data.tar.gz: 96966fdeb4d6ebeebaa15d717404359947b5afee6c753b19e92e7fe9fe50ead8e708e7728b654e72ef7706042f7dca34bfbec7cdbf3f278e04fde7449b9b271d

data/lib/arel/visitors/turbopuffer.rb

@@ -59,10 +59,14 @@ module Arel::Visitors
       case filters.size
       when 0 then nil
       when 1 then filters.first
-      else [ "And", filters ]
+      else conjunction(filters)
       end
     end
 
+    def conjunction(filters)
+      [ "And", filters.flat_map { |filter| (filter in [ "And", children ]) ? children : [ filter ] } ]
+    end
+
     def aggregate_node(projection)
       projection.is_a?(Arel::Nodes::As) ? projection.left : projection
     end
@@ -182,7 +186,7 @@ module Arel::Visitors
     def visit_Arel_Table(o) = o.name
 
     # filters
-    def visit_Arel_Nodes_And(o)      = [ "And", o.children.map { |c| visit(c) } ]
+    def visit_Arel_Nodes_And(o)      = conjunction(o.children.map { |c| visit(c) })
     def visit_Arel_Nodes_Or(o)       = [ "Or", [ visit(o.left), visit(o.right) ] ]
     def visit_Arel_Nodes_Grouping(o) = visit(o.expr)
 
@@ -200,10 +204,18 @@ module Arel::Visitors
       "Lt" => "AnyLt", "Lte" => "AnyLte", "Gt" => "AnyGt", "Gte" => "AnyGte"
     }.freeze
 
+    MATCHES_MISSING = [ "Lt", "Lte" ].freeze
+
     def comparison(node, operator, value = visit(node.right))
+      attribute = visit(node.left)
       operator = ARRAY_OPERATORS.fetch(operator) if array_attribute?(node.left) && !value.nil?
+      filter = [ attribute, operator, value ]
 
-      [ visit(node.left), operator, value ]
+      if MATCHES_MISSING.include?(operator) && !value.nil?
+        [ "And", [ filter, [ attribute, "NotEq", nil ] ] ]
+      else
+        filter
+      end
     end
 
     def array_attribute?(node)
@@ -227,7 +239,7 @@ module Arel::Visitors
     def visit_Arel_Nodes_Between(o)
       low, high = o.right.children.map { |bound| visit(bound) }
 
-      [ "And", [ comparison(o, "Gte", low), comparison(o, "Lte", high) ] ]
+      conjunction([ comparison(o, "Gte", low), comparison(o, "Lte", high) ])
     end
 
     def visit_Arel_Nodes_Not(o) = [ "Not", visit(o.expr) ]

data/lib/turbopuffer/active_record/version.rb

@@ -1,5 +1,5 @@
 module Turbopuffer
   module ActiveRecord
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-turbopuffer-adapter
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Richard Monette
 bindir: bin
 cert_chain: []
-date: 2026-09-18 00:00:00.000000000 Z
+date: 2026-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord