chewy 7.1.0 → 7.2.0

data/lib/chewy/rspec/update_index.rb

@@ -2,25 +2,25 @@ require 'i18n/core_ext/hash'
 
 # Rspec matcher `update_index`
 # To use it - add `require 'chewy/rspec'` to the `spec_helper.rb`
-# Simple usage - just pass type as argument.
+# Simple usage - just pass index as argument.
 #
-#   specify { expect { user.save! }.to update_index(UsersIndex::User) }
-#   specify { expect { user.save! }.to update_index('users#user') }
-#   specify { expect { user.save! }.not_to update_index('users#user') }
+#   specify { expect { user.save! }.to update_index(UsersIndex) }
+#   specify { expect { user.save! }.to update_index('users') }
+#   specify { expect { user.save! }.not_to update_index('users') }
 #
 # This example will pass as well because user1 was reindexed
 # and nothing was said about user2:
 #
 #   specify { expect { [user1, user2].map(&:save!) }
-#     .to update_index(UsersIndex.user).and_reindex(user1) }
+#     .to update_index(UsersIndex).and_reindex(user1) }
 #
 # If you need to specify reindexed records strictly - use `only` chain.
 # Combined matcher chain methods:
 #
 #   specify { expect { user1.destroy!; user2.save! } }
-#     .to update_index(UsersIndex::User).and_reindex(user2).and_delete(user1) }
+#     .to update_index(UsersIndex).and_reindex(user2).and_delete(user1) }
 #
-RSpec::Matchers.define :update_index do |type_name, options = {}| # rubocop:disable BlockLength
+RSpec::Matchers.define :update_index do |index_name, options = {}| # rubocop:disable Metrics/BlockLength
   if !respond_to?(:failure_message) && respond_to?(:failure_message_for_should)
     alias_method :failure_message, :failure_message_for_should
     alias_method :failure_message_when_negated, :failure_message_for_should_not
@@ -28,30 +28,30 @@ RSpec::Matchers.define :update_index do |type_name, options = {}| # rubocop:disa
 
   # Specify indexed records by passing record itself or id.
   #
-  #   specify { expect { user.save! }.to update_index(UsersIndex::User).and_reindex(user)
-  #   specify { expect { user.save! }.to update_index(UsersIndex::User).and_reindex(42)
+  #   specify { expect { user.save! }.to update_index(UsersIndex).and_reindex(user)
+  #   specify { expect { user.save! }.to update_index(UsersIndex).and_reindex(42)
   #   specify { expect { [user1, user2].map(&:save!) }
-  #     .to update_index(UsersIndex::User).and_reindex(user1, user2) }
+  #     .to update_index(UsersIndex).and_reindex(user1, user2) }
   #   specify { expect { [user1, user2].map(&:save!) }
-  #     .to update_index(UsersIndex::User).and_reindex(user1).and_reindex(user2) }
+  #     .to update_index(UsersIndex).and_reindex(user1).and_reindex(user2) }
   #
   # Specify indexing count for every particular record. Useful in case
   # urgent index updates.
   #
   #   specify { expect { 2.times { user.save! } }
-  #     .to update_index(UsersIndex::User).and_reindex(user, times: 2) }
+  #     .to update_index(UsersIndex).and_reindex(user, times: 2) }
   #
   # Specify reindexed attributes. Note that arrays are
   # compared position-independently.
   #
   #   specify { expect { user.update_attributes!(name: 'Duke') }
-  #     .to update_index(UsersIndex.user).and_reindex(user, with: {name: 'Duke'}) }
+  #     .to update_index(UsersIndex).and_reindex(user, with: {name: 'Duke'}) }
   #
   # You can combine all the options and chain `and_reindex` method to
   # specify options for every indexed record:
   #
   #   specify { expect { 2.times { [user1, user2].map { |u| u.update_attributes!(name: "Duke#{u.id}") } } }
-  #     .to update_index(UsersIndex.user)
+  #     .to update_index(UsersIndex)
   #     .and_reindex(user1, with: {name: 'Duke42'}) }
   #     .and_reindex(user2, times: 1, with: {name: 'Duke43'}) }
   #
@@ -62,8 +62,8 @@ RSpec::Matchers.define :update_index do |type_name, options = {}| # rubocop:disa
 
   # Specify deleted records with record itself or id passed.
   #
-  #   specify { expect { user.destroy! }.to update_index(UsersIndex::User).and_delete(user) }
-  #   specify { expect { user.destroy! }.to update_index(UsersIndex::User).and_delete(user.id) }
+  #   specify { expect { user.destroy! }.to update_index(UsersIndex).and_delete(user) }
+  #   specify { expect { user.destroy! }.to update_index(UsersIndex).and_delete(user.id) }
   #
   chain(:and_delete) do |*args|
     @delete ||= {}
@@ -73,14 +73,14 @@ RSpec::Matchers.define :update_index do |type_name, options = {}| # rubocop:disa
   # Used for specifying than no other records would be indexed or deleted:
   #
   #   specify { expect { [user1, user2].map(&:save!) }
-  #     .to update_index(UsersIndex.user).and_reindex(user1, user2).only }
+  #     .to update_index(UsersIndex).and_reindex(user1, user2).only }
   #   specify { expect { [user1, user2].map(&:destroy!) }
-  #     .to update_index(UsersIndex.user).and_delete(user1, user2).only }
+  #     .to update_index(UsersIndex).and_delete(user1, user2).only }
   #
   # This example will fail:
   #
   #   specify { expect { [user1, user2].map(&:save!) }
-  #     .to update_index(UsersIndex.user).and_reindex(user1).only }
+  #     .to update_index(UsersIndex).and_reindex(user1).only }
   #
   chain(:only) do |*_args|
     raise 'Use `only` in conjunction with `and_reindex` or `and_delete`' if @reindex.blank? && @delete.blank?
@@ -92,19 +92,19 @@ RSpec::Matchers.define :update_index do |type_name, options = {}| # rubocop:disa
     true
   end
 
-  match do |block| # rubocop:disable BlockLength
+  match do |block| # rubocop:disable Metrics/BlockLength
     @reindex ||= {}
     @delete ||= {}
     @missed_reindex = []
     @missed_delete = []
 
-    type = Chewy.derive_type(type_name)
+    index = Chewy.derive_name(index_name)
     if defined?(Mocha) && RSpec.configuration.mock_framework.to_s == 'RSpec::Core::MockingAdapters::Mocha'
-      Chewy::Type::Import::BulkRequest.stubs(:new).with(type, any_parameters).returns(mock_bulk_request)
+      Chewy::Index::Import::BulkRequest.stubs(:new).with(index, any_parameters).returns(mock_bulk_request)
     else
-      mocked_already = ::RSpec::Mocks.space.proxy_for(Chewy::Type::Import::BulkRequest).method_double_if_exists_for_message(:new)
-      allow(Chewy::Type::Import::BulkRequest).to receive(:new).and_call_original unless mocked_already
-      allow(Chewy::Type::Import::BulkRequest).to receive(:new).with(type, any_args).and_return(mock_bulk_request)
+      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
+      allow(Chewy::Index::Import::BulkRequest).to receive(:new).with(index, any_args).and_return(mock_bulk_request)
     end
 
     Chewy.strategy(options[:strategy] || :atomic) { block.call }
@@ -127,13 +127,13 @@ RSpec::Matchers.define :update_index do |type_name, options = {}| # rubocop:disa
     end
 
     @reindex.each_value do |document|
-      document[:match_count] = (!document[:expected_count] && document[:real_count] > 0) ||
+      document[:match_count] = (!document[:expected_count] && (document[:real_count]).positive?) ||
         (document[:expected_count] && document[:expected_count] == document[:real_count])
       document[:match_attributes] = document[:expected_attributes].blank? ||
         compare_attributes(document[:expected_attributes], document[:real_attributes])
     end
     @delete.each_value do |document|
-      document[:match_count] = (!document[:expected_count] && document[:real_count] > 0) ||
+      document[:match_count] = (!document[:expected_count] && (document[:real_count]).positive?) ||
         (document[:expected_count] && document[:expected_count] == document[:real_count])
     end
 
@@ -142,13 +142,13 @@ RSpec::Matchers.define :update_index do |type_name, options = {}| # rubocop:disa
       @delete.all? { |_, document| document[:match_count] }
   end
 
-  failure_message do # rubocop:disable BlockLength
+  failure_message do # rubocop:disable Metrics/BlockLength
     output = ''
 
     if mock_bulk_request.updates.none?
-      output << "Expected index `#{type_name}` to be updated, but it was not\n"
+      output << "Expected index `#{index_name}` to be updated, but it was not\n"
     elsif @missed_reindex.present? || @missed_delete.present?
-      message = "Expected index `#{type_name}` "
+      message = "Expected index `#{index_name}` "
       message << [
         ("to update documents #{@reindex.keys}" if @reindex.present?),
         ("to delete documents #{@delete.keys}" if @delete.present?)
@@ -166,9 +166,13 @@ RSpec::Matchers.define :update_index do |type_name, options = {}| # rubocop:disa
     output << @reindex.each.with_object('') do |(id, document), result|
       unless document[:match_count] && document[:match_attributes]
         result << "Expected document with id `#{id}` to be reindexed"
-        if document[:real_count] > 0
-          result << "\n   #{document[:expected_count]} times, but was reindexed #{document[:real_count]} times" if document[:expected_count] && !document[:match_count]
-          result << "\n   with #{document[:expected_attributes]}, but it was reindexed with #{document[:real_attributes]}" if document[:expected_attributes].present? && !document[:match_attributes]
+        if (document[:real_count]).positive?
+          if document[:expected_count] && !document[:match_count]
+            result << "\n   #{document[:expected_count]} times, but was reindexed #{document[:real_count]} times"
+          end
+          if document[:expected_attributes].present? && !document[:match_attributes]
+            result << "\n   with #{document[:expected_attributes]}, but it was reindexed with #{document[:real_attributes]}"
+          end
         else
           result << ', but it was not'
         end
@@ -179,11 +183,11 @@ RSpec::Matchers.define :update_index do |type_name, options = {}| # rubocop:disa
     output << @delete.each.with_object('') do |(id, document), result|
       unless document[:match_count]
         result << "Expected document with id `#{id}` to be deleted"
-        result << if document[:real_count] > 0 && document[:expected_count]
-                    "\n   #{document[:expected_count]} times, but was deleted #{document[:real_count]} times"
-                  else
-                    ', but it was not'
-                  end
+        result << if (document[:real_count]).positive? && document[:expected_count]
+          "\n   #{document[:expected_count]} times, but was deleted #{document[:real_count]} times"
+        else
+          ', but it was not'
+        end
         result << "\n"
       end
     end
@@ -193,9 +197,9 @@ RSpec::Matchers.define :update_index do |type_name, options = {}| # rubocop:disa
 
   failure_message_when_negated do
     if mock_bulk_request.updates.present?
-      "Expected index `#{type_name}` not to be updated, but it was with #{mock_bulk_request.updates.map(&:values).flatten.group_by { |documents| documents[:_id] }.map do |id, documents|
-                                                                            "\n  document id `#{id}` (#{documents.count} times)"
-                                                                          end.join}\n"
+      "Expected index `#{index_name}` not to be updated, but it was with #{mock_bulk_request.updates.map(&:values).flatten.group_by { |documents| documents[:_id] }.map do |id, documents|
+                                                                             "\n  document id `#{id}` (#{documents.count} times)"
+                                                                           end.join}\n"
     end
   end
 
@@ -209,7 +213,7 @@ RSpec::Matchers.define :update_index do |type_name, options = {}| # rubocop:disa
     expected_count = options[:times] || options[:count]
     expected_attributes = (options[:with] || options[:attributes] || {}).deep_symbolize_keys
 
-    Hash[args.flatten.map do |document|
+    args.flatten.map do |document|
       id = document.respond_to?(:id) ? document.id.to_s : document.to_s
       [id, {
         document: document,
@@ -218,7 +222,7 @@ RSpec::Matchers.define :update_index do |type_name, options = {}| # rubocop:disa
         real_count: 0,
         real_attributes: {}
       }]
-    end]
+    end.to_h
   end
 
   def compare_attributes(expected, real)

data/lib/chewy/search.rb

@@ -6,29 +6,22 @@ require 'chewy/search/response'
 require 'chewy/search/loader'
 require 'chewy/search/request'
 require 'chewy/search/pagination/kaminari'
-require 'chewy/search/pagination/will_paginate'
 
 module Chewy
   # This module being included to any provides an interface to the
