searchkick 4.5.1 → 4.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44f4a5255a208b7d24aa1b6d668808d3aff83a9ebb9f07a1a1a83fd9e3845738
-  data.tar.gz: 0ac096c02151a04a00751de140520547570b9c24fa2fccffd9d4761637b85531
+  metadata.gz: 81a9204c559530b42163004d28daaafce96c3368ae9949a0214b3d8701003a54
+  data.tar.gz: ba8b73a669a257eedc8f2533d7dfbbde960ad0b5b5a5cfec2d6923a127eb6df1
 SHA512:
-  metadata.gz: ff25ecdd74852fdbca33909d37445adbb42aa76785df75d9f1d9903d1dbee5712507d30a654dfaf829b9b6c0db0148cf48fbb4a257e3decf69e6c316c40b66fc
-  data.tar.gz: e07d8ddd9dbcf661db01948a7f20ad0b91d6427adddbbe987d571011983046650bd21726f74a2d0d11caaf9d49cd83b70a92738dc1cb21346e2c74009a1c494c
+  metadata.gz: 1d5a878593afa54f7db54163b6e3166ecd76fe784ef28a5d0e22ae874dd1fc4ffc6743d38f27015b2b30c1f5a79c280ef326e0fd240fb51459677bd2a3f20abb
+  data.tar.gz: 956e52c052b0ce74ada39e30425c3191878a4cc4e08c91dd8eefc37bba9a47a924481c344329efd203ca133b1ec26e1cce2673dd60603e8aec44233fae24b51e

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 4.5.2 (2021-08-05)
+
+- Fixed error with reindex queue
+- Fixed error with `model_name` method with multiple models
+- Fixed error with `debug` option with elasticsearch-ruby 7.14
+
 ## 4.5.1 (2021-08-03)
 
 - Improved performance of reindex queue

data/lib/searchkick/query.rb

@@ -109,7 +109,12 @@ module Searchkick
       request_params = query.except(:index, :type, :body)
 
       # no easy way to tell which host the client will use
-      host = Searchkick.client.transport.hosts.first
+      host =
+        if Elasticsearch::VERSION.to_f >= 7.14
+          Searchkick.client.transport.transport.hosts.first
+        else
+          Searchkick.client.transport.hosts.first
+        end
       credentials = host[:user] || host[:password] ? "#{host[:user]}:#{host[:password]}@" : nil
       params = ["pretty"]
       request_params.each do |k, v|

data/lib/searchkick/reindex_queue.rb

@@ -15,7 +15,7 @@ module Searchkick
     # TODO use reliable queuing
     def reserve(limit: 1000)
       if supports_rpop_with_count?
-        Searchkick.with_redis { |r| r.call("rpop", redis_key, limit) }
+        Searchkick.with_redis { |r| r.call("rpop", redis_key, limit) }.to_a
       else
         record_ids = []
         Searchkick.with_redis do |r|

data/lib/searchkick/results.rb

@@ -71,7 +71,11 @@ module Searchkick
     end
 
     def model_name
-      klass.model_name
+      if klass.nil?
+        ActiveModel::Name.new(self.class, nil, 'Result')
+      else
+        klass.model_name
+      end
     end
 
     def entry_name(options = {})

data/lib/searchkick/version.rb

@@ -1,3 +1,3 @@
 module Searchkick
-  VERSION = "4.5.1"
+  VERSION = "4.5.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: searchkick
 version: !ruby/object:Gem::Version
-  version: 4.5.1
+  version: 4.5.2
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-03 00:00:00.000000000 Z
+date: 2021-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel