search_flip 3.3.0 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 021f5dd6d172381d777444631e96f2ebff0759b002f38b9ca555f844184d5dd9
-  data.tar.gz: ded7bbcab491ca187a68214377aa1f6ab2e3774739224744181aca16cf81e504
+  metadata.gz: a241c0ab86244a53caab6b7d8dbcd8f441d9e7fc40837cc9afa7f57e6c7e5da0
+  data.tar.gz: f42562bd8af88780accd33c91c112c9f81b42de8945aa956c118b7faff75c6f6
 SHA512:
-  metadata.gz: adc9acf973b399aa0595bdc42705516f9a13cb4cfbd18b5ee5db613d8c91261c3bba80834848b8079c4569431dfcbcff0368787b5edeb42f517e864721a54bef
-  data.tar.gz: 0b8769e3c59d1953036b2fc1618cfbd15db7bc4d19beef0a71e24aeb82830b499eff820e061b397ee20c15d4942941df69cc4dff2b20e4b35119193e78af74b7
+  metadata.gz: ad60516d947d060ca1fe049a80059c18e9deb76f7c380b0279cd11cd5b5e0fb811d3a46a12220fd731b793ce1a6728f23e6cb242410f584d040e874a2bed7d78
+  data.tar.gz: 415962179b2e3ead79296851746b5f4892bdfbce64d09ae6ef2a2f0df83fa265b1c00a8a549d42013911eaff7ecc0b0460d20ef5c72d096f070d1adce4d0797c

data/.github/workflows/test.yml

@@ -12,15 +12,17 @@ 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.5
         - 2.6
         - 2.7
+        - 3.0
     services:
       elasticsearch:
         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
+
 Layout/EmptyLineBetweenDefs:
   EmptyLineBetweenClassDefs: false
 

data/CHANGELOG.md

@@ -1,6 +1,19 @@
 
 # CHANGELOG
 
+## 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`
+
 ## v3.3.0
 
 * Update httprb

data/README.md

@@ -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
@@ -756,7 +764,7 @@ end
 This allows to use different clusters per index e.g. when migrating indices to
 new versions of Elasticsearch.
 
-You can specify basic auth, additional headers, etc via:
+You can specify basic auth, additional headers, request timeouts, etc via:
 
 ```ruby
 http_client = SearchFlip::HTTPClient.new
@@ -773,6 +781,9 @@ http_client = http_client.via("proxy.host", 8080)
 # Custom headers
 http_client = http_client.headers(key: "value")
 
+# Timeouts
+http_client = http_client.timeout(20)
+
 SearchFlip::Connection.new(base_url: "...", http_client: http_client)
 ```
 

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

@@ -64,7 +64,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
@@ -300,8 +300,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)
 
@@ -318,8 +318,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)
 

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

@@ -1,7 +1,28 @@
 module SearchFlip
-  # The SearchFlip::HTTPClient class wraps the http gem, is for internal use
-  # and responsible for the http request/response handling, ie communicating
-  # with Elasticsearch.
+  # The SearchFlip::HTTPClient class wraps the http gem and responsible for the
+  # http request/response handling, ie communicating with Elasticsearch. You
+  # only need to use it directly if you need authentication to communicate with
+  # Elasticsearch or if you want to set some custom http settings.
+  #
+  # @example
+  #   http_client = SearchFlip::HTTPClient.new
+  #
+  #   # Basic Auth
+  #   http_client = http_client.basic_auth(user: "username", pass: "password")
+  #
+  #   # Raw Auth Header
+  #   http_client = http_client.auth("Bearer VGhlIEhUVFAgR2VtLCBST0NLUw")
+  #
+  #   # Proxy Settings
+  #   http_client = http_client.via("proxy.host", 8080)
+  #
+  #   # Custom headers
+  #   http_client = http_client.headers(key: "value")
+  #
+  #   # Timeouts
+  #   http_client = http_client.timeout(20)
+  #
+  #   SearchFlip::Connection.new(base_url: "...", http_client: http_client)
 
   class HTTPClient
     attr_accessor :request, :plugins
@@ -14,11 +35,11 @@ module SearchFlip
     class << self
       extend Forwardable
 
-      def_delegators :new, :headers, :via, :basic_auth, :auth
+      def_delegators :new, :headers, :via, :basic_auth, :auth, :timeout
       def_delegators :new, :get, :post, :put, :delete, :head
     end
 
-    [:headers, :via, :basic_auth, :auth].each do |method|
+    [:headers, :via, :basic_auth, :auth, :timeout].each do |method|
       define_method method do |*args|
         dup.tap do |client|
           client.request = request.send(method, *args)
@@ -45,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
@@ -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 = "3.3.0"
+  VERSION = "3.6.0"
 end

data/lib/search_flip.rb

@@ -33,10 +33,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/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

@@ -170,7 +170,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")
@@ -187,7 +187,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")
@@ -262,12 +262,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

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/http_client_spec.rb

@@ -7,7 +7,7 @@ class HttpTestRequest
     self.calls = []
   end
 
-  [:via, :basic_auth, :auth].each do |method|
+  [:headers, :via, :basic_auth, :auth, :timeout].each do |method|
     define_method method do |*args|
       dup.tap do |request|
         request.calls = calls + [[method, args]]
@@ -20,7 +20,7 @@ RSpec.describe SearchFlip::HTTPClient do
   describe "delegation" do
     subject { SearchFlip::HTTPClient }
 
-    [:headers, :via, :basic_auth, :auth].each do |method|
+    [:headers, :via, :basic_auth, :auth, :timeout].each do |method|
       it { should delegate(method).to(:new) }
     end
 
@@ -56,8 +56,12 @@ RSpec.describe SearchFlip::HTTPClient do
     end
   end
 
-  [:via, :basic_auth, :auth].each do |method|
+  [:headers, :via, :basic_auth, :auth, :timeout].each do |method|
     describe "##{method}" do
+      it "is understood by HTTP" do
+        expect(HTTP.respond_to?(method)).to eq(true)
+      end
+
       it "creates a dupped instance" do
         client = SearchFlip::HTTPClient.new
         client.request = HttpTestRequest.new

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

@@ -84,7 +84,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 +134,7 @@ class ProductIndex
   end
 
   def self.type_name
-    "products"
+    connection.version.to_i < 8 ? "products" : "_doc"
   end
 
   def self.index_name
@@ -175,7 +175,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: 3.3.0
+  version: 3.6.0
 platform: ruby
 authors:
 - Benjamin Vetter
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-26 00:00:00.000000000 Z
+date: 2022-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -302,7 +302,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 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: