search_flip 3.9.0 → 4.0.0.beta

data/lib/search_flip/to_json.rb

@@ -1 +1,29 @@
-warn "[DEPRECATION] Using search_flip/to_json is not neccessary anymore"
+require "time"
+require "date"
+require "json"
+
+class Time
+  def to_json(*args)
+    iso8601(6).to_json
+  end
+end
+
+class Date
+  def to_json(*args)
+    iso8601.to_json
+  end
+end
+
+class DateTime
+  def to_json(*args)
+    iso8601(6).to_json
+  end
+end
+
+if defined?(ActiveSupport)
+  class ActiveSupport::TimeWithZone
+    def to_json(*args)
+      iso8601(6).to_json
+    end
+  end
+end

data/lib/search_flip/version.rb

@@ -1,3 +1,3 @@
 module SearchFlip
-  VERSION = "3.9.0"
+  VERSION = "4.0.0.beta"
 end

data/lib/search_flip.rb

@@ -1,9 +1,7 @@
 require "ruby2_keywords"
 require "forwardable"
 require "http"
-require "hashie"
 require "thread"
-require "json"
 require "oj"
 require "set"
 
@@ -33,15 +31,10 @@ require "search_flip/index"
 require "search_flip/model"
 
 module SearchFlip
-  class Error < StandardError; end
+  class NotSupportedError < StandardError; end
+  class ConnectionError < StandardError; end
 
-  class NotSupportedError < Error; end
-
-  class HttpError < Error; end
-  class ConnectionError < HttpError; end
-  class TimeoutError < HttpError; end
-
-  class ResponseError < Error
+  class ResponseError < StandardError
     attr_reader :code, :body
 
     def initialize(code:, body:)

data/search_flip.gemspec

@@ -13,12 +13,9 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/mrkamel/search_flip"
   spec.license       = "MIT"
 
-  spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = "https://github.com/mrkamel/search_flip"
-  spec.metadata["changelog_uri"] = "https://github.com/mrkamel/search_flip/blob/master/CHANGELOG.md"
-
   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
@@ -27,9 +24,18 @@ Gem::Specification.new do |spec|
     https://github.com/mrkamel/search_flip/blob/master/UPDATING.md
   MESSAGE
 
-  spec.add_dependency "hashie"
+  spec.add_development_dependency "activerecord", ">= 3.0"
+  spec.add_development_dependency "aws-sdk-core"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "factory_bot"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "rubocop"
+  spec.add_development_dependency "sqlite3"
+  spec.add_development_dependency "timecop"
+  spec.add_development_dependency "webmock"
+
   spec.add_dependency "http"
-  spec.add_dependency "json"
   spec.add_dependency "oj"
   spec.add_dependency "ruby2_keywords"
 end

data/spec/search_flip/aggregation_spec.rb

@@ -15,7 +15,7 @@ RSpec.describe SearchFlip::Aggregation do
         aggregation.where(title: "title").where(description: "description").aggregate(:category)
       end
 
-      aggregations = query.aggregations(:category).category.buckets.each_with_object({}) { |bucket, hash| hash[bucket[:key]] = bucket.doc_count }
+      aggregations = query.aggregations(:category).category.buckets.each_with_object({}) { |bucket, hash| hash[bucket["key"]] = bucket.doc_count }
 
       expect(aggregations).to eq("category1" => 2, "category2" => 1)
     end
@@ -36,7 +36,7 @@ RSpec.describe SearchFlip::Aggregation do
           .aggregate(:category)
       end
 
-      aggregations = query.aggregations(:category).category.buckets.each_with_object({}) { |bucket, hash| hash[bucket[:key]] = bucket.doc_count }
+      aggregations = query.aggregations(:category).category.buckets.each_with_object({}) { |bucket, hash| hash[bucket["key"]] = bucket.doc_count }
 
       expect(aggregations).to eq("category1" => 2, "category2" => 1)
     end
@@ -54,7 +54,7 @@ RSpec.describe SearchFlip::Aggregation do
         aggregation.where(title: "title1".."title3").where(price: 100..200).aggregate(:category)
       end
 
-      aggregations = query.aggregations(:category).category.buckets.each_with_object({}) { |bucket, hash| hash[bucket[:key]] = bucket.doc_count }
+      aggregations = query.aggregations(:category).category.buckets.each_with_object({}) { |bucket, hash| hash[bucket["key"]] = bucket.doc_count }
 
       expect(aggregations).to eq("category1" => 2, "category2" => 1)
     end
@@ -74,7 +74,7 @@ RSpec.describe SearchFlip::Aggregation do
         aggregation.where_not(title: "title4").where_not(title: "title5").aggregate(:category)
       end
 
-      aggregations = query.aggregations(:category).category.buckets.each_with_object({}) { |bucket, hash| hash[bucket[:key]] = bucket.doc_count }
+      aggregations = query.aggregations(:category).category.buckets.each_with_object({}) { |bucket, hash| hash[bucket["key"]] = bucket.doc_count }
 
       expect(aggregations).to eq("category1" => 2, "category2" => 1)
     end
@@ -94,7 +94,7 @@ RSpec.describe SearchFlip::Aggregation do
         aggregation.where_not(title: ["title1", "title2"]).where_not(title: ["title6", "title7"]).aggregate(:category)
       end
 
-      aggregations = query.aggregations(:category).category.buckets.each_with_object({}) { |bucket, hash| hash[bucket[:key]] = bucket.doc_count }
+      aggregations = query.aggregations(:category).category.buckets.each_with_object({}) { |bucket, hash| hash[bucket["key"]] = bucket.doc_count }
 
       expect(aggregations).to eq("category1" => 2, "category2" => 1)
     end
@@ -114,7 +114,7 @@ RSpec.describe SearchFlip::Aggregation do
         aggregation.where_not(price: 100..150).where_not(title: "title6".."title7").aggregate(:category)
       end
 
-      aggregations = query.aggregations(:category).category.buckets.each_with_object({}) { |bucket, hash| hash[bucket[:key]] = bucket.doc_count }
+      aggregations = query.aggregations(:category).category.buckets.each_with_object({}) { |bucket, hash| hash[bucket["key"]] = bucket.doc_count }
 
       expect(aggregations).to eq("category1" => 2, "category2" => 1)
     end
@@ -134,7 +134,7 @@ RSpec.describe SearchFlip::Aggregation do
         aggregation.filter(range: { price: { gte: 100, lte: 200 } }).filter(term: { title: "title" }).aggregate(:category)
       end
 
-      aggregations = query.aggregations(:category).category.buckets.each_with_object({}) { |bucket, hash| hash[bucket[:key]] = bucket.doc_count }
+      aggregations = query.aggregations(:category).category.buckets.each_with_object({}) { |bucket, hash| hash[bucket["key"]] = bucket.doc_count }
 
       expect(aggregations).to eq("category1" => 2, "category2" => 1)
     end
@@ -156,7 +156,7 @@ RSpec.describe SearchFlip::Aggregation do
         aggregation.range(:price, gte: 100, lte: 200).range(:title, gte: "title1", lte: "title3").aggregate(:category)
       end
 
-      aggregations = query.aggregations(:category).category.buckets.each_with_object({}) { |bucket, hash| hash[bucket[:key]] = bucket.doc_count }
+      aggregations = query.aggregations(:category).category.buckets.each_with_object({}) { |bucket, hash| hash[bucket["key"]] = bucket.doc_count }
 
       expect(aggregations).to eq("category1" => 2, "category2" => 1)
     end
@@ -174,7 +174,7 @@ RSpec.describe SearchFlip::Aggregation do
         aggregation.match_all.aggregate(:category)
       end
 
-      aggregations = query.aggregations(:category).category.buckets.each_with_object({}) { |bucket, hash| hash[bucket[:key]] = bucket.doc_count }
+      aggregations = query.aggregations(:category).category.buckets.each_with_object({}) { |bucket, hash| hash[bucket["key"]] = bucket.doc_count }
 
       expect(aggregations).to eq("category1" => 2, "category2" => 1)
     end
@@ -194,7 +194,7 @@ RSpec.describe SearchFlip::Aggregation do
         aggregation.exists(:title).exists(:price).aggregate(:category)
       end
 
-      aggregations = query.aggregations(:category).category.buckets.each_with_object({}) { |bucket, hash| hash[bucket[:key]] = bucket.doc_count }
+      aggregations = query.aggregations(:category).category.buckets.each_with_object({}) { |bucket, hash| hash[bucket["key"]] = bucket.doc_count }
 
       expect(aggregations).to eq("category1" => 2, "category2" => 1)
     end
