search_flip 4.0.0.beta8 → 4.0.0.beta11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d63abc415f8eaad5ade7de6fc4ca424a8695b72016266a49a1d221f49530ca49
-  data.tar.gz: a6170648ed2663b769b123ae443c5d0863a4456ec39be35c2762186b93383cff
+  metadata.gz: 9e032e109a7c31df14182c17d874f793327081c3c4e5b866dbfb261e8aa4e503
+  data.tar.gz: 73a2ce2eb918e9f3da28f3bf129eb614c1da5492d138985732af4b41a9f15a41
 SHA512:
-  metadata.gz: 7c7879bcf95f3e53c5186ec50592cf7e46b703b819c34e7d7e91229972652daf132b7a73b3f85051c6d86117f66278f83b5ac2f2b12c23272bb36130b0e7aa72
-  data.tar.gz: a04b20cbcf16eceb905798d1e5e2ea8dd60bb27b45bee9a0ab6f52aaed7d58e648a2f3139981117332a9824570db429f069ed749873dffd27ceb7cc274b3a7b4
+  metadata.gz: 152130c3a91ae69dcf53ff43534b0b853786900f1c03847ffead4d52254f95aec5dbfb48362d6386a61fdb92f128b68fc22b2b66f4df27f2a099a9d6db356eea
+  data.tar.gz: '09f13f81114378ebd9dea98ae713f5be8a27dea15966bf2fc05195900be8ed74c73d6aa46d6a458a4d4aaeb8467e32cc4296fce4e22dbfee672a1dc30d4af14f'

data/.github/workflows/test.yml

@@ -12,6 +12,7 @@ jobs:
         - docker.elastic.co/elasticsearch/elasticsearch:6.7.0
         - docker.elastic.co/elasticsearch/elasticsearch:7.0.0
         - docker.elastic.co/elasticsearch/elasticsearch:7.11.2
+        - docker.elastic.co/elasticsearch/elasticsearch:8.1.1
         ruby:
         - 2.6
         - 2.7
@@ -21,6 +22,7 @@ jobs:
         image: ${{ matrix.elasticsearch }}
         env:
           discovery.type: single-node
+          xpack.security.enabled: false
         ports:
           - 9200:9200
     steps:
@@ -30,6 +32,5 @@ jobs:
         ruby-version: ${{ matrix.ruby }}
     - run: gem install bundler
     - run: bundle
-    - run: sleep 10
     - run: bundle exec rspec
     - run: bundle exec rubocop

data/.rubocop.yml

@@ -3,6 +3,9 @@ AllCops:
   TargetRubyVersion: 2.5
   SuggestExtensions: false
 
+Gemspec/RequireMFA:
+  Enabled: false
+
 Style/CaseLikeIf:
   Enabled: false
 

data/CHANGELOG.md

@@ -11,6 +11,20 @@
 * Added `SearchFlip::Connection#get_cluster_settings` and
   `#update_cluster_settings`
 
+## v3.7.0
+
+* Add `SearchFlip::Connection#bulk` to allow more clean bulk indexing to
+  multiple indices at once
+
+## v3.6.0
+
+* Support Elasticsearch v8
+
+## v3.5.0
+
+* Add `SearchFlip::Criteria#http_timeout` to allow specifying timeouts on
+  a query level
+
 ## v3.4.0
 
 * Expose `Http#timeout` via `SearchFlip::HTTPClient`

data/README.md