-  # request DSL. By default it is included to {Chewy::Index} and
-  # {Chewy::Type}.
+  # request DSL. By default it is included to {Chewy::Index}.
   #
   # The class used as a request DSL provider is
   # inherited from {Chewy::Search::Request}
   #
-  # Also, the search class is refined with one of the pagination-
-  # providing modules: {Chewy::Search::Pagination::Kaminari} or
-  # {Chewy::Search::Pagination::WillPaginate}.
+  # Also, the search class is refined with the pagination module {Chewy::Search::Pagination::Kaminari}.
   #
   # @example
   #   PlacesIndex.query(match: {name: 'Moscow'})
-  #   PlacesIndex::City.query(match: {name: 'Moscow'})
   # @see Chewy::Index
-  # @see Chewy::Type
   # @see Chewy::Search::Request
   # @see Chewy::Search::ClassMethods
   # @see Chewy::Search::Pagination::Kaminari
-  # @see Chewy::Search::Pagination::WillPaginate
   module Search
     extend ActiveSupport::Concern
 
@@ -55,15 +48,14 @@ module Chewy
       # @see https://www.elastic.co/guide/en/elasticsearch/reference/current/search-uri-request.html
       # @return [Hash] the request result
       def search_string(query, options = {})
-        options = options.merge(all.render.slice(:index, :type).merge(q: query))
+        options = options.merge(all.render.slice(:index).merge(q: query))
         Chewy.client.search(options)
       end
 
-      # Delegates methods from the request class to the index or type class
+      # Delegates methods from the request class to the index class
       #
       # @example
       #   PlacesIndex.query(match: {name: 'Moscow'})
-      #   PlacesIndex::City.query(match: {name: 'Moscow'})
       def method_missing(name, *args, &block)
         if search_class::DELEGATED_METHODS.include?(name)
           all.send(name, *args, &block)
@@ -85,11 +77,6 @@ module Chewy
       def build_search_class(base)
         search_class = Class.new(base)
 
-        if self < Chewy::Type
-          index_scopes = index.scopes - scopes
-          delegate_scoped index, search_class, index_scopes
-        end
-
         delegate_scoped self, search_class, scopes
         const_set('Query', search_class)
       end

data/lib/chewy/search/loader.rb

@@ -3,32 +3,28 @@ module Chewy
     # This class is used for two different purposes: load ORM/ODM
     # source objects.
     #
-    # @see Chewy::Type::Import
+    # @see Chewy::Index::Import
     # @see Chewy::Search::Request#load
     # @see Chewy::Search::Response#objects
     # @see Chewy::Search::Scrolling#scroll_objects
     class Loader
-      # @param indexes [Array<Chewy::Index>] list of indexes to lookup types
+      # @param indexes [Array<Chewy::Index>] list of indexes to lookup
       # @param options [Hash] adapter-specific load options
-      # @see Chewy::Type::Adapter::Base#load
+      # @see Chewy::Index::Adapter::Base#load
       def initialize(indexes: [], **options)
         @indexes = indexes
         @options = options
       end
 
