chewy 7.3.6 → 7.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5405b97585dccb630ef95340245a390ff7ffe19a1a27e57a35b4f4d6844e2e0
-  data.tar.gz: 91570a2fd199d511bf40caf473d8000504cae38a4bb4b68c6f767913033f7234
+  metadata.gz: 1b939ad8c84f1499caf873e2db0ba62794b785da0297604a38404c0f4f68a930
+  data.tar.gz: bba3a09f52a65c3433b385c227c2f900645b145fba18e11737d7a9b2958d51ef
 SHA512:
-  metadata.gz: 8441a05d5a3c55834f7380a1e10b3acb4f01f17b6cafc45e3ccead13f0d7c2a6485447c2bc8461ae5c91b37b36c4d57f140f76cb993ca63777195d64237d8432
-  data.tar.gz: 3571db3d5fa632d6ee9c10105578ca8f805090e375372f1ad98a192dca440536f27559be2439d7e75c8ab833f596fc61758d464696ec4ee47942ff29fbffa6d5
+  metadata.gz: cb4f984274557d91d9d4d08306516ca4b0592bf97de3b3432585bfa9da14906d64d809da7803f19f36ba908cd8623843398e30bc78db22951cfb73015bf60a4f
+  data.tar.gz: 02ecef485783e555bd112240d74c75832779b8415aded37b8eb527357729e78053caead1615928fd1d54fa053a146779bb281d2bdf9f26f448c1ee680fea9bee

data/.github/workflows/ruby.yml

@@ -11,39 +11,13 @@ on:
     ]
 
 jobs:
-  ruby-2:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [2.6, 2.7]
-        gemfile: [rails.5.2.activerecord, rails.6.0.activerecord, rails.6.1.activerecord]
-    name: ${{ matrix.ruby }}-${{ matrix.gemfile }}
-
-    env:
-      BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
-
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          bundler-cache: true
-      - name: Run Elasticsearch
-        uses: elastic/elastic-github-actions/elasticsearch@9de0f78f306e4ebc0838f057e6b754364685e759
-        with:
-          stack-version: 7.10.1
-          port: 9250
-      - name: Tests
-        run: bundle exec rspec
-
   ruby-3:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
         ruby: [ '3.0', '3.1', '3.2' ]
-        gemfile: [ rails.6.1.activerecord, rails.7.0.activerecord, rails.7.1.activerecord ]
+        gemfile: [rails.6.1.activerecord, rails.7.0.activerecord, rails.7.1.activerecord]
     name: ${{ matrix.ruby }}-${{ matrix.gemfile }}
 
     env:
@@ -69,6 +43,6 @@ jobs:
       - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.7
+          ruby-version: 3.0
           bundler-cache: true
       - run: bundle exec rubocop --format simple

data/.rubocop.yml

@@ -2,7 +2,7 @@ inherit_from: .rubocop_todo.yml
 
 AllCops:
   NewCops: enable
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 3.0
 
 Layout/AccessModifierIndentation:
   EnforcedStyle: outdent

data/CHANGELOG.md

@@ -8,7 +8,24 @@
 
 ### Bugs Fixed
 