@@ -9,7 +9,7 @@
 Using SearchFlip it is dead-simple to create index classes that correspond to
 [Elasticsearch](https://www.elastic.co/) indices and to manipulate, query and
 aggregate these indices using a chainable, concise, yet powerful DSL. Finally,
-SearchFlip supports Elasticsearch 2.x, 5.x, 6.x, 7.x. Check section
+SearchFlip supports Elasticsearch 2.x, 5.x, 6.x, 7.x and 8.x. Check section
 [Feature Support](#feature-support) for version dependent features.
 
 ```ruby
@@ -698,6 +698,14 @@ Specify a timeout to limit query processing time:
 CommentIndex.timeout("3s").execute
 ```
 
+* `http_timeout`
+
+Specify a http timeout for the request which will be send to Elasticsearch:
+
+```ruby
+CommentIndex.http_timeout(3).execute
+```
+
 * `terminate_after`
 
 Activate early query termination to stop query processing after the specified

data/docker-compose.yml

@@ -4,5 +4,6 @@ services:
     image: $ES_IMAGE
     environment:
       - discovery.type=single-node
+      - xpack.security.enabled=false
     ports:
       - 9200:9200

data/lib/search_flip/connection.rb

@@ -93,7 +93,7 @@ module SearchFlip
     def msearch(criterias)
       payload = criterias.flat_map do |criteria|
         [
-          SearchFlip::JSON.generate(index: criteria.target.index_name_with_prefix, type: criteria.target.type_name),
+          SearchFlip::JSON.generate(index: criteria.target.index_name_with_prefix, **(version.to_i < 8 ? { type: criteria.target.type_name } : {})),
           SearchFlip::JSON.generate(criteria.request)
         ]
       end
@@ -329,8 +329,8 @@ module SearchFlip
     # @return [Boolean] Returns true or raises SearchFlip::ResponseError
 
     def update_mapping(index_name, mapping, type_name: nil)
-      url = type_name ? type_url(index_name, type_name) : index_url(index_name)
-      params = type_name && version.to_f >= 6.7 ? { include_type_name: true } : {}
+      url = type_name && version.to_i < 8 ? type_url(index_name, type_name) : index_url(index_name)
+      params = type_name && version.to_f >= 6.7 && version.to_i < 8 ? { include_type_name: true } : {}
 
       http_client.put("#{url}/_mapping", params: params, json: mapping)
 
@@ -347,8 +347,8 @@ module SearchFlip
     # @return [Hash] The current type mapping
 
     def get_mapping(index_name, type_name: nil)
-      url = type_name ? type_url(index_name, type_name) : index_url(index_name)
-      params = type_name && version.to_f >= 6.7 ? { include_type_name: true } : {}
+      url = type_name && version.to_i < 8 ? type_url(index_name, type_name) : index_url(index_name)
+      params = type_name && version.to_f >= 6.7 && version.to_i < 8 ? { include_type_name: true } : {}
 
       response = http_client.headers(accept: "application/json").get("#{url}/_mapping", params: params)
 
@@ -384,6 +384,51 @@ module SearchFlip
       raise e
     end
 
+    # Initiates and yields a bulk object, such that index, import, create,
+    # update and delete requests can be appended to the bulk request. Please
+    # note that you need to manually pass the desired index name as well as
+    # type name (depending on the Elasticsearch version) when using #bulk on a
+    # connection object or Elasticsearch will return an error. After the bulk
+    # requests are successfully processed all existing indices will
+    # subsequently be refreshed when auto_refresh is enabled.
+    #
+    # @see SearchFlip::Config See SearchFlip::Config for auto_refresh
+    #
+    # @example
+    #   connection = SearchFlip::Connection.new
+    #
+    #   connection.bulk ignore_errors: [409] do |bulk|
+    #     bulk.create comment.id, CommentIndex.serialize(comment),
+    #       _index: CommentIndex.index_name, version: comment.version, version_type: "external_gte"
+    #
+    #     bulk.delete product.id, _index: ProductIndex.index_name, routing: product.user_id
+    #
+    #     # ...
+    #   end
+    #
+    # @param options [Hash] Specifies options regarding the bulk indexing
+    # @option options ignore_errors [Array] Specifies an array of http status
+    #   codes that shouldn't raise any exceptions, like eg 409 for conflicts,
+    #   ie when optimistic concurrency control is used.
+    # @option options raise [Boolean] Prevents any exceptions from being
+    #   raised. Please note that this only applies to the bulk response, not to
+    #   the request in general, such that connection errors, etc will still
+    #   raise.
+
+    def bulk(options = {})
+      default_options = {
+        http_client: http_client,
+        bulk_limit: bulk_limit,
+        bulk_max_mb: bulk_max_mb
+      }
+
+      SearchFlip::Bulk.new("#{base_url}/_bulk", default_options.merge(options)) do |indexer|
+        yield indexer
+      end
+
+      refresh if SearchFlip::Config[:auto_refresh]
+    end
+
     # Returns the full Elasticsearch type URL, ie base URL, index name with
     # prefix and type name.
     #

data/lib/search_flip/criteria.rb

@@ -26,7 +26,8 @@ module SearchFlip
 
     attr_accessor :target, :profile_value, :source_value, :suggest_values, :includes_values,
       :eager_load_values, :preload_values, :failsafe_value, :scroll_args, :terminate_after_value,
-      :timeout_value, :preference_value, :search_type_value, :routing_value, :track_total_hits_value
+      :timeout_value, :preference_value, :search_type_value, :routing_value, :track_total_hits_value,
+      :http_timeout_value
 
     # Creates a new criteria while merging the attributes (constraints,
     # settings, etc) of the current criteria with the attributes of another one
@@ -47,7 +48,7 @@ module SearchFlip
         [
           :profile_value, :failsafe_value, :terminate_after_value, :timeout_value, :offset_value,
           :limit_value, :scroll_args, :source_value, :preference_value, :search_type_value,
-          :routing_value, :track_total_hits_value, :explain_value
+          :routing_value, :track_total_hits_value, :explain_value, :http_timeout_value
         ].each do |name|
           criteria.send(:"#{name}=", other.send(name)) unless other.send(name).nil?
         end
@@ -148,6 +149,22 @@ module SearchFlip
       end
     end
 
+    # Specifies a http timeout, such that a SearchFlip::TimeoutError will be
+    # thrown when the request times out.
+    #
+    # @example
+    #   ProductIndex.http_timeout(3).search("hello world")
+    #
+    # @param value [Fixnum] The timeout value
+    #
+    # @return [SearchFlip::Criteria] A newly created extended criteria
+
+    def http_timeout(value)
+      fresh.tap do |criteria|
+        criteria.http_timeout_value = value
+      end
+    end
+
     # Specifies early query termination, such that the processing will be
     # stopped after the specified number of results has been accumulated.
     #
@@ -330,10 +347,15 @@ module SearchFlip
       dupped_request.delete(:from)
       dupped_request.delete(:size)
 
+      http_request = connection.http_client
+      http_request = http_request.timeout(http_timeout_value) if http_timeout_value
+
       if connection.version.to_i >= 5
-        connection.http_client.post("#{target.type_url}/_delete_by_query", params: request_params.merge(params), json: dupped_request)
+        url = connection.version.to_i < 8 ? target.type_url : target.index_url
+
+        http_request.post("#{url}/_delete_by_query", params: request_params.merge(params), json: dupped_request)
       else
-        connection.http_client.delete("#{target.type_url}/_query", params: request_params.merge(params), json: dupped_request)
+        http_request.delete("#{target.type_url}/_query", params: request_params.merge(params), json: dupped_request)
       end
 
       target.refresh if SearchFlip::Config[:auto_refresh]
@@ -501,8 +523,8 @@ module SearchFlip
     end
 
     # Executes the search request for the current criteria, ie sends the
-    # request to Elasticsearch and returns the response. Connection and
-    # response errors will be rescued if you specify the criteria to be
+    # request to Elasticsearch and returns the response. Connection, timeout
+    # and response errors will be rescued if you specify the criteria to be
     # #failsafe, such that an empty response is returned instead.
     #
     # @example
@@ -590,6 +612,7 @@ module SearchFlip
 
     def execute!
       http_request = connection.http_client.headers(accept: "application/json")
+      http_request = http_request.timeout(http_timeout_value) if http_timeout_value
 
       http_response =
         if scroll_args && scroll_args[:id]
@@ -599,17 +622,21 @@ module SearchFlip
             json: { scroll: scroll_args[:timeout], scroll_id: scroll_args[:id] }
           )
         elsif scroll_args
+          url = connection.version.to_i < 8 ? target.type_url : target.index_url
+
           http_request.post(
-            "#{target.type_url}/_search",
+            "#{url}/_search",
             params: request_params.merge(scroll: scroll_args[:timeout]),
             json: request
           )
         else
-          http_request.post("#{target.type_url}/_search", params: request_params, json: request)
+          url = connection.version.to_i < 8 ? target.type_url : target.index_url
+
+          http_request.post("#{url}/_search", params: request_params, json: request)
         end
 
       SearchFlip::Response.new(self, SearchFlip::JSON.parse(http_response.to_s))
-    rescue SearchFlip::ConnectionError, SearchFlip::ResponseError => e
+    rescue SearchFlip::ConnectionError, SearchFlip::TimeoutError, SearchFlip::ResponseError => e
       raise e unless failsafe_value
 
       SearchFlip::Response.new(self, "took" => 0, "hits" => { "total" => 0, "hits" => [] })

data/lib/search_flip/http_client.rb

@@ -66,6 +66,10 @@ module SearchFlip
       response
     rescue HTTP::ConnectionError => e
       raise SearchFlip::ConnectionError, e.message
+    rescue HTTP::TimeoutError => e
+      raise SearchFlip::TimeoutError, e.message
+    rescue HTTP::Error => e
+      raise SearchFlip::HttpError, e.message
     end
   end
 end

data/lib/search_flip/index.rb

@@ -254,7 +254,7 @@ module SearchFlip
         :page, :per, :search, :highlight, :suggest, :custom, :find_in_batches, :find_results_in_batches,
         :find_each, :find_each_result, :failsafe, :total_entries, :total_count, :timeout, :terminate_after,
         :records, :results, :must, :must_not, :should, :preference, :search_type, :routing,
-        :track_total_hits, :explain
+        :track_total_hits, :explain, :http_timeout
 
       # Override to specify the type name used within Elasticsearch. Recap,
       # this gem uses an individual index for each index class, because
@@ -455,7 +455,8 @@ module SearchFlip
       # @return [Hash] The specified document
 
       def get(id, params = {})
-        response = connection.http_client.headers(accept: "application/json").get("#{type_url}/#{id}", params: params)
+        url = connection.version.to_i < 8 ? type_url : "#{index_url}/_doc"
+        response = connection.http_client.headers(accept: "application/json").get("#{url}/#{id}", params: params)
 
         SearchFlip::JSON.parse(response.to_s)
       end
@@ -473,7 +474,8 @@ module SearchFlip
       # @return [Hash] The raw response
 
       def mget(request, params = {})
-        response = connection.http_client.headers(accept: "application/json").post("#{type_url}/_mget", json: request, params: params)
+        url = connection.version.to_i < 8 ? type_url : index_url
+        response = connection.http_client.headers(accept: "application/json").post("#{url}/_mget", json: request, params: params)
 
         SearchFlip::JSON.parse(response.to_s)
       end
@@ -599,7 +601,7 @@ module SearchFlip
         scope
       end
 
-      # Initiates and yields the bulk object, such that index, import, create,
+      # Initiates and yields a bulk object, such that index, import, create,
       # update and delete requests can be appended to the bulk request. Sends a
       # refresh request afterwards if auto_refresh is enabled.
       #
@@ -631,7 +633,9 @@ module SearchFlip
           bulk_max_mb: connection.bulk_max_mb
         }
 