-      # Returns a {Chewy::Type} object for index name and type name passed. Caches
-      # the result for each pair to make lookup faster.
-      #
-      # @param index [String] index name
-      # @param type [String] type name
-      # @return [Chewy::Type]
-      # @raise [Chewy::UnderivableType] when index or hash were not found
-      def derive_type(index, type)
-        (@derive_type ||= {})[[index, type]] ||= begin
-          index_class = derive_index(index)
-          raise Chewy::UnderivableType, "Can not find index named `#{index}`" unless index_class
-          index_class.type_hash.values.first
-        end
+      def derive_index(index_name)
+        index = (@derive_index ||= {})[index_name] ||= indexes_hash[index_name] ||
+          indexes_hash[indexes_hash.keys.sort_by(&:length)
+            .reverse.detect do |name|
+                         index_name.match(/#{name}(_.+|\z)/)
+                       end]
+        raise Chewy::UndefinedIndex, "Can not find index named `#{index}`" unless index
+
+        index
       end
 
       # For each passed hit this method loads an ORM/ORD source object
@@ -37,17 +33,17 @@ module Chewy
       # will be returned at the corresponding position in array.
       #
       # Records/documents are loaded in an efficient manner, performing
-      # a single query for each type present.
+      # a single query for each index present.
       #
       # @param hits [Array<Hash>] ES hits array
       # @return [Array<Object, nil>] the array of corresponding ORM/ODM objects
       def load(hits)
-        hit_groups = hits.group_by { |hit| [hit['_index'], hit['_type']] }
-        loaded_objects = hit_groups.each_with_object({}) do |((index_name, type_name), hit_group), result|
-          type = derive_type(index_name, type_name)
+        hit_groups = hits.group_by { |hit| hit['_index'] }
+        loaded_objects = hit_groups.each_with_object({}) do |(index_name, hit_group), result|
+          index = derive_index(index_name)
           ids = hit_group.map { |hit| hit['_id'] }
-          loaded = type.adapter.load(ids, **@options.merge(_type: type))
-          loaded ||= hit_group.map { |hit| type.build(hit) }
+          loaded = index.adapter.load(ids, **@options.merge(_index: index.base_name))
+          loaded ||= hit_group.map { |hit| index.build(hit) }
 
           result.merge!(hit_group.zip(loaded).to_h)
         end
@@ -57,14 +53,6 @@ module Chewy
 
     private
 
-      def derive_index(index_name)
-        (@derive_index ||= {})[index_name] ||= indexes_hash[index_name] ||
-          indexes_hash[indexes_hash.keys.sort_by(&:length)
-            .reverse.detect do |name|
-              index_name.match(/#{name}(_.+|\z)/)
-            end]
-      end
-
       def indexes_hash
         @indexes_hash ||= @indexes.index_by(&:index_name)
       end

data/lib/chewy/search/parameters.rb

@@ -1,5 +1,5 @@
-Dir.glob(File.join(File.dirname(__FILE__), 'parameters', 'concerns', '*.rb')) { |f| require f }
-Dir.glob(File.join(File.dirname(__FILE__), 'parameters', '*.rb')) { |f| require f }
+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 }
 
 module Chewy
   module Search
@@ -24,6 +24,7 @@ module Chewy
 
       # @return [{Symbol => Chewy::Search::Parameters::Storage}]
       attr_accessor :storages
+
       delegate :[], :[]=, to: :storages
 
       # Accepts an initial hash as basic values or parameter storages.
@@ -120,6 +121,7 @@ module Chewy
 
       def assert_storages(names)
         raise ArgumentError, 'No storage names were specified' if names.empty?
+
         names = names.map(&:to_sym)
         self.class.storages.values_at(*names)
         names

data/lib/chewy/search/parameters/concerns/query_storage.rb

@@ -5,7 +5,7 @@ module Chewy
     class Parameters
       # This is a basic storage implementation for `query`, `filter`
       # and `post_filter` storages. It uses `bool` query as a root
-      # structure for each of them. The `bool` root is ommited on
+      # structure for each of them. The `bool` root is omitted on
       # rendering if there is only a single query in the `must` or
       # `should` array. Besides the standard parameter storage
       # capabilities, it provides specialized methods for the `bool`
@@ -86,7 +86,7 @@ module Chewy
           def reduce
             value = to_h
               .reject { |_, v| v.blank? }
-              .map { |k, v| [k, v.is_a?(Array) && v.one? ? v.first : v] }.to_h
+              .transform_values { |v| v.is_a?(Array) && v.one? ? v.first : v }
             value.delete(:minimum_should_match) if should.empty?
             value
           end

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

@@ -17,7 +17,11 @@ module Chewy
         # In case of hash, respective values are concatenated as well.
         #
         # @see Chewy::Search::Parameters::Storage#update!
-        # @param other_value [true, false, {Symbol => Array<String, Symbol>, String, Symbol}, Array<String, Symbol>, String, Symbol] any acceptable storage value
+        # @param other_value
+        #   [true, false, {
+        #     Symbol => Array<String, Symbol>, String, Symbol},
+        #     Array<String, Symbol>, String, Symbol
+        #   ] any acceptable storage value
         # @return [{Symbol => Array<String>, true, false}] updated value
         def update!(other_value)
           new_value = normalize(other_value)

data/lib/chewy/search/query_proxy.rb

@@ -102,6 +102,7 @@ module Chewy
       %i[must should must_not].each do |method|
         define_method method do |query_hash = nil, &block|
           raise ArgumentError, "Please provide a parameter or a block to `#{method}`" unless query_hash || block
+
           @request.send(:modify, @parameter_name) { send(method, block || query_hash) }
         end
       end
@@ -237,8 +238,14 @@ module Chewy
       #     @yield the block is processed by `elasticsearch-dsl` gem
       %i[and or not].each do |method|
         define_method method do |query_hash_or_scope = nil, &block|
-          raise ArgumentError, "Please provide a parameter or a block to `#{method}`" unless query_hash_or_scope || block
-          query_hash_or_scope = query_hash_or_scope.parameters[@parameter_name].value if !block && query_hash_or_scope.is_a?(Chewy::Search::Request)
+          unless query_hash_or_scope || block
+            raise ArgumentError,
+                  "Please provide a parameter or a block to `#{method}`"
+          end
+
+          if !block && query_hash_or_scope.is_a?(Chewy::Search::Request)
+            query_hash_or_scope = query_hash_or_scope.parameters[@parameter_name].value
+          end
           @request.send(:modify, @parameter_name) { send(method, block || query_hash_or_scope) }
         end
       end

data/lib/chewy/search/request.rb

@@ -8,11 +8,11 @@ module Chewy
     # @see Chewy::Search
     # @example
     #   scope = Chewy::Search::Request.new(PlacesIndex)
-    #   # => <Chewy::Search::Request {:index=>["places"], :type=>["city", "country"]}>
+    #   # => <Chewy::Search::Request {:index=>["places"], :body=>{}}>
     #   scope.limit(20)
-    #   # => <Chewy::Search::Request {:index=>["places"], :type=>["city", "country"], :body=>{:size=>20}}>
+    #   # => <Chewy::Search::Request {:index=>["places"], :body=>{:size=>20}}>
     #   scope.order(:name).offset(10)
-    #   # => <Chewy::Search::Request {:index=>["places"], :type=>["city", "country"], :body=>{:sort=>["name"], :from=>10}}>
+    #   # => <Chewy::Search::Request {:index=>["places"], :body=>{:sort=>["name"], :from=>10}}>
     class Request
       include Enumerable
       include Scoping
@@ -45,40 +45,28 @@ module Chewy
       ].freeze
 
       delegate :hits, :wrappers, :objects, :records, :documents,
-        :object_hash, :record_hash, :document_hash,
-        :total, :max_score, :took, :timed_out?, to: :response
+               :object_hash, :record_hash, :document_hash,
+               :total, :max_score, :took, :timed_out?, to: :response
       delegate :each, :size, :to_a, :[], to: :wrappers
       alias_method :to_ary, :to_a
       alias_method :total_count, :total
       alias_method :total_entries, :total
 
-      # The class is initialized with the list of chewy indexes and/or
-      # types, which are later used to compose requests.
+      # The class is initialized with the list of chewy indexes,
+      # which are later used to compose requests.
       # Any symbol/string passed is treated as an index identifier.
       #
       # @example
       #   Chewy::Search::Request.new(:places)
-      #   # => <Chewy::Search::Request {:index=>["places"]}>
+      #   # => <Chewy::Search::Request {:index=>["places"], :body=>{}}>
       #   Chewy::Search::Request.new(PlacesIndex)
-      #   # => <Chewy::Search::Request {:index=>["places"]}>
-      #   Chewy::Search::Request.new(PlacesIndex::City)
-      #   # => <Chewy::Search::Request {:index=>["places"]}>
-      #   Chewy::Search::Request.new(UsersIndex, PlacesIndex::City)
-      #   # => <Chewy::Search::Request {:index=>["users", "places"]}>
-      # @param indexes_or_types [Array<Chewy::Index, Chewy::Type, String, Symbol>] indices and types in any combinations
-      def initialize(*indices_or_types)
-        indices = indices_or_types.reject do |klass|
-          klass.is_a?(Class) && klass < Chewy::Type
-        end
-
-        types = indices_or_types.select do |klass|
-          klass.is_a?(Class) && klass < Chewy::Type
-        end
-
-        indices += types.map(&:index)
-
+      #   # => <Chewy::Search::Request {:index=>["places"], :body=>{}}>
+      #   Chewy::Search::Request.new(UsersIndex, PlacesIndex)
+      #   # => <Chewy::Search::Request {:index=>["users", "places"], :body=>{}}>
+      # @param indexes [Array<Chewy::Index, String, Symbol>] indexes
+      def initialize(*indexes)
         parameters.modify!(:indices) do
