Restored _script

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 - Added experimental `knn` option
 - Added experimental `rrf` method
-- Added experimental support for `_raw` to `where` option
+- Added experimental support for scripting to `where` option
 - Added warning for `exists` with non-`true` values
 - Added warning for full reindex and `:queue` mode
 - Fixed `per_page` method when paginating beyond `max_result_window`

lib/searchkick.rb

@@ -27,7 +27,7 @@
 require_relative "searchkick/relation_indexer"
 require_relative "searchkick/reranking"
 require_relative "searchkick/results"
-require_relative "searchkick/raw"
+require_relative "searchkick/script"
 require_relative "searchkick/version"
 require_relative "searchkick/where"
 
@@ -200,11 +200,11 @@ def self.multi_search(queries)
     end
   end
 
-  # raw
+  # script
 
   # experimental
-  def self.raw(value)
-    Raw.new(value)
+  def self.script(source, **options)
+    Script.new(source, **options)
   end
 
   # callbacks

lib/searchkick/query.rb

@@ -942,12 +942,12 @@ def where_filters(where)
           filters << {bool: {must_not: where_filters(value)}}
         elsif field == :_and
           filters << {bool: {must: value.map { |or_statement| {bool: {filter: where_filters(or_statement)}} }}}
-        elsif field == :_raw
-          unless value.is_a?(Raw)
-            raise TypeError, "Use Searchkick.raw for raw filters"
+        elsif field == :_script
+          unless value.is_a?(Script)
+            raise TypeError, "expected Searchkick::Script"
           end
 
-          filters << value.value
+          filters << {script: {script: {source: value.source, lang: value.lang, params: value.params}}}
         else
           # expand ranges
           if value.is_a?(Range)

lib/searchkick/script.rb

@@ -0,0 +1,11 @@
+module Searchkick
+  class Script
+    attr_reader :source, :lang, :params
+
+    def initialize(source, lang: "painless", params: {})
+      @source = source
+      @lang = lang
+      @params = params
+    end
+  end
+end

test/where_test.rb

@@ -261,16 +261,16 @@ def test_script
       {name: "Product A", store_id: 1},
       {name: "Product B", store_id: 10}
     ]
-    assert_search "product", ["Product A"], where: {_raw: Searchkick.raw({script: {script: "doc['store_id'].value < 10"}})}
-    assert_search "product", ["Product A"], where: {_raw: Searchkick.raw({script: {script: {source: "doc['store_id'].value < 10", lang: "expression"}}})}
-    assert_search "product", ["Product A"], where: {_raw: Searchkick.raw({script: {script: {source: "doc['store_id'].value < params['value']", params: {value: 10}}}})}
+    assert_search "product", ["Product A"], where: {_script: Searchkick.script("doc['store_id'].value < 10")}
+    assert_search "product", ["Product A"], where: {_script: Searchkick.script("doc['store_id'].value < 10", lang: "expression")}
+    assert_search "product", ["Product A"], where: {_script: Searchkick.script("doc['store_id'].value < params['value']", params: {value: 10})}
   end
 
   def test_script_string
     error = assert_raises(TypeError) do
-      assert_search "product", ["Product A"], where: {_raw: {script: {script: "doc['store_id'].value < 10"}}}
+      assert_search "product", ["Product A"], where: {_script: "doc['store_id'].value < 10"}
     end
-    assert_equal "Use Searchkick.raw for raw filters", error.message
+    assert_equal "expected Searchkick::Script", error.message
   end
 
   def test_where_string