searchkick 6.1.1 → 6.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc3f9143aa914fc0c55104f5d42a0c38af508d959091ed4e6ad394f375f452cf
-  data.tar.gz: a0a331a5547e6cb3471510f2d0b719678e51b15a8afe80983a49872a2a5486be
+  metadata.gz: 2121e032be84fa384237ffc463e742a715ce154d93c43cbbd26513f502a528f2
+  data.tar.gz: 7f84359f3aa297e194fc6d106fc1716e269c03f20a792da8f44bacdeb4fe5a3e
 SHA512:
-  metadata.gz: ba2be5ab1ec12434ade9cc29dfb7bdea05d8af02295936374184e570629736f13a6ee3ec022ab3792891a835e7b470bd88668c5dbfc7dc4893d860553370ea6d
-  data.tar.gz: a6dc2610a4870916b12c510c11da956b9822e80800fa369e9437aefb92034c380e499815735c9e0a19db798f59f11b9f08fb0484ea712011dca689ce3e281df2
+  metadata.gz: 45f86871453027c8ec325e7a3c9bab2562b6e4ec41a5b3f05fb1c844bf94fe292c42305800323e67ab46173825f38d02e8a2ff78830c448e013ab45d58357998
+  data.tar.gz: a048dbde715b327464b5f7e795f8d534e4e87d8ad150700d0a820848d0756fb46f7d8e932fef7b191a176a44c37ffa0bc49d7db1baea6cfc72dd1b2ef3144310

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## 6.2.0 (2026-10-27)
+
+- Added support for `opensearch-ruby` 4 gem (in beta)
+- Fixed error with `highlight` method and no arguments
+- Fixed async reindex for inherited models when changing type
+- Dropped support for Ruby < 3.3 and Active Record < 8
+
+## 6.1.2 (2026-06-04)
+
+- Fixed `too_long_http_line_exception` with `clear_scroll` method
+
 ## 6.1.1 (2026-05-14)
 
 - Fixed smart aggs behavior with `_and`

data/README.md