-          replace!(indices: indices)
+          replace!(indices: indexes)
         end
       end
 
@@ -140,17 +128,17 @@ module Chewy
         "<#{self.class} #{render}>"
       end
 
-      # @!group Chainable request modificators
+      # @!group Chainable request modifications
 
       # @!method query(query_hash=nil, &block)
-      #   Adds `quer` parameter to the search request body.
+      #   Adds `query` parameter to the search request body.
       #
       #   @see https://www.elastic.co/guide/en/elasticsearch/reference/current/search-request-query.html
       #   @see Chewy::Search::Parameters::Query
       #   @return [Chewy::Search::Request, Chewy::Search::QueryProxy]
       #
       #   @overload query(query_hash)
-      #     If pure hash is passed it goes straight to the `quer` parameter storage.
+      #     If pure hash is passed it goes straight to the `query` parameter storage.
       #     Acts exactly the same way as {Chewy::Search::QueryProxy#must}.
       #
       #     @see https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html
@@ -169,7 +157,7 @@ module Chewy
       #     @example
       #       PlacesIndex.query { match name: 'Moscow' }
       #       # => <PlacesIndex::Query {..., :body=>{:query=>{:match=>{:name=>"Moscow"}}}}>
-      #     @yield the block is processed by `elasticsearch-ds` gem
+      #     @yield the block is processed by `elasticsearch-dsl` gem
       #     @return [Chewy::Search::Request]
       #
       #   @overload query
@@ -185,7 +173,7 @@ module Chewy
       #     @return [Chewy::Search::QueryProxy]
       #
       # @!method filter(query_hash=nil, &block)
-      #   Adds `filte` context of the `quer` parameter at the
+      #   Adds `filter` context of the `query` parameter at the
       #   search request body.
       #
       #   @see https://www.elastic.co/guide/en/elasticsearch/reference/current/query-filter-context.html
@@ -193,7 +181,7 @@ module Chewy
       #   @return [Chewy::Search::Request, Chewy::Search::QueryProxy]
       #
       #   @overload filter(query_hash)
-      #     If pure hash is passed it goes straight to the `filte` context of the `quer` parameter storage.
+      #     If pure hash is passed it goes straight to the `filter` context of the `query` parameter storage.
       #     Acts exactly the same way as {Chewy::Search::QueryProxy#must}.
       #
       #     @see https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html
@@ -214,7 +202,7 @@ module Chewy
       #       PlacesIndex.filter { match name: 'Moscow' }
       #       # => <PlacesIndex::Query {..., :body=>{:query=>{:bool=>{
       #       #      :filter=>{:match=>{:name=>"Moscow"}}}}}}>
-      #     @yield the block is processed by `elasticsearch-ds` gem
+      #     @yield the block is processed by `elasticsearch-dsl` gem
       #     @return [Chewy::Search::Request]
       #
       #   @overload filter
@@ -232,7 +220,7 @@ module Chewy
       # @!method post_filter(query_hash=nil, &block)
       #   Adds `post_filter` parameter to the search request body.
       #
-      #   @see https://www.elastic.co/guide/en/elasticsearch/reference/current/search-request-post-filter.html
+      #   @see https://www.elastic.co/guide/en/elasticsearch/reference/current/filter-search-results.html#post-filter
       #   @see Chewy::Search::Parameters::PostFilter
       #   @return [Chewy::Search::Request, Chewy::Search::QueryProxy]
       #
@@ -256,7 +244,7 @@ module Chewy
       #     @example
       #       PlacesIndex.post_filter { match name: 'Moscow' }
       #       # => <PlacesIndex::Query {..., :body=>{:post_filter=>{:match=>{:name=>"Moscow"}}}}>
-      #     @yield the block is processed by `elasticsearch-ds` gem
+      #     @yield the block is processed by `elasticsearch-dsl` gem
       #     @return [Chewy::Search::Request]
       #
       #   @overload post_filter
@@ -287,7 +275,7 @@ module Chewy
       #     PlacesIndex.order(:name, population: {order: :asc}).order(:coordinates)
       #     # => <PlacesIndex::Query {..., :body=>{:sort=>["name", {"population"=>{:order=>:asc}}, "coordinates"]}}>
       #   @see Chewy::Search::Parameters::Order
-      #   @see https://www.elastic.co/guide/en/elasticsearch/reference/current/search-request-sort.html
+      #   @see https://www.elastic.co/guide/en/elasticsearch/reference/current/sort-search-results.html
       #   @param values [Array<Hash, String, Symbol>] sort fields and options
       #   @return [Chewy::Search::Request]
       #
@@ -298,7 +286,7 @@ module Chewy
       #     PlacesIndex.docvalue_fields(:name).docvalue_fields(:population, :coordinates)
       #     # => <PlacesIndex::Query {..., :body=>{:docvalue_fields=>["name", "population", "coordinates"]}}>
       #   @see Chewy::Search::Parameters::DocvalueFields
-      #   @see https://www.elastic.co/guide/en/elasticsearch/reference/current/search-request-docvalue-fields.html
+      #   @see https://www.elastic.co/guide/en/elasticsearch/reference/current/search-fields.html#docvalue-fields
       #   @param values [Array<String, Symbol>] field names
       #   @return [Chewy::Search::Request]
       %i[order docvalue_fields].each do |name|
@@ -328,7 +316,7 @@ module Chewy
       #     PlacesIndex.order(:name, population: {order: :asc}).reorder(:coordinates)
       #     # => <PlacesIndex::Query {..., :body=>{:sort=>["coordinates"]}}>
       #   @see Chewy::Search::Parameters::Order
-      #   @see https://www.elastic.co/guide/en/elasticsearch/reference/current/search-request-sort.html
+      #   @see https://www.elastic.co/guide/en/elasticsearch/reference/current/sort-search-results.html
       #   @param values [Array<Hash, String, Symbol>] sort fields and options
       #   @return [Chewy::Search::Request]
       def reorder(value, *values)
@@ -342,9 +330,9 @@ module Chewy
       #     PlacesIndex.track_scores
       #     # => <PlacesIndex::Query {..., :body=>{:track_scores=>true}}>
       #     PlacesIndex.track_scores.track_scores(false)
-      #     # => <PlacesIndex::Query {:index=>["places"], :type=>["city", "country"]}>
+      #     # => <PlacesIndex::Query {:index=>["places"]}>
       #   @see Chewy::Search::Parameters::TrackScores