@@ -214,7 +214,7 @@ RSpec.describe SearchFlip::Aggregation do
         aggregation.exists_not(:title).exists_not(:price).aggregate(:category)
       end
 
-      aggregations = query.aggregations(:category).category.buckets.each_with_object({}) { |bucket, hash| hash[bucket[:key]] = bucket.doc_count }
+      aggregations = query.aggregations(:category).category.buckets.each_with_object({}) { |bucket, hash| hash[bucket["key"]] = bucket.doc_count }
 
       expect(aggregations).to eq("category1" => 2, "category2" => 1)
     end
@@ -244,21 +244,21 @@ RSpec.describe SearchFlip::Aggregation do
       expect(aggregations).to eq("category1" => 3, "category2" => 3)
 
       aggregations = query.aggregations(:category)["category1"].title.buckets.each_with_object({}) do |bucket, hash|
-        hash[bucket[:key]] = bucket.doc_count
+        hash[bucket["key"]] = bucket.doc_count
       end
 
       expect(aggregations).to eq("title1" => 2, "title2" => 1)
 
       aggregations = query.aggregations(:category)["category2"].title.buckets.each_with_object({}) do |bucket, hash|
-        hash[bucket[:key]] = bucket.doc_count
+        hash[bucket["key"]] = bucket.doc_count
       end
 
       expect(aggregations).to eq("title1" => 1, "title2" => 2)
 
-      expect(query.aggregations(:category)["category1"].title.buckets.detect { |bucket| bucket[:key] == "title1" }.price.value).to eq(30)
-      expect(query.aggregations(:category)["category1"].title.buckets.detect { |bucket| bucket[:key] == "title2" }.price.value).to eq(15)
-      expect(query.aggregations(:category)["category2"].title.buckets.detect { |bucket| bucket[:key] == "title1" }.price.value).to eq(30)
-      expect(query.aggregations(:category)["category2"].title.buckets.detect { |bucket| bucket[:key] == "title2" }.price.value).to eq(60)
+      expect(query.aggregations(:category)["category1"].title.buckets.detect { |bucket| bucket["key"] == "title1" }.price.value).to eq(30)
+      expect(query.aggregations(:category)["category1"].title.buckets.detect { |bucket| bucket["key"] == "title2" }.price.value).to eq(15)
+      expect(query.aggregations(:category)["category2"].title.buckets.detect { |bucket| bucket["key"] == "title1" }.price.value).to eq(30)
+      expect(query.aggregations(:category)["category2"].title.buckets.detect { |bucket| bucket["key"] == "title2" }.price.value).to eq(60)
     end
   end
 

data/spec/search_flip/aws_sigv4_plugin_spec.rb

@@ -16,12 +16,10 @@ 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(
-          an_object_matching(
-            "host" => "localhost",
-            "authorization" => /.*/,
-            "x-amz-content-sha256" => /.*/,
-            "x-amz-date" => /20200101T120000Z/
-          )
+          "host" => "localhost",
+          "authorization" => /.*/,
+          "x-amz-content-sha256" => /.*/,
+          "x-amz-date" => /20200101T120000Z/
         )
 
         plugin.call(client, :get, "http://localhost/index")
@@ -29,17 +27,15 @@ RSpec.describe SearchFlip::AwsSigv4Plugin do
     end
 
     it "feeds the http method, full url and body to the signer" do
-      body = JSON.generate(key: "value")
-
       signing_request = {
         http_method: "GET",
         url: "http://localhost/index?param=value",
-        body: body
+        body: JSON.generate(key: "value")
       }
 
       expect(plugin.signer).to receive(:sign_request).with(signing_request).and_call_original
 
-      plugin.call(client, :get, "http://localhost/index", params: { param: "value" }, body: body)
+      plugin.call(client, :get, "http://localhost/index", params: { param: "value" }, json: { key: "value" })
     end
   end
 end

data/spec/search_flip/bulk_spec.rb

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

data/spec/search_flip/connection_spec.rb

@@ -1,32 +1,10 @@
 require File.expand_path("../spec_helper", __dir__)
 
 RSpec.describe SearchFlip::Connection do
