Replaced script with raw

CHANGELOG.md

@@ -1,6 +1,6 @@
 ## 5.4.0 (unreleased)
 
-- Added support for scripting 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
 - Dropped support for Ruby < 3.1

README.md

@@ -123,7 +123,7 @@ where: {
   _not: {store_id: 1},           # negate a condition
   _or: [{in_stock: true}, {backordered: true}],
   _and: [{in_stock: true}, {backordered: true}],
-  _script: Searchkick.script("doc['a'].value > doc['b'].value") # [unreleased]
+  _script: Searchkick.raw("doc['a'].value > doc['b'].value") # experimental [unreleased]
 }
 ```
 

lib/searchkick.rb

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

lib/searchkick/query.rb

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

lib/searchkick/raw.rb

@@ -0,0 +1,9 @@
+module Searchkick
+  class Raw
+    attr_reader :value
+
+    def initialize(value)
+      @value = value
+    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: {_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})}
+    assert_search "product", ["Product A"], where: {_script: Searchkick.raw("doc['store_id'].value < 10")}
+    assert_search "product", ["Product A"], where: {_script: Searchkick.raw({source: "doc['store_id'].value < 10", lang: "expression"})}
+    assert_search "product", ["Product A"], where: {_script: Searchkick.raw({source: "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: {_script: "doc['store_id'].value < 10"}
     end
-    assert_equal "expected Searchkick::Script", error.message
+    assert_equal "expected Searchkick::Raw", error.message
   end
 
   def test_where_string