-      #   @see https://www.elastic.co/guide/en/elasticsearch/reference/5.4/search-request-sort.html#_track_scores
+      #   @see https://www.elastic.co/guide/en/elasticsearch/reference/current/sort-search-results.html#_track_scores
       #   @param value [true, false]
       #   @return [Chewy::Search::Request]
       #
@@ -355,9 +343,9 @@ module Chewy
       #     PlacesIndex.explain
       #     # => <PlacesIndex::Query {..., :body=>{:explain=>true}}>
       #     PlacesIndex.explain.explain(false)
-      #     # => <PlacesIndex::Query {:index=>["places"], :type=>["city", "country"]}>
+      #     # => <PlacesIndex::Query {:index=>["places"]}>
       #   @see Chewy::Search::Parameters::Explain
-      #   @see https://www.elastic.co/guide/en/elasticsearch/reference/5.4/search-request-explain.html
+      #   @see https://www.elastic.co/guide/en/elasticsearch/reference/current/search-explain.html
       #   @param value [true, false]
       #   @return [Chewy::Search::Request]
       #
@@ -368,9 +356,9 @@ module Chewy
       #     PlacesIndex.version
       #     # => <PlacesIndex::Query {..., :body=>{:version=>true}}>
       #     PlacesIndex.version.version(false)
-      #     # => <PlacesIndex::Query {:index=>["places"], :type=>["city", "country"]}>
+      #     # => <PlacesIndex::Query {:index=>["places"]}>
       #   @see Chewy::Search::Parameters::Version
-      #   @see https://www.elastic.co/guide/en/elasticsearch/reference/5.4/search-request-version.html
+      #   @see https://www.elastic.co/guide/en/elasticsearch/reference/current/search-search.html
       #   @param value [true, false]
       #   @return [Chewy::Search::Request]
       #
@@ -381,9 +369,9 @@ module Chewy
       #     PlacesIndex.profile
       #     # => <PlacesIndex::Query {..., :body=>{:profile=>true}}>
       #     PlacesIndex.profile.profile(false)
-      #     # => <PlacesIndex::Query {:index=>["places"], :type=>["city", "country"]}>
+      #     # => <PlacesIndex::Query {:index=>["places"]}>
       #   @see Chewy::Search::Parameters::Profile
-      #   @see https://www.elastic.co/guide/en/elasticsearch/reference/5.4/search-profile.html
+      #   @see https://www.elastic.co/guide/en/elasticsearch/reference/current/search-profile.html
       #   @param value [true, false]
       #   @return [Chewy::Search::Request]
       #
@@ -417,7 +405,7 @@ module Chewy
       #     PlacesIndex.request_cache(false)
       #     # => <PlacesIndex::Query {..., :body=>{:request_cache=>false}}>
       #   @see Chewy::Search::Parameters::RequestCache
-      #   @see https://www.elastic.co/guide/en/elasticsearch/reference/5.4/shard-request-cache.html#_enabling_and_disabling_caching_per_request
+      #   @see https://www.elastic.co/guide/en/elasticsearch/reference/current/shard-request-cache.html#_enabling_and_disabling_caching_per_request
       #   @param value [true, false, nil]
       #   @return [Chewy::Search::Request]
       #
@@ -428,7 +416,7 @@ module Chewy
       #     PlacesIndex.search_type(:dfs_query_then_fetch)
       #     # => <PlacesIndex::Query {..., :body=>{:search_type=>"dfs_query_then_fetch"}}>
       #   @see Chewy::Search::Parameters::SearchType
-      #   @see https://www.elastic.co/guide/en/elasticsearch/reference/5.4/search-request-search-type.html
+      #   @see https://www.elastic.co/guide/en/elasticsearch/reference/current/search-search.html#search-type
       #   @param value [String, Symbol]
       #   @return [Chewy::Search::Request]
       #
@@ -439,7 +427,7 @@ module Chewy
       #     PlacesIndex.preference(:_primary_first)
       #     # => <PlacesIndex::Query {..., :body=>{:preference=>"_primary_first"}}>
       #   @see Chewy::Search::Parameters::Preference
-      #   @see https://www.elastic.co/guide/en/elasticsearch/reference/5.4/search-request-preference.html
+      #   @see https://www.elastic.co/guide/en/elasticsearch/reference/current/search-search.html#search-preference
       #   @param value [String, Symbol]
       #   @return [Chewy::Search::Request]
       #
@@ -450,7 +438,7 @@ module Chewy
       #     PlacesIndex.timeout('1m')
       #     <PlacesIndex::Query {..., :body=>{:timeout=>"1m"}}>
       #   @see Chewy::Search::Parameters::Timeout
-      #   @see https://www.elastic.co/guide/en/elasticsearch/reference/5.4/common-options.html#time-units
+      #   @see https://www.elastic.co/guide/en/elasticsearch/reference/current/common-options.html#time-units
       #   @param value [String, Symbol]
       #   @return [Chewy::Search::Request]
       #
@@ -461,7 +449,7 @@ module Chewy
       #     PlacesIndex.limit(10)
       #     <PlacesIndex::Query {..., :body=>{:size=>10}}>
       #   @see Chewy::Search::Parameters::Limit
-      #   @see https://www.elastic.co/guide/en/elasticsearch/reference/5.4/search-request-from-size.html
+      #   @see https://www.elastic.co/guide/en/elasticsearch/reference/current/paginate-search-results.html
       #   @param value [String, Integer]
       #   @return [Chewy::Search::Request]
       #
@@ -472,7 +460,7 @@ module Chewy
       #     PlacesIndex.offset(10)
       #     <PlacesIndex::Query {..., :body=>{:from=>10}}>
       #   @see Chewy::Search::Parameters::Offset
-      #   @see https://www.elastic.co/guide/en/elasticsearch/reference/5.4/search-request-from-size.html
+      #   @see https://www.elastic.co/guide/en/elasticsearch/reference/current/paginate-search-results.html
       #   @param value [String, Integer]
       #   @return [Chewy::Search::Request]
       #
@@ -483,7 +471,7 @@ module Chewy
       #     PlacesIndex.terminate_after(10)
       #     <PlacesIndex::Query {..., :body=>{:terminate_after=>10}}>
       #   @see Chewy::Search::Parameters::Offset