-  describe "#distribution" do
-    it "reutrns the distribution" do
-      expect([nil, "opensearch"]).to include(SearchFlip::Connection.new.distribution)
-    end
-
-    it "returns the distribution from the config when given" do
-      SearchFlip::Config[:version] = { distribution: "distribution" }
-
-      expect(SearchFlip::Connection.new.distribution).to eq("distribution")
-    ensure
-      SearchFlip::Config.delete(:version)
-    end
-  end
-
   describe "#version" do
     it "returns the version" do
       expect(SearchFlip::Connection.new.version).to match(/\A[0-9.]+\z/)
     end
-
-    it "returns the version from the config when given" do
-      SearchFlip::Config[:version] = { number: "1.2.3" }
-
-      expect(SearchFlip::Connection.new.version).to eq("1.2.3")
-    ensure
-      SearchFlip::Config.delete(:version)
-    end
   end
 
   describe "#cluster_health" do
@@ -114,7 +92,7 @@ RSpec.describe SearchFlip::Connection do
     it "returns the specified indices" do
       connection = SearchFlip::Connection.new
 
-      expect(connection.get_indices.map { |index| index["index"] }.grep_v(/^\./).to_set).to eq(["comments", "products"].to_set)
+      expect(connection.get_indices.map { |index| index["index"] }.to_set).to eq(["comments", "products"].to_set)
       expect(connection.get_indices("com*").map { |index| index["index"] }).to eq(["comments"])
     end
 
@@ -192,7 +170,7 @@ RSpec.describe SearchFlip::Connection do
     it "freezes the specified index" do
       connection = SearchFlip::Connection.new
 
-      if connection.distribution.nil? && connection.version.to_f >= 6.6 && connection.version.to_i < 8
+      if connection.version.to_f >= 6.6
         begin
           connection.create_index("index_name")
           connection.freeze_index("index_name")
@@ -209,7 +187,7 @@ RSpec.describe SearchFlip::Connection do
     it "unfreezes the specified index" do
       connection = SearchFlip::Connection.new
 
-      if connection.distribution.nil? && connection.version.to_f >= 6.6 && connection.version.to_i < 8
+      if connection.version.to_f >= 6.6
         begin
           connection.create_index("index_name")
           connection.freeze_index("index_name")
@@ -263,7 +241,7 @@ RSpec.describe SearchFlip::Connection do
   end
 
   describe "#update_mapping" do
-    if SearchFlip::Connection.new.then { |connection| connection.distribution || connection.version.to_i >= 7 }
+    if SearchFlip::Connection.new.version.to_i >= 7
       it "updates the mapping of an index without type name" do
         begin
           connection = SearchFlip::Connection.new
@@ -284,19 +262,12 @@ RSpec.describe SearchFlip::Connection do
       begin
         connection = SearchFlip::Connection.new
 
-        mapping = { "properties" => { "id" => { "type" => "long" } } }
+        mapping = { "type_name" => { "properties" => { "id" => { "type" => "long" } } } }
 
         connection.create_index("index_name")
+        connection.update_mapping("index_name", mapping, type_name: "type_name")
 
-        if connection.distribution.nil? && 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
+        expect(connection.get_mapping("index_name", type_name: "type_name")).to eq("index_name" => { "mappings" => mapping })
       ensure
         connection.delete_index("index_name") if connection.index_exists?("index_name")
       end
@@ -337,96 +308,6 @@ 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.distribution.nil? && connection.version.to_i < 8 ? { _type: ProductIndex.type_name } : {}
-          indexer.index 2, { id: 2 }, _index: ProductIndex.index_name, ** connection.distribution.nil? && connection.version.to_i < 8 ? { _type: ProductIndex.type_name } : {}
-          indexer.index 1, { id: 1 }, _index: CommentIndex.index_name, ** connection.distribution.nil? && 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.distribution.nil? && connection.version.to_i < 8 ? { _type: ProductIndex.type_name } : {}
-        indexer.index 2, { id: 2 }, _index: ProductIndex.index_name, ** connection.distribution.nil? && 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.distribution.nil? && connection.version.to_i < 8 ? { _type: ProductIndex.type_name } : {}
-          indexer.index 2, { id: 2 }, _index: ProductIndex.index_name, version: 1, version_type: "external", ** connection.distribution.nil? && 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.distribution.nil? && connection.version.to_i < 8 ? { _type: ProductIndex.type_name } : {}
-          indexer.index 2, { id: 2 }, _index: ProductIndex.index_name, version: 1, version_type: "external", ** connection.distribution.nil? && 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.distribution.nil? && 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.distribution.nil? && 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,8 +97,7 @@ 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,
-        :http_timeout_value
+        :search_type_value, :routing_value, :track_total_hits_value, :explain_value
       ]
 
       methods.each do |method|