-        SearchFlip::Bulk.new("#{type_url}/_bulk", default_options.merge(options)) do |indexer|
+        url = connection.version.to_i < 8 ? type_url : index_url
+
+        SearchFlip::Bulk.new("#{url}/_bulk", default_options.merge(options)) do |indexer|
           yield indexer
         end
 

data/lib/search_flip/version.rb

@@ -1,3 +1,3 @@
 module SearchFlip
-  VERSION = "4.0.0.beta8"
+  VERSION = "4.0.0.beta11"
 end

data/lib/search_flip.rb

@@ -32,10 +32,15 @@ require "search_flip/index"
 require "search_flip/model"
 
 module SearchFlip
-  class NotSupportedError < StandardError; end
-  class ConnectionError < StandardError; end
+  class Error < StandardError; end
 
-  class ResponseError < StandardError
+  class NotSupportedError < Error; end
+
+  class HttpError < Error; end
+  class ConnectionError < HttpError; end
+  class TimeoutError < HttpError; end
+
+  class ResponseError < Error
     attr_reader :code, :body
 
     def initialize(code:, body:)

data/search_flip.gemspec

@@ -15,7 +15,6 @@ Gem::Specification.new do |spec|
 
   spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   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.post_install_message = <<~MESSAGE

data/spec/search_flip/aws_sigv4_plugin_spec.rb