-      #   @see https://www.elastic.co/guide/en/elasticsearch/reference/5.4/search-request-body.html
+      #   @see https://www.elastic.co/guide/en/elasticsearch/reference/current/search-your-data.html#quickly-check-for-matching-docs
       #   @param value [String, Integer]
       #   @return [Chewy::Search::Request]
       #
@@ -494,7 +482,7 @@ module Chewy
       #     PlacesIndex.min_score(2)
       #     <PlacesIndex::Query {..., :body=>{:min_score=>2.0}}>
       #   @see Chewy::Search::Parameters::Offset
-      #   @see https://www.elastic.co/guide/en/elasticsearch/reference/5.4/search-request-min-score.html
+      #   @see https://www.elastic.co/guide/en/elasticsearch/reference/current/search-search.html#search-api-min-score
       #   @param value [String, Integer, Float]
       #   @return [Chewy::Search::Request]
       %i[request_cache search_type preference timeout limit offset terminate_after min_score].each do |name|
@@ -506,7 +494,7 @@ module Chewy
       # @!method source(*values)
       #   Updates `_source` request part. Accepts either an array
       #   of field names/templates or a hash with `includes` and `excludes`
-      #   keys. Source also can be disabled entierly or enabled again.
+      #   keys. Source also can be disabled entirely or enabled again.
       #
       #   @example
       #     PlacesIndex.source(:name).source(includes: [:popularity], excludes: :description)
@@ -514,13 +502,13 @@ module Chewy
       #     PlacesIndex.source(false)
       #     # => <PlacesIndex::Query {..., :body=>{:_source=>false}}>
       #   @see Chewy::Search::Parameters::Source
-      #   @see https://www.elastic.co/guide/en/elasticsearch/reference/5.4/search-request-source-filtering.html
+      #   @see https://www.elastic.co/guide/en/elasticsearch/reference/current/search-fields.html#source-filtering
       #   @param values [true, false, {Symbol => Array<String, Symbol>, String, Symbol}, Array<String, Symbol>, String, Symbol]
       #   @return [Chewy::Search::Request]
       #
       # @!method stored_fields(*values)
       #   Updates `stored_fields` request part. Accepts an array of field
-      #   names. Can be entierly disabled and enabled back.
+      #   names. Can be entirely disabled and enabled back.
       #
       #   @example
       #     PlacesIndex.stored_fields(:name).stored_fields(:description)
@@ -528,7 +516,7 @@ module Chewy
       #     PlacesIndex.stored_fields(false)
       #     # => <PlacesIndex::Query {..., :body=>{:stored_fields=>"_none_"}}>
       #   @see Chewy::Search::Parameters::StoredFields
-      #   @see https://www.elastic.co/guide/en/elasticsearch/reference/5.4/search-request-stored-fields.html
+      #   @see https://www.elastic.co/guide/en/elasticsearch/reference/current/search-fields.html#stored-fields
       #   @param values [true, false, String, Symbol, Array<String, Symbol>]
       #   @return [Chewy::Search::Request]
       %i[source stored_fields].each do |name|
@@ -544,7 +532,7 @@ module Chewy
       #   PlacesIndex.search_after(42, 'Moscow').search_after('London')
       #   # => <PlacesIndex::Query {..., :body=>{:search_after=>["London"]}}>
       # @see Chewy::Search::Parameters::SearchAfter
-      # @see https://www.elastic.co/guide/en/elasticsearch/reference/5.4/search-request-search-after.html
+      # @see https://www.elastic.co/guide/en/elasticsearch/reference/current/paginate-search-results.html#search-after
       # @param value [Array, Object]
       # @return [Chewy::Search::Request]
       def search_after(value, *values)
@@ -552,9 +540,9 @@ module Chewy
       end
 
       # Stores ORM/ODM objects loading options. Options
-      # might be define per-type or be global, depends on the adapter
+      # might be define per-index or be global, depends on the adapter
       # loading implementation. Also, there are 2 loading options to select
-      # or exclude types from loading: `only` and `except` respectively.
+      # or exclude indexes from loading: `only` and `except` respectively.
       # Options are updated on further method calls.
       #
       # @example
@@ -579,7 +567,7 @@ module Chewy
       #     #      "field1"=>{:script=>{:lang=>"painless", :inline=>"some script here"}},
       #     #      "field2"=>{:script=>{:lang=>"painless", :inline=>"some script here"}}}}}>
       #   @see Chewy::Search::Parameters::ScriptFields
-      #   @see https://www.elastic.co/guide/en/elasticsearch/reference/5.4/search-request-script-fields.html
+      #   @see https://www.elastic.co/guide/en/elasticsearch/reference/current/search-fields.html#script-fields
       #   @param value [Hash]
       #   @return [Chewy::Search::Request]
       #
@@ -591,7 +579,7 @@ module Chewy
       #     PlacesIndex.indices_boost(index1: 1.2, index2: 1.3).indices_boost(index1: 1.5)
       #     # => <PlacesIndex::Query {..., :body=>{:indices_boost=>[{"index2"=>1.3}, {"index1"=>1.5}]}}>
       #   @see Chewy::Search::Parameters::IndicesBoost
-      #   @see https://www.elastic.co/guide/en/elasticsearch/reference/5.4/search-request-index-boost.html
+      #   @see https://www.elastic.co/guide/en/elasticsearch/reference/current/search-multiple-indices.html#index-boost
       #   @param value [{String, Symbol => String, Integer, Float}]
       #   @return [Chewy::Search::Request]
       #
@@ -603,7 +591,7 @@ module Chewy
       #     PlacesIndex.rescore(window_size: 100, query: {}).rescore(window_size: 200, query: {})
       #     # => <PlacesIndex::Query {..., :body=>{:rescore=>[{:window_size=>100, :query=>{}}, {:window_size=>200, :query=>{}}]}}>
       #   @see Chewy::Search::Parameters::Rescore
-      #   @see https://www.elastic.co/guide/en/elasticsearch/reference/5.4/search-request-rescore.html
+      #   @see https://www.elastic.co/guide/en/elasticsearch/reference/current/filter-search-results.html#rescore
       #   @param value [Hash, Array<Hash>]
       #   @return [Chewy::Search::Request]
       #
@@ -619,7 +607,7 @@ module Chewy
       #     #      "fields"=>{:description=>{:type=>"plain"}},
       #     #      "pre_tags"=>["<em>"], "post_tags"=>["</em>"]}}}>
       #   @see Chewy::Search::Parameters::Highlight
