Support beginless ranges in where queries (#1527)

Will Cosgrove · GitHub
1 parent 75250b23
Showing 2 changed files with 17 additions and 6 deletions Show diff stats
lib/searchkick/query.rb
test/where_test.rb
@@ -904,12 +904,7 @@ module Searchkick
         else
           # expand ranges
           if value.is_a?(Range)
-            # infinite? added in Ruby 2.4
-            if value.end.nil? || (value.end.respond_to?(:infinite?) && value.end.infinite?)
-              value = {gte: value.first}
-            else
-              value = {gte: value.first, (value.exclude_end? ? :lt : :lte) => value.last}
-            end
+            value = expand_range(value)
           end
           value = {in: value} if value.is_a?(Array)
@@ -1138,6 +1133,17 @@ module Searchkick
       end
     end
+    def expand_range(range)
+      expanded = {}
+      expanded[:gte] = range.begin if range.begin
+
+      if range.end && !(range.end.respond_to?(:infinite?) && range.end.infinite?)
+        expanded[range.exclude_end? ? :lt : :lte] = range.end
+      end
+
+      expanded
+    end
+
     def base_field(k)
       k.sub(/\.(analyzed|word_start|word_middle|word_end|text_start|text_middle|text_end|exact)\z/, "")
     end
@@ -46,6 +46,11 @@ class WhereTest &lt; Minitest::Test
       # use eval to prevent parse error
       assert_search "product", ["Product C", "Product D"], where: {store_id: eval("3..")}
     end
+    if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("2.7.0")
+      # use eval to prevent parse error
+      assert_search "product", ["Product A", "Product B"], where: {store_id: eval("..2")}
+      assert_search "product", ["Product A", "Product B"], where: {store_id: eval("...3")}
+    end
     # or
     assert_search "product", ["Product A", "Product B", "Product C"], where: {or: [[{in_stock: true}, {store_id: 3}]]}