@@ -16,10 +16,12 @@ RSpec.describe SearchFlip::AwsSigv4Plugin do
     it "adds the signed headers to the request" do
       Timecop.freeze Time.parse("2020-01-01 12:00:00 UTC") do
         expect(client).to receive(:headers).with(
-          "host" => "localhost",
-          "authorization" => /.*/,
-          "x-amz-content-sha256" => /.*/,
-          "x-amz-date" => /20200101T120000Z/
+          an_object_matching(
+            "host" => "localhost",
+            "authorization" => /.*/,
+            "x-amz-content-sha256" => /.*/,
+            "x-amz-date" => /20200101T120000Z/
+          )
         )
 
         plugin.call(client, :get, "http://localhost/index")

data/spec/search_flip/bulk_spec.rb

@@ -60,18 +60,15 @@ RSpec.describe SearchFlip::Bulk do
 
     it "uses the specified http_client" do
       product = create(:product)
+      url = ProductIndex.connection.version.to_i < 8 ? ProductIndex.type_url : ProductIndex.index_url
 
-      stub_request(:put, "#{ProductIndex.type_url}/_bulk")
-        .with(headers: { "X-Header" => "Value" })
-        .to_return(status: 500)
+      stub_request(:put, "#{url}/_bulk").with(headers: { "X-Header" => "Value" }).to_return(status: 200, body: "{}")
 