-## 7.3.5 (2023-12-13)
+## 7.5.0 (2023-01-15)
+
+### New Features
+
+* [#894](https://github.com/toptal/chewy/pull/894): Way of cleaning redis from artifacts left by `delayed_sidekiq` strategy which could potentially cause flaky tests. ([@Drowze](https://github.com/Drowze))
+* [#919](https://github.com/toptal/chewy/pull/919): Add pre-request filter ([@konalegi][https://github.com/konalegi])
+
+## 7.4.0 (2023-12-13)
+
+### New Features
+
+### Changes
+
+* [#911](https://github.com/toptal/chewy/pull/911): Remove ruby 2.x. ([@konalegi][https://github.com/konalegi])
+
+### Bugs Fixed
+
+## 7.3.6 (2023-12-13)
 
 ### New Features
 

data/Gemfile

@@ -1,7 +1,5 @@
 source 'https://rubygems.org'
 
-gemspec
-
 gem 'activerecord'
 
 gem 'activejob', require: false
@@ -18,5 +16,7 @@ gem 'guard-rspec'
 gem 'redcarpet'
 gem 'yard'
 
-gem 'rexml' if RUBY_VERSION >= '3.0.0'
-gem 'ruby2_keywords' if RUBY_VERSION < '2.7'
+gem 'rexml'
+
+eval_gemfile 'gemfiles/base.gemfile'
+gemspec

data/README.md

@@ -43,7 +43,7 @@ Or install it yourself as:
 
 ### Ruby
 
-Chewy is compatible with MRI 2.6-3.0¹.
+Chewy is compatible with MRI 3.0-3.2¹.
 
 > ¹ Ruby 3 is only supported with Rails 6.1
 
@@ -848,6 +848,12 @@ Explicit call of the reindex using `:delayed_sidekiq` strategy with `:update_fie
 CitiesIndex.import([1, 2, 3], update_fields: [:name], strategy: :delayed_sidekiq)
 ```
 
+While running tests with delayed_sidekiq strategy and Sidekiq is using a real redis instance that is NOT cleaned up in between tests (via e.g. `Sidekiq.redis(&:flushdb)`), you'll want to cleanup some redis keys in between tests to avoid state leaking and flaky tests. Chewy provides a convenience method for that:
+```ruby
+# it might be a good idea to also add to your testing setup, e.g.: a rspec `before` hook
+Chewy::Strategy::DelayedSidekiq.clear_timechunks!
+```
+
 #### `:active_job`
 
 This does the same thing as `:atomic`, but using ActiveJob. This will inherit the ActiveJob configuration settings including the `active_job.queue_adapter` setting for the environment. Patch `Chewy::Strategy::ActiveJob::Worker` for index updates improving.
@@ -1275,6 +1281,23 @@ If you use `DatabaseCleaner` in your tests with [the `transaction` strategy](htt
 Chewy.use_after_commit_callbacks = !Rails.env.test?
 ```
 
+### Pre-request Filter
+
+Should you need to inspect the query prior to it being dispatched to ElasticSearch during any queries, you can use the `before_es_request_filter`. `before_es_request_filter` is a callable object, as demonstrated below:
+
+```ruby
+Chewy.before_es_request_filter = -> (method_name, args, kw_args) { ... }
+```
+
+While using the `before_es_request_filter`, please consider the following:
+
+* `before_es_request_filter` acts as a simple proxy before any request made via the    `ElasticSearch::Client`. The arguments passed to this filter include:
+  * `method_name` -  The name of the method being called. Examples are search, count, bulk and etc.
+  * `args` and `kw_args` - These are the positional arguments provided in the method call.
+* The operation is synchronous, so avoid executing any heavy or time-consuming operations within the filter to prevent performance degradation.
+* The return value of the proc is disregarded. This filter is intended for inspection or modification of the query rather than generating a response.
+* Any exception raised inside the callback will propagate upward and halt the execution of the query. It is essential to handle potential errors adequately to ensure the stability of your search functionality.
+
 ## Contributing
 
 1. Fork it (http://github.com/toptal/chewy/fork)

data/chewy.gemspec

@@ -2,7 +2,7 @@ lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'chewy/version'
 
-Gem::Specification.new do |spec| # rubocop:disable Metrics/BlockLength
+Gem::Specification.new do |spec|
   spec.name          = 'chewy'
   spec.version       = Chewy::VERSION
   spec.authors       = ['Toptal, LLC', 'pyromaniac']
@@ -14,24 +14,10 @@ Gem::Specification.new do |spec| # rubocop:disable Metrics/BlockLength
 
   spec.files         = `git ls-files`.split($RS)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'database_cleaner'
-  spec.add_development_dependency 'elasticsearch-extensions'
-  spec.add_development_dependency 'mock_redis'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec', '>= 3.7.0'
-  spec.add_development_dependency 'rspec-collection_matchers'
-  spec.add_development_dependency 'rspec-its'
-  spec.add_development_dependency 'rubocop', '1.11'
-  spec.add_development_dependency 'sqlite3'
-  spec.add_development_dependency 'timecop'
-
-  spec.add_development_dependency 'method_source'
-  spec.add_development_dependency 'unparser'
-
-  spec.add_dependency 'activesupport', '>= 5.2'
+  spec.add_dependency 'activesupport', '>= 5.2' # Remove with major version bump, 8.x
   spec.add_dependency 'elasticsearch', '>= 7.12.0', '< 7.14.0'
   spec.add_dependency 'elasticsearch-dsl'
+  spec.metadata['rubygems_mfa_required'] = 'true'
 end

data/gemfiles/base.gemfile

@@ -0,0 +1,12 @@
+gem 'database_cleaner'
+gem 'elasticsearch-extensions'
+gem 'method_source'
+gem 'mock_redis'
+gem 'rake'
+gem 'rspec', '>= 3.7.0'
+gem 'rspec-collection_matchers'
+gem 'rspec-its'
+gem 'rubocop', '1.48'
+gem 'sqlite3'
+gem 'timecop'
+gem 'unparser'

data/gemfiles/rails.6.1.activerecord.gemfile

@@ -8,6 +8,7 @@ gem 'parallel', require: false
 gem 'rspec_junit_formatter', '~> 0.4.1'
 gem 'sidekiq', require: false
 
-gem 'rexml' if RUBY_VERSION >= '3.0.0'
+gem 'rexml'
 
 gemspec path: '../'
+eval_gemfile 'base.gemfile'

data/gemfiles/rails.7.0.activerecord.gemfile

@@ -8,6 +8,7 @@ gem 'parallel', require: false
 gem 'rspec_junit_formatter', '~> 0.4.1'
 gem 'sidekiq', require: false
 
-gem 'rexml' if RUBY_VERSION >= '3.0.0'
+gem 'rexml'
 
 gemspec path: '../'
+eval_gemfile 'base.gemfile'

data/gemfiles/rails.7.1.activerecord.gemfile

@@ -8,6 +8,7 @@ gem 'parallel', require: false
 gem 'rspec_junit_formatter', '~> 0.4.1'
 gem 'sidekiq', require: false
 
-gem 'rexml' if RUBY_VERSION >= '3.0.0'
+gem 'rexml'
 
 gemspec path: '../'
+eval_gemfile 'base.gemfile'

data/lib/chewy/config.rb

@@ -38,7 +38,9 @@ module Chewy
                   # for type mappings like `_all`.
                   :default_root_options,
                   # Default field type for any field in any Chewy type. Defaults to 'text'.
-                  :default_field_type
+                  :default_field_type,
+                  # Callback called on each search request to be done into ES
+                  :before_es_request_filter
 
     attr_reader :transport_logger, :transport_tracer,
                 # Chewy search request DSL base class, used by every index.
@@ -127,17 +129,19 @@ module Chewy
   private
 
     def yaml_settings
-      @yaml_settings ||= begin
-        if defined?(Rails::VERSION)
-          file = Rails.root.join('config', 'chewy.yml')
+      @yaml_settings ||= build_yaml_settings || {}
+    end
 
-          if File.exist?(file)
-            yaml = ERB.new(File.read(file)).result
-            hash = YAML.respond_to?(:unsafe_load) ? YAML.unsafe_load(yaml) : YAML.load(yaml) # rubocop:disable Security/YAMLLoad
-            hash[Rails.env].try(:deep_symbolize_keys) if hash
-          end
-        end || {}
-      end
+    def build_yaml_settings
+      return unless defined?(Rails::VERSION)
+
+      file = Rails.root.join('config', 'chewy.yml')
+
+      return unless File.exist?(file)
+
+      yaml = ERB.new(File.read(file)).result
+      hash = YAML.unsafe_load(yaml)
+      hash[Rails.env].try(:deep_symbolize_keys) if hash
     end
 
     def build_search_class(base)

data/lib/chewy/elastic_client.rb

@@ -0,0 +1,31 @@
+module Chewy
+  # Replacement for Chewy.client
+  class ElasticClient
+    def self.build_es_client(configuration = Chewy.configuration)
+      client_configuration = configuration.deep_dup
+      client_configuration.delete(:prefix) # used by Chewy, not relevant to Elasticsearch::Client
+      block = client_configuration[:transport_options].try(:delete, :proc)
+      ::Elasticsearch::Client.new(client_configuration, &block)
+    end
+
+    def initialize(elastic_client = self.class.build_es_client)
+      @elastic_client = elastic_client
+    end
+
+  private
+
+    def method_missing(name, *args, **kwargs, &block)
+      inspect_payload(name, args, kwargs)
+
+      @elastic_client.__send__(name, *args, **kwargs, &block)
+    end
+
+    def respond_to_missing?(name, _include_private = false)
+      @elastic_client.respond_to?(name) || super
+    end
+
+    def inspect_payload(name, args, kwargs)
+      Chewy.config.before_es_request_filter&.call(name, args, kwargs)
+    end
+  end
+end

data/lib/chewy/fields/root.rb

@@ -27,7 +27,7 @@ module Chewy
         mappings[name]
       end
 
-      ruby2_keywords def dynamic_template(*args)
+      def dynamic_template(*args)
         options = args.extract_options!.deep_symbolize_keys
         if args.first
           template_name = :"template_#{dynamic_templates.count.next}"

data/lib/chewy/index/adapter/active_record.rb

@@ -6,7 +6,7 @@ module Chewy
       class ActiveRecord < Orm
         def self.accepts?(target)
           defined?(::ActiveRecord::Base) && (
-            target.is_a?(Class) && target < ::ActiveRecord::Base ||
+            (target.is_a?(Class) && target < ::ActiveRecord::Base) ||
             target.is_a?(::ActiveRecord::Relation))
         end
 

data/lib/chewy/index/adapter/object.rb

@@ -85,7 +85,7 @@ module Chewy
         # @param args [Array<#to_json>]
         # @option options [Integer] :batch_size import processing batch size
         # @return [true, false]
-        ruby2_keywords def import(*args, &block)
+        def import(*args, &block)
           collection, options = import_args(*args)
           import_objects(collection, options, &block)
         end
@@ -113,7 +113,7 @@ module Chewy
         #   end
         #
         # @see Chewy::Index::Adapter::Base#import_fields
-        ruby2_keywords def import_fields(*args, &block)
+        def import_fields(*args, &block)
           return enum_for(:import_fields, *args) unless block_given?
 
           options = args.extract_options!
@@ -139,7 +139,7 @@ module Chewy
         # For the Object adapter returns the objects themselves in batches.
         #
         # @see Chewy::Index::Adapter::Base#import_references
-        ruby2_keywords def import_references(*args, &block)
+        def import_references(*args, &block)
           return enum_for(:import_references, *args) unless block_given?
 
           collection, options = import_args(*args)

data/lib/chewy/index/adapter/orm.rb

@@ -72,7 +72,7 @@ module Chewy
         #   # or
         #   UsersIndex.import users.map(&:id) # user ids will be deleted from index
         #
-        ruby2_keywords def import(*args, &block)
+        def import(*args, &block)
           collection, options = import_args(*args)
 
           if !collection.is_a?(relation_class) || options[:direct_import]
@@ -82,7 +82,7 @@ module Chewy
           end
         end
 
-        ruby2_keywords def import_fields(*args, &block)
+        def import_fields(*args, &block)
           return enum_for(:import_fields, *args) unless block_given?
 
           collection, options = import_args(*args)

data/lib/chewy/index/import/bulk_builder.rb

@@ -162,12 +162,12 @@ module Chewy
             .filter(ids: {values: ids_for_cache})
             .order('_doc')
             .pluck(:_id, :_routing, join_field)
-            .map do |id, routing, join|
+            .to_h do |id, routing, join|
               [
                 id,
                 {routing: routing, parent_id: join['parent']}
               ]
-            end.to_h
+            end
         end
 
         def existing_routing(id)

data/lib/chewy/index/import.rb

@@ -72,7 +72,7 @@ module Chewy
         # @option options [true, false] update_failover enables full objects reimport in cases of partial update errors, `true` by default
         # @option options [true, Integer, Hash] parallel enables parallel import processing with the Parallel gem, accepts the number of workers or any Parallel gem acceptable options
         # @return [true, false] false in case of errors
-        ruby2_keywords def import(*args)
+        def import(*args)
           intercept_import_using_strategy(*args).blank?
         end
 
@@ -83,7 +83,7 @@ module Chewy
         # in case of any import errors.
         #
         # @raise [Chewy::ImportFailed] in case of errors
-        ruby2_keywords def import!(*args)
+        def import!(*args)
           errors = intercept_import_using_strategy(*args)
 
           raise Chewy::ImportFailed.new(self, errors) if errors.present?

data/lib/chewy/index/observe/active_record_methods.rb

@@ -71,7 +71,7 @@ module Chewy
             end
           end
 
-          ruby2_keywords def update_index(type_name, *args, &block)
+          def update_index(type_name, *args, &block)
             callback_options = Observe.extract_callback_options!(args)
             update_proc = Observe.update_proc(type_name, *args, &block)
             callback = Chewy::Index::Observe::Callback.new(update_proc, callback_options)

data/lib/chewy/index/syncer.rb

@@ -27,7 +27,7 @@ module Chewy
     # @see Chewy::Index::Actions::ClassMethods#sync
     class Syncer
       DEFAULT_SYNC_BATCH_SIZE = 20_000
-      ISO_DATETIME = /\A(\d{4})-(\d\d)-(\d\d) (\d\d):(\d\d):(\d\d)(\.\d+)?\z/.freeze
+      ISO_DATETIME = /\A(\d{4})-(\d\d)-(\d\d) (\d\d):(\d\d):(\d\d)(\.\d+)?\z/
       OUTDATED_IDS_WORKER = lambda do |outdated_sync_field_type, source_data_hash, index, total, index_data|
         ::Process.setproctitle("chewy [#{index}]: sync outdated calculation (#{::Parallel.worker_number + 1}/#{total})") if index
         index_data.each_with_object([]) do |(id, index_sync_value), result|

data/lib/chewy/minitest/search_index_receiver.rb

@@ -6,6 +6,8 @@
 # The class will capture the data from the *param on the Chewy::Index.bulk method and
 # aggregate the data for test analysis.
 class SearchIndexReceiver
+  MUTATION_FOR_CLASS = Struct.new(:indexes, :deletes, keyword_init: true)
+
   def initialize
     @mutations = {}
   end
@@ -71,6 +73,6 @@ private
   # @param index [Chewy::Index] the index to fetch.
   # @return [#indexes, #deletes] an object with a list of indexes and a list of deletes.
   def mutation_for(index)
-    @mutations[index] ||= OpenStruct.new(indexes: [], deletes: [])
+    @mutations[index] ||= MUTATION_FOR_CLASS.new(indexes: [], deletes: [])
   end
 end

data/lib/chewy/rake_helper.rb

@@ -347,9 +347,9 @@ module Chewy
         return if journal_exists?
 
         output.puts "############################################################\n" \
-                    "WARN: You are risking to lose some changes during the reset.\n" \
-                    "      Please consider enabling journaling.\n" \
-                    "      See https://github.com/toptal/chewy#journaling\n" \
+                    "WARN: You are risking to lose some changes during the reset.\n      " \
+                    "Please consider enabling journaling.\n      " \
+                    "See https://github.com/toptal/chewy#journaling\n" \
                     '############################################################'
       end
 

data/lib/chewy/rspec/update_index.rb

@@ -108,7 +108,7 @@ RSpec::Matchers.define :update_index do |index_name, options = {}| # rubocop:dis
       params_matcher = @no_refresh ? has_entry(refresh: false) : any_parameters
       Chewy::Index::Import::BulkRequest.stubs(:new).with(index, params_matcher).returns(mock_bulk_request)
     else
-      mocked_already = ::RSpec::Mocks.space.proxy_for(Chewy::Index::Import::BulkRequest).method_double_if_exists_for_message(:new)
+      mocked_already = RSpec::Mocks.space.proxy_for(Chewy::Index::Import::BulkRequest).method_double_if_exists_for_message(:new)
       allow(Chewy::Index::Import::BulkRequest).to receive(:new).and_call_original unless mocked_already
       params_matcher = @no_refresh ? hash_including(refresh: false) : any_args
       allow(Chewy::Index::Import::BulkRequest).to receive(:new).with(index, params_matcher).and_return(mock_bulk_request)
@@ -220,7 +220,7 @@ RSpec::Matchers.define :update_index do |index_name, options = {}| # rubocop:dis
     expected_count = options[:times] || options[:count]
     expected_attributes = (options[:with] || options[:attributes] || {}).deep_symbolize_keys
 
-    args.flatten.map do |document|
+    args.flatten.to_h do |document|
       id = document.respond_to?(:id) ? document.id.to_s : document.to_s
       [id, {
         document: document,
@@ -229,7 +229,7 @@ RSpec::Matchers.define :update_index do |index_name, options = {}| # rubocop:dis
         real_count: 0,
         real_attributes: {}
       }]
-    end.to_h
+    end
   end
 
   def compare_attributes(expected, real)

data/lib/chewy/runtime/version.rb

@@ -5,7 +5,7 @@ module Chewy
       attr_reader :major, :minor, :patch
 
       def initialize(version)
-        @major, @minor, @patch = *(version.to_s.split('.', 3) + [0] * 3).first(3).map(&:to_i)
+        @major, @minor, @patch = *(version.to_s.split('.', 3) + ([0] * 3)).first(3).map(&:to_i)
       end
 
       def to_s

data/lib/chewy/search/parameters/indices.rb

@@ -17,7 +17,7 @@ module Chewy
         # @param other [Chewy::Search::Parameters::Storage] any storage instance
         # @return [true, false] the result of comparison
         def ==(other)
-          super || other.class == self.class && other.render == render
+          super || (other.class == self.class && other.render == render)
         end
 
         # Just adds indices to indices.

data/lib/chewy/search/parameters/storage.rb

@@ -35,7 +35,7 @@ module Chewy
         # @param other [Chewy::Search::Parameters::Storage] any storage instance
         # @return [true, false] the result of comparision
         def ==(other)
-          super || other.class == self.class && other.value == value
+          super || (other.class == self.class && other.value == value)
         end
 
         # Replaces current value with normalized provided one. Doesn't

data/lib/chewy/search/parameters.rb

@@ -1,5 +1,5 @@
-Dir.glob(File.join(File.dirname(__FILE__), 'parameters', 'concerns', '*.rb')).sort.each { |f| require f }
-Dir.glob(File.join(File.dirname(__FILE__), 'parameters', '*.rb')).sort.each { |f| require f }
+Dir.glob(File.join(File.dirname(__FILE__), 'parameters', 'concerns', '*.rb')).each { |f| require f }
+Dir.glob(File.join(File.dirname(__FILE__), 'parameters', '*.rb')).each { |f| require f }
 
 module Chewy
   module Search
@@ -53,7 +53,7 @@ module Chewy
       # @param other [Object] any object
       # @return [true, false]
       def ==(other)
-        super || other.is_a?(self.class) && compare_storages(other)
+        super || (other.is_a?(self.class) && compare_storages(other))
       end
 
       # Clones the specified storage, performs the operation

data/lib/chewy/search.rb

@@ -56,7 +56,7 @@ module Chewy
       #
       # @example
       #   PlacesIndex.query(match: {name: 'Moscow'})
-      ruby2_keywords def method_missing(name, *args, &block)
+      def method_missing(name, *args, &block)
         if search_class::DELEGATED_METHODS.include?(name)
           all.send(name, *args, &block)
         else
@@ -84,10 +84,12 @@ module Chewy
       def delegate_scoped(source, destination, methods)
         methods.each do |method|
           destination.class_eval do
-            define_method method do |*args, &block|
-              scoping { source.public_send(method, *args, &block) }
+            define_method method do |*args, **kwargs, &block|
+              scoping do
+                source.public_send(method, *args, **kwargs, &block)
+              end
             end
-            ruby2_keywords method
+            method
           end
         end
       end

data/lib/chewy/strategy/delayed_sidekiq/scheduler.rb

@@ -18,6 +18,7 @@ module Chewy
         DEFAULT_MARGIN = 2
         DEFAULT_QUEUE = 'chewy'
         KEY_PREFIX = 'chewy:delayed_sidekiq'
+        ALL_SETS_KEY = "#{KEY_PREFIX}:all_sets".freeze
         FALLBACK_FIELDS = 'all'
         FIELDS_IDS_SEPARATOR = ';'
         IDS_SEPARATOR = ','
@@ -68,8 +69,10 @@ module Chewy
           ::Sidekiq.redis do |redis|
             # warning: Redis#sadd will always return an Integer in Redis 5.0.0. Use Redis#sadd? instead
             if redis.respond_to?(:sadd?)
+              redis.sadd?(ALL_SETS_KEY, timechunks_key)
               redis.sadd?(timechunk_key, serialize_data)
             else
+              redis.sadd(ALL_SETS_KEY, timechunks_key)
               redis.sadd(timechunk_key, serialize_data)
             end
 

data/lib/chewy/strategy/delayed_sidekiq.rb

@@ -5,6 +5,19 @@ module Chewy
     class DelayedSidekiq < Sidekiq
       require_relative 'delayed_sidekiq/scheduler'
 
+      # cleanup the redis sets used internally. Useful mainly in tests to avoid
+      # leak and potential flaky tests.
+      def self.clear_timechunks!
+        ::Sidekiq.redis do |redis|
+          timechunk_sets = redis.smembers(Chewy::Strategy::DelayedSidekiq::Scheduler::ALL_SETS_KEY)
+          break if timechunk_sets.empty?
+
+          redis.pipelined do |pipeline|
+            timechunk_sets.each { |set| pipeline.del(set) }
+          end
+        end
+      end
+
       def leave
         @stash.each do |type, ids|
           next if ids.empty?

data/lib/chewy/version.rb

@@ -1,3 +1,3 @@
 module Chewy
-  VERSION = '7.3.6'.freeze
+  VERSION = '7.5.0'.freeze
 end

data/lib/chewy.rb

@@ -48,7 +48,8 @@ require 'chewy/index'
 require 'chewy/fields/base'
 require 'chewy/fields/root'
 require 'chewy/journal'
-require 'chewy/railtie' if defined?(::Rails::Railtie)
+require 'chewy/railtie' if defined?(Rails::Railtie)
+require 'chewy/elastic_client'
 
 ActiveSupport.on_load(:active_record) do
   include Chewy::Index::Observe::ActiveRecordMethods
@@ -97,12 +98,7 @@ module Chewy
     # Main elasticsearch-ruby client instance
     #
     def client
-      Chewy.current[:chewy_client] ||= begin
-        client_configuration = configuration.deep_dup
-        client_configuration.delete(:prefix) # used by Chewy, not relevant to Elasticsearch::Client
-        block = client_configuration[:transport_options].try(:delete, :proc)
-        ::Elasticsearch::Client.new(client_configuration, &block)
-      end
+      Chewy.current[:chewy_client] ||= Chewy::ElasticClient.new
     end
 
     # Sends wait_for_status request to ElasticSearch with status