@@ -192,22 +191,6 @@ 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)
@@ -433,18 +416,6 @@ RSpec.describe SearchFlip::Criteria do
     end
   end
 
-  describe "#match_none" do
-    it "does not match any documents" do
-      if ProductIndex.connection.distribution || ProductIndex.connection.version.to_i >= 5
-        ProductIndex.import create(:product)
-
-        query = ProductIndex.match_none
-
-        expect(query.records).to eq([])
-      end
-    end
-  end
-
   describe "#exists" do
     it "sets up the constraints correctly and is chainable" do
       product1 = create(:product, title: "title1", description: "description1")
@@ -479,7 +450,7 @@ RSpec.describe SearchFlip::Criteria do
 
   describe "#post_search" do
     it "sets up the constraints correctly and is chainable" do
-      if ProductIndex.connection.distribution || ProductIndex.connection.version.to_i >= 2
+      if ProductIndex.connection.version.to_i >= 2
         product1 = create(:product, title: "title1", category: "category1")
         product2 = create(:product, title: "title2", category: "category2")
         product3 = create(:product, title: "title3", category: "category1")
@@ -886,7 +857,7 @@ RSpec.describe SearchFlip::Criteria do
 
   describe "#profile" do
     it "sets up the constraints correctly" do
-      if ProductIndex.connection.distribution || ProductIndex.connection.version.to_i >= 2
+      if ProductIndex.connection.version.to_i >= 2
         expect(ProductIndex.profile(true).raw_response["profile"]).not_to be_nil
       end
     end
@@ -1221,19 +1192,13 @@ RSpec.describe SearchFlip::Criteria do
   end
 
   describe "#failsafe" do
-    [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)
+    it "prevents query syntax exceptions" do
+      expect { ProductIndex.search("syntax/error").records }.to raise_error(SearchFlip::ResponseError)
 
-        query = ProductIndex.failsafe(true)
+      query = ProductIndex.failsafe(true).search("syntax/error")
 
-        expect(query.records).to eq([])
-        expect(query.total_entries).to eq(0)
-      end
+      expect(query.records).to eq([])
+      expect(query.total_entries).to eq(0)
     end
   end
 
@@ -1322,7 +1287,7 @@ RSpec.describe SearchFlip::Criteria do
 
   describe "#track_total_hits" do
     it "is added to the request" do
-      if ProductIndex.connection.distribution || ProductIndex.connection.version.to_i >= 7
+      if ProductIndex.connection.version.to_i >= 7
         query = ProductIndex.track_total_hits(false)
 
         expect(query.request[:track_total_hits]).to eq(false)
@@ -1336,7 +1301,7 @@ RSpec.describe SearchFlip::Criteria do
       ProductIndex.import create(:product)
 
       query = ProductIndex.match_all.explain(true)
-      expect(query.results.first._hit.key?(:_explanation)).to eq(true)
+      expect(query.results.first._hit.key?("_explanation")).to eq(true)
     end
   end
 
@@ -1350,40 +1315,28 @@ RSpec.describe SearchFlip::Criteria do
 
   describe "#preference" do
     it "sets the preference" do
-      url = ProductIndex.connection.distribution.nil? && ProductIndex.connection.version.to_i < 8 ? "products/products" : "products"
-
-      stub_request(:post, "http://127.0.0.1:9200/#{url}/_search?preference=value")
+      stub_request(:post, "http://127.0.0.1:9200/products/products/_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
-      url = ProductIndex.connection.distribution.nil? && ProductIndex.connection.version.to_i < 8 ? "products/products" : "products"
-
-      stub_request(:post, "http://127.0.0.1:9200/#{url}/_search?search_type=value")
+      stub_request(:post, "http://127.0.0.1:9200/products/products/_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
-      url = ProductIndex.connection.distribution.nil? && ProductIndex.connection.version.to_i < 8 ? "products/products" : "products"
-
-      stub_request(:post, "http://127.0.0.1:9200/#{url}/_search?routing=value")
+      stub_request(:post, "http://127.0.0.1:9200/products/products/_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