-      block = lambda do
-        ProductIndex.bulk http_client: ProductIndex.connection.http_client.headers("X-Header" => "Value") do |bulk|
-          bulk.index product.id, ProductIndex.serialize(product)
-        end
+      ProductIndex.bulk http_client: ProductIndex.connection.http_client.headers("X-Header" => "Value") do |bulk|
+        bulk.index product.id, ProductIndex.serialize(product)
       end
 
-      expect(&block).to raise_error(SearchFlip::ResponseError)
+      expect(WebMock).to have_requested(:put, "#{url}/_bulk").with(headers: { "X-Header" => "Value" })
     end
 
     it "transmits up to bulk_max_mb only" do

data/spec/search_flip/connection_spec.rb

@@ -199,7 +199,7 @@ RSpec.describe SearchFlip::Connection do
     it "freezes the specified index" do
       connection = SearchFlip::Connection.new
 
-      if connection.version.to_f >= 6.6
+      if connection.version.to_f >= 6.6 && connection.version.to_i < 8
         begin
           connection.create_index("index_name")
           connection.freeze_index("index_name")
@@ -216,7 +216,7 @@ RSpec.describe SearchFlip::Connection do
     it "unfreezes the specified index" do
       connection = SearchFlip::Connection.new
 
-      if connection.version.to_f >= 6.6
+      if connection.version.to_f >= 6.6 && connection.version.to_i < 8
         begin
           connection.create_index("index_name")
           connection.freeze_index("index_name")
@@ -291,12 +291,19 @@ RSpec.describe SearchFlip::Connection do
       begin
         connection = SearchFlip::Connection.new
 
-        mapping = { "type_name" => { "properties" => { "id" => { "type" => "long" } } } }
+        mapping = { "properties" => { "id" => { "type" => "long" } } }
 
         connection.create_index("index_name")
-        connection.update_mapping("index_name", mapping, type_name: "type_name")
 
-        expect(connection.get_mapping("index_name", type_name: "type_name")).to eq("index_name" => { "mappings" => mapping })
+        if connection.version.to_i < 8
+          connection.update_mapping("index_name", { "type_name" => mapping }, type_name: "type_name")
+
+          expect(connection.get_mapping("index_name", type_name: "type_name")).to eq("index_name" => { "mappings" => { "type_name" => mapping } })
+        else
+          connection.update_mapping("index_name", mapping)
+
+          expect(connection.get_mapping("index_name")).to eq("index_name" => { "mappings" => mapping })
+        end
       ensure
         connection.delete_index("index_name") if connection.index_exists?("index_name")
       end
@@ -337,6 +344,96 @@ RSpec.describe SearchFlip::Connection do
     end
   end
 