@@ -43,8 +43,6 @@ Check out [Searchjoy](https://github.com/ankane/searchjoy) for analytics and [Au
 - [Reference](#reference)
 - [Contributing](#contributing)
 
-Searchkick 6.0 was recently released! See [how to upgrade](#upgrading)
-
 ## Getting Started
 
 Install [Elasticsearch](https://www.elastic.co/downloads/elasticsearch) or [OpenSearch](https://opensearch.org/downloads.html). For Homebrew, use:
@@ -1589,7 +1587,7 @@ For large data sets, you can use background jobs to parallelize reindexing.
 
 ```ruby
 Product.reindex(mode: :async)
-# {index_name: "products_production_20250111210018065"}
+# {index_name: "products_production_20260111210018065"}
 ```
 
 Once the jobs complete, promote the new index with:

data/lib/searchkick/indexer.rb

@@ -19,7 +19,7 @@ module Searchkick
 
       return if items.empty?
 
-      response = Searchkick.client.bulk(body: items)
+      response = Searchkick.client.bulk(body: Searchkick.opensearch4_client? ? items.as_json : items)
       if response["errors"]
         # note: delete does not set error when item not found
         first_with_error = response["items"].map do |item|

data/lib/searchkick/multi_search.rb

@@ -19,7 +19,7 @@ module Searchkick
       params = {
         body: search_queries.flat_map { |q| [q.params.except(:body), q.body] }
       }
-      params[:opaque_id] = @opaque_id if @opaque_id
+      Searchkick.add_opaque_id(params, @opaque_id) if @opaque_id
       responses = client.msearch(params)["responses"]
 
       retry_queries = []

data/lib/searchkick/query.rb

@@ -94,7 +94,7 @@ module Searchkick
       params[:type] = @type if @type
       params[:routing] = @routing if @routing
       params[:scroll] = @scroll if @scroll
-      params[:opaque_id] = @opaque_id if @opaque_id
+      Searchkick.add_opaque_id(params, @opaque_id) if @opaque_id
       params.merge!(options[:request_params]) if options[:request_params]
       params
     end
@@ -225,12 +225,13 @@ module Searchkick
 
     def execute_search
       name = searchkick_klass ? "#{searchkick_klass.name} Search" : "Search"
+      params = params()
       event = {
         name: name,
         query: params
       }
       ActiveSupport::Notifications.instrument("search.searchkick", event) do
-        Searchkick.client.search(params)
+        Searchkick.client.search(Searchkick.opensearch4_client? ? params.as_json : params)
       end
     end
 

data/lib/searchkick/record_indexer.rb

@@ -37,7 +37,7 @@ module Searchkick
           end
 
           Searchkick::ReindexV2Job.set(**job_options).perform_later(
-            record.class.name,
+            record.class.searchkick_options[:class_name],
             record.id.to_s,
             method_name ? method_name.to_s : nil,
             routing: routing,

data/lib/searchkick/relation.rb

@@ -222,11 +222,11 @@ module Searchkick
       self
     end
 
-    def highlight(value)
+    def highlight(value = true)
       clone.highlight!(value)
     end
 
-    def highlight!(value)
+    def highlight!(value = true)
       check_loaded
       @options[:highlight] = value
       self

data/lib/searchkick/results.rb

@@ -191,7 +191,7 @@ module Searchkick
             scroll: options[:scroll],
             body: {scroll_id: scroll_id}
           }
-          params[:opaque_id] = options[:opaque_id] if options[:opaque_id]
+          Searchkick.add_opaque_id(params, options[:opaque_id]) if options[:opaque_id]
           Results.new(@klass, Searchkick.client.scroll(params), @options)
         rescue => e
           if Searchkick.not_found_error?(e) && e.message =~ /search_context_missing_exception/i
@@ -208,7 +208,7 @@ module Searchkick
         # try to clear scroll
         # not required as scroll will expire
         # but there is a cost to open scrolls
-        Searchkick.client.clear_scroll(scroll_id: scroll_id)
+        Searchkick.client.clear_scroll({body: {scroll_id: scroll_id}})
       rescue => e
         raise e unless Searchkick.transport_error?(e)
       end

data/lib/searchkick/version.rb

@@ -1,3 +1,3 @@
 module Searchkick
-  VERSION = "6.1.1"
+  VERSION = "6.2.0"
 end

data/lib/searchkick.rb

@@ -133,6 +133,13 @@ module Searchkick
     @opensearch
   end
 
+  def self.opensearch4_client?
+    unless defined?(@opensearch4_client)
+      @opensearch4_client = defined?(OpenSearch) && OpenSearch::VERSION.to_i >= 4 && client.is_a?(OpenSearch::Client)
+    end
+    @opensearch4_client
+  end
+
   def self.server_below?(version)
     Gem::Version.new(server_version.split("-")[0]) < Gem::Version.new(version.split("-")[0])
   end
@@ -351,6 +358,15 @@ module Searchkick
     end
   end
 
+  # private
+  def self.add_opaque_id(params, opaque_id)
+    if opensearch4_client?
+      (params[:headers] ||= {}).merge!("X-Opaque-Id" => opaque_id)
+    else
+      params[:opaque_id] = opaque_id
+    end
+  end
+
   # private
   def self.not_found_error?(e)
     (defined?(Elastic::Transport) && e.is_a?(Elastic::Transport::Transport::Errors::NotFound)) ||

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: searchkick
 version: !ruby/object:Gem::Version
-  version: 6.1.1
+  version: 6.2.0
 platform: ruby
 authors:
 - Andrew Kane
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '8'
 email: andrew@ankane.org
 executables: []
 extensions: []
@@ -70,14 +70,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.2'
+      version: '3.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.10
+rubygems_version: 4.0.20
 specification_version: 4
 summary: Intelligent search made easy with Rails and Elasticsearch or OpenSearch
 test_files: []