-      #   @see https://www.elastic.co/guide/en/elasticsearch/reference/5.4/search-request-highlighting.html
+      #   @see https://www.elastic.co/guide/en/elasticsearch/reference/current/highlighting.html
       #   @param value [Hash]
       #   @return [Chewy::Search::Request]
       %i[script_fields indices_boost rescore highlight].each do |name|
@@ -642,7 +630,7 @@ module Chewy
       #     #      "names"=>{:text=>"tring out Elasticsearch"},
       #     #      "descriptions"=>{:text=>"some other text"}}}}>
       #   @see Chewy::Search::Parameters::Suggest
-      #   @see https://www.elastic.co/guide/en/elasticsearch/reference/5.4/search-suggesters.html
+      #   @see https://www.elastic.co/guide/en/elasticsearch/reference/current/search-suggesters.html
       #   @param value [Hash]
       #   @return [Chewy::Search::Request]
       #
@@ -728,7 +716,10 @@ module Chewy
       #     scope1.and(scope2)
       #     # => <PlacesIndex::Query {..., :body=>{:query=>{:bool=>{
       #     #      :must=>[{:match=>{:name=>"London"}}, {:match=>{:name=>"Washington"}}],
-      #     #      :filter=>{:bool=>{:must=>[{:term=>{:name=>"Moscow"}}, {:bool=>{:must_not=>{:term=>{:name=>"Berlin"}}}}]}}}}}}>
+      #     #      :filter=>{
+      #     #        :bool=>{:must=>[{:term=>{:name=>"Moscow"}}, {:bool=>{:must_not=>{:term=>{:name=>"Berlin"}}}}]}
+      #     #      }
+      #     #    }}}}>
       #   @param other [Chewy::Search::Request] scope to merge
       #   @return [Chewy::Search::Request] new scope
       #
@@ -745,7 +736,10 @@ module Chewy
       #     scope1.or(scope2)
       #     # => <PlacesIndex::Query {..., :body=>{:query=>{:bool=>{
       #     #      :should=>[{:match=>{:name=>"London"}}, {:match=>{:name=>"Washington"}}],
-      #     #      :filter=>{:bool=>{:should=>[{:term=>{:name=>"Moscow"}}, {:bool=>{:must_not=>{:term=>{:name=>"Berlin"}}}}]}}}}}}>
+      #     #      :filter=>{
+      #     #        :bool=>{:should=>[{:term=>{:name=>"Moscow"}}, {:bool=>{:must_not=>{:term=>{:name=>"Berlin"}}}}]}
+      #     #      }
+      #     #    }}}}>
       #   @param other [Chewy::Search::Request] scope to merge
       #   @return [Chewy::Search::Request] new scope
       #
@@ -762,7 +756,13 @@ module Chewy
       #     scope1.not(scope2)
       #     # => <PlacesIndex::Query {..., :body=>{:query=>{:bool=>{
       #     #      :must=>{:match=>{:name=>"London"}}, :must_not=>{:match=>{:name=>"Washington"}},
-      #     #      :filter=>{:bool=>{:must=>{:term=>{:name=>"Moscow"}}, :must_not=>{:bool=>{:must_not=>{:term=>{:name=>"Berlin"}}}}}}}}}}>
+      #     #      :filter=>{
+      #     #        :bool=>{
+      #     #          :must=>{:term=>{:name=>"Moscow"}},
+      #     #          :must_not=>{:bool=>{:must_not=>{:term=>{:name=>"Berlin"}}}}
+      #     #        }
+      #     #      }
+      #     #    }}}}>
       #   @param other [Chewy::Search::Request] scope to merge
       #   @return [Chewy::Search::Request] new scope
       %i[and or not].each do |name|
@@ -834,14 +834,14 @@ module Chewy
       # @overload first
       #   If nothing is passed - it returns a single object.
       #
-      #   @return [Chewy::Type] result document
+      #   @return [Chewy::Index] result document
       #
       # @overload first(limit)
       #   If limit is provided - it returns the limit amount or less
       #   of wrapper objects.
       #
       #   @param limit [Integer] amount of requested results
-      #   @return [Array<Chewy::Type>] result document collection
+      #   @return [Array<Chewy::Index>] result document collection
       def first(limit = UNDEFINED)
         request_limit = limit == UNDEFINED ? 1 : limit
 
@@ -860,7 +860,7 @@ module Chewy
       #   If single id is passed - it returns a single object.
       #
       #   @param id [Integer, String] id of the desired document
-      #   @return [Chewy::Type] result document
+      #   @return [Chewy::Index] result document
       #
       # @overload find(*ids)
       #   If several field are passed - it returns an array of wrappers.
@@ -868,7 +868,7 @@ module Chewy
       #   batch size - uses scroll API to retrieve everything.
       #
       #   @param ids [Array<Integer, String>] ids of the desired documents
-      #   @return [Array<Chewy::Type>] result documents
+      #   @return [Array<Chewy::Index>] result documents
       def find(*ids)
         return super if block_given?
 
@@ -931,11 +931,10 @@ module Chewy
       # @return [Hash] the result of query execution
       def delete_all(refresh: true)
         request_body = only(WHERE_STORAGES).render.merge(refresh: refresh)
-        ActiveSupport::Notifications.instrument 'delete_query.chewy',
-          notification_payload(request: request_body) do
-            request_body[:body] = {query: {match_all: {}}} if request_body[:body].empty?
-            Chewy.client.delete_by_query(request_body)
-          end
+        ActiveSupport::Notifications.instrument 'delete_query.chewy', notification_payload(request: request_body) do
+          request_body[:body] = {query: {match_all: {}}} if request_body[:body].empty?
+          Chewy.client.delete_by_query(request_body)
+        end
       end
 
       # Returns whether or not the query has been performed.
@@ -976,14 +975,11 @@ module Chewy
 
       def perform(additional = {})
         request_body = render.merge(additional)
-        ActiveSupport::Notifications.instrument 'search_query.chewy',
-          notification_payload(request: request_body) do
-            begin
-              Chewy.client.search(request_body)
-            rescue Elasticsearch::Transport::Transport::Errors::NotFound
-              {}
-            end
-          end
+        ActiveSupport::Notifications.instrument 'search_query.chewy', notification_payload(request: request_body) do
+          Chewy.client.search(request_body)
+        rescue Elasticsearch::Transport::Transport::Errors::NotFound
+          {}
+        end
       end
 
       def notification_payload(additional)