+  describe "#bulk" do
+    it "imports objects to the specified indices" do
+      connection = SearchFlip::Connection.new
+
+      bulk = proc do
+        connection.bulk do |indexer|
+          indexer.index 1, { id: 1 }, _index: ProductIndex.index_name, ** connection.version.to_i < 8 ? { _type: ProductIndex.type_name } : {}
+          indexer.index 2, { id: 2 }, _index: ProductIndex.index_name, ** connection.version.to_i < 8 ? { _type: ProductIndex.type_name } : {}
+          indexer.index 1, { id: 1 }, _index: CommentIndex.index_name, ** connection.version.to_i < 8 ? { _type: CommentIndex.type_name } : {}
+        end
+      end
+
+      expect(&bulk).to(change { CommentIndex.total_count }.by(1).and(change { CommentIndex.total_count }.by(1)))
+    end
+
+    it "raises when no index is given" do
+      connection = SearchFlip::Connection.new
+
+      bulk = proc do
+        connection.bulk do |indexer|
+          indexer.index 1, id: 1
+        end
+      end
+
+      expect(&bulk).to raise_error(SearchFlip::ResponseError)
+    end
+
+    it "respects options" do
+      connection = SearchFlip::Connection.new
+
+      connection.bulk do |indexer|
+        indexer.index 1, { id: 1 }, _index: ProductIndex.index_name, ** connection.version.to_i < 8 ? { _type: ProductIndex.type_name } : {}
+        indexer.index 2, { id: 2 }, _index: ProductIndex.index_name, ** connection.version.to_i < 8 ? { _type: ProductIndex.type_name } : {}
+      end
+
+      bulk = proc do
+        connection.bulk do |indexer|
+          indexer.index 1, { id: 1 }, _index: ProductIndex.index_name, version: 1, version_type: "external", ** connection.version.to_i < 8 ? { _type: ProductIndex.type_name } : {}
+          indexer.index 2, { id: 2 }, _index: ProductIndex.index_name, version: 1, version_type: "external", ** connection.version.to_i < 8 ? { _type: ProductIndex.type_name } : {}
+        end
+      end
+
+      expect(&bulk).to raise_error(SearchFlip::Bulk::Error)
+
+      bulk = proc do
+        connection.bulk ignore_errors: [409] do |indexer|
+          indexer.index 1, { id: 1 }, _index: ProductIndex.index_name, version: 1, version_type: "external", ** connection.version.to_i < 8 ? { _type: ProductIndex.type_name } : {}
+          indexer.index 2, { id: 2 }, _index: ProductIndex.index_name, version: 1, version_type: "external", ** connection.version.to_i < 8 ? { _type: ProductIndex.type_name } : {}
+        end
+      end
+
+      expect(&bulk).not_to(change { ProductIndex.total_count })
+    end
+
+    it "passes default options" do
+      allow(SearchFlip::Bulk).to receive(:new)
+
+      connection = SearchFlip::Connection.new
+
+      connection.bulk do |indexer|
+        indexer.index 1, { id: 1 }, _index: ProductIndex.index_name, ** connection.version.to_i < 8 ? { _type: ProductIndex.type_name } : {}
+      end
+
+      expect(SearchFlip::Bulk).to have_received(:new).with(
+        anything,
+        http_client: connection.http_client,
+        bulk_limit: connection.bulk_limit,
+        bulk_max_mb: connection.bulk_max_mb
+      )
+    end
+
+    it "passes custom options" do
+      allow(SearchFlip::Bulk).to receive(:new)
+
+      connection = SearchFlip::Connection.new
+
+      options = {
+        bulk_limit: "bulk limit",
+        bulk_max_mb: "bulk max mb",
+        http_client: "http client"
+      }
+
+      connection.bulk(options) do |indexer|
+        indexer.index 1, { id: 1 }, _index: ProductIndex.index_name, ** connection.version.to_i < 8 ? { _type: ProductIndex.type_name } : {}
+      end
+
+      expect(SearchFlip::Bulk).to have_received(:new).with(anything, options)
+    end
+  end
+
   describe "#index_url" do
     it "returns the index url for the specified index" do
       connection = SearchFlip::Connection.new(base_url: "base_url")

data/spec/search_flip/criteria_spec.rb

@@ -97,7 +97,8 @@ RSpec.describe SearchFlip::Criteria do
       methods = [
         :profile_value, :failsafe_value, :terminate_after_value, :timeout_value,
         :offset_value, :limit_value, :scroll_args, :source_value, :preference_value,
-        :search_type_value, :routing_value, :track_total_hits_value, :explain_value
+        :search_type_value, :routing_value, :track_total_hits_value, :explain_value,
+        :http_timeout_value
       ]
 
       methods.each do |method|
@@ -191,6 +192,22 @@ RSpec.describe SearchFlip::Criteria do
     end
   end
 
+  describe "#http_timeout" do
+    it "sets the query timeout" do
+      http_client = double("client").as_null_object
+      allow(http_client).to receive(:timeout).and_return(http_client)
+      allow(http_client).to receive(:post).and_raise(SearchFlip::TimeoutError)
+      allow(ProductIndex.connection).to receive(:http_client).and_return(http_client)
+
+      expect { ProductIndex.http_timeout(1).execute }.to raise_error(SearchFlip::TimeoutError)
+      expect(http_client).to have_received(:timeout).with(1)
+    end
+
+    it "executes without errors" do
+      expect { ProductIndex.http_timeout(1).execute }.not_to raise_error
+    end
+  end
+
   describe "#terminate_after" do
     it "sets the terminate after value" do
       query = ProductIndex.terminate_after(1)
@@ -1204,13 +1221,19 @@ RSpec.describe SearchFlip::Criteria do
   end
 
   describe "#failsafe" do
-    it "prevents query syntax exceptions" do
-      expect { ProductIndex.search("syntax/error").records }.to raise_error(SearchFlip::ResponseError)
+    [SearchFlip::ConnectionError, SearchFlip::TimeoutError, SearchFlip::ResponseError.new(code: "code", body: "body")].each do |error|
+      it "prevents #{error}" do
+        http_client = double("client").as_null_object
+        allow(http_client).to receive(:post).and_raise(error)
+        allow(ProductIndex.connection).to receive(:http_client).and_return(http_client)
+
+        expect { ProductIndex.all.execute }.to raise_error(error)
 
-      query = ProductIndex.failsafe(true).search("syntax/error")
+        query = ProductIndex.failsafe(true)
 
-      expect(query.records).to eq([])
-      expect(query.total_entries).to eq(0)
+        expect(query.records).to eq([])
+        expect(query.total_entries).to eq(0)
+      end
     end
   end
 
@@ -1327,28 +1350,40 @@ RSpec.describe SearchFlip::Criteria do
 
   describe "#preference" do
     it "sets the preference" do
-      stub_request(:post, "http://127.0.0.1:9200/products/products/_search?preference=value")
+      url = ProductIndex.connection.version.to_i < 8 ? "products/products" : "products"
+
+      stub_request(:post, "http://127.0.0.1:9200/#{url}/_search?preference=value")
         .to_return(status: 200, headers: { content_type: "application/json" }, body: "{}")
 
       ProductIndex.preference("value").execute
+
+      expect(WebMock).to have_requested(:post, "http://127.0.0.1:9200/#{url}/_search?preference=value")
     end
   end
 
   describe "#search_type" do
     it "sets the search_type" do
-      stub_request(:post, "http://127.0.0.1:9200/products/products/_search?search_type=value")
+      url = ProductIndex.connection.version.to_i < 8 ? "products/products" : "products"
+
+      stub_request(:post, "http://127.0.0.1:9200/#{url}/_search?search_type=value")
         .to_return(status: 200, headers: { content_type: "application/json" }, body: "{}")
 
       ProductIndex.search_type("value").execute
+
+      expect(WebMock).to have_requested(:post, "http://127.0.0.1:9200/#{url}/_search?search_type=value")
     end
   end
 
   describe "#routing" do
     it "sets the search_type" do
-      stub_request(:post, "http://127.0.0.1:9200/products/products/_search?routing=value")
+      url = ProductIndex.connection.version.to_i < 8 ? "products/products" : "products"
+
+      stub_request(:post, "http://127.0.0.1:9200/#{url}/_search?routing=value")
         .to_return(status: 200, headers: { content_type: "application/json" }, body: "{}")
 
       ProductIndex.routing("value").execute
+
+      expect(WebMock).to have_requested(:post, "http://127.0.0.1:9200/#{url}/_search?routing=value")
     end
   end
 end

data/spec/search_flip/index_spec.rb

@@ -14,7 +14,7 @@ RSpec.describe SearchFlip::Index do
       :total_entries, :total_count, :terminate_after, :timeout, :records, :results,
       :must, :must_not, :should, :find_each_result,
       :find_results_in_batches, :preference, :search_type, :routing,
-      :track_total_hits, :explain
+      :track_total_hits, :explain, :http_timeout
     ]
 
     methods.each do |method|
@@ -215,7 +215,11 @@ RSpec.describe SearchFlip::Index do
 
         TestIndex.update_mapping
 
-        expect(TestIndex.connection).to have_received(:update_mapping).with("test", { "test" => mapping }, type_name: "test")
+        if TestIndex.connection.version.to_i < 8
+          expect(TestIndex.connection).to have_received(:update_mapping).with("test", { "test" => mapping }, type_name: "test")
+        else
+          expect(TestIndex.connection).to have_received(:update_mapping).with("test", mapping)
+        end
       end
 
       it "updates the mapping" do
@@ -268,7 +272,11 @@ RSpec.describe SearchFlip::Index do
 
         TestIndex.get_mapping
 
-        expect(TestIndex.connection).to have_received(:get_mapping).with("test", type_name: "test")
+        if TestIndex.connection.version.to_i < 8
+          expect(TestIndex.connection).to have_received(:get_mapping).with("test", type_name: "test")
+        else
+          expect(TestIndex.connection).to have_received(:get_mapping).with("test")
+        end
       end
 
       it "returns the mapping" do
@@ -332,7 +340,7 @@ RSpec.describe SearchFlip::Index do
 
       TestIndex.type_url
 
-      expect(TestIndex.connection).to have_received(:type_url).with("test", "test")
+      expect(TestIndex.connection).to have_received(:type_url).with("test", TestIndex.connection.version.to_i < 8 ? "test" : "_doc")
     end
   end
 

data/spec/spec_helper.rb

@@ -16,6 +16,8 @@ RSpec.configure do |config|
     TestIndex.delete_index if TestIndex.index_exists?
     ProductIndex.match_all.delete
     Product.delete_all
+    CommentIndex.match_all.delete
+    Comment.delete_all
   end
 end
 
@@ -84,7 +86,7 @@ class CommentIndex
   include SearchFlip::Index
 
   def self.type_name
-    "comments"
+    connection.version.to_i < 8 ? "comments" : "_doc"
   end
 
   def self.index_name
@@ -134,7 +136,7 @@ class ProductIndex
   end
 
   def self.type_name
-    "products"
+    connection.version.to_i < 8 ? "products" : "_doc"
   end
 
   def self.index_name
@@ -175,7 +177,7 @@ class TestIndex
   end
 
   def self.type_name
-    "test"
+    connection.version.to_i < 8 ? "test" : "_doc"
   end
 
   def self.index_name

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: search_flip
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta8
+  version: 4.0.0.beta11
 platform: ruby
 authors:
 - Benjamin Vetter
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-15 00:00:00.000000000 Z
+date: 2022-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -288,21 +288,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubygems_version: 3.2.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Full-Featured Elasticsearch Ruby Client with a Chainable DSL
-test_files:
-- spec/delegate_matcher.rb
-- spec/search_flip/aggregation_spec.rb
-- spec/search_flip/aws_sigv4_plugin_spec.rb
-- spec/search_flip/bulk_spec.rb
-- spec/search_flip/connection_spec.rb
-- spec/search_flip/criteria_spec.rb
-- spec/search_flip/http_client_spec.rb
-- spec/search_flip/index_spec.rb
-- spec/search_flip/json_spec.rb
-- spec/search_flip/model_spec.rb
-- spec/search_flip/null_instrumenter_spec.rb
-- spec/search_flip/response_spec.rb
-- spec/search_flip/result_spec.rb
-- spec/spec_helper.rb
+test_files: []