search_flip 3.5.0 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b534f2309a3433637b7e8c661d098bcbb04aa6c047655ad3c4ab944cbb860bf7
-  data.tar.gz: ec32a8f3ef761bb9d1f4dd99e1e31448b5eceb88a40643c63cada7bc4bedeaa7
+  metadata.gz: a241c0ab86244a53caab6b7d8dbcd8f441d9e7fc40837cc9afa7f57e6c7e5da0
+  data.tar.gz: f42562bd8af88780accd33c91c112c9f81b42de8945aa956c118b7faff75c6f6
 SHA512:
-  metadata.gz: ad28e9a932ad4a572bb401593e1d0c9551d2aeb7e128ffad6d1c237f8e78f7a5385a2e94e4a113ae47bcc4576c07bfc74ab24bcbc2d65e8e7f2751951b5d09da
-  data.tar.gz: 73c88dc39c4709dc716f3a45428771c08ce83ec51b278bcbd1285663e5cdafc2c66181b61ad78ee741feb2963bde607916ddaab8ffe8ec35124e695d37f287b7
+  metadata.gz: ad60516d947d060ca1fe049a80059c18e9deb76f7c380b0279cd11cd5b5e0fb811d3a46a12220fd731b793ce1a6728f23e6cb242410f584d040e874a2bed7d78
+  data.tar.gz: 415962179b2e3ead79296851746b5f4892bdfbce64d09ae6ef2a2f0df83fa265b1c00a8a549d42013911eaff7ecc0b0460d20ef5c72d096f070d1adce4d0797c

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
+
 Layout/EmptyLineBetweenDefs:
   EmptyLineBetweenClassDefs: false
 

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 
 # CHANGELOG
 
+## v3.6.0
+
+* Support Elasticsearch v8
+
 ## v3.5.0
 
 * Add `SearchFlip::Criteria#http_timeout` to allow specifying timeouts on

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

@@ -351,7 +351,9 @@ module SearchFlip
       http_request = http_request.timeout(http_timeout_value) if http_timeout_value
 
       if connection.version.to_i >= 5
-        http_request.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
         http_request.delete("#{target.type_url}/_query", params: request_params.merge(params), json: dupped_request)
       end
@@ -620,13 +622,17 @@ 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))

data/lib/search_flip/index.rb

@@ -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.5.0"
+  VERSION = "3.6.0"
 end

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

@@ -1350,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

@@ -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.5.0
+  version: 3.6.0
 platform: ruby
 authors:
 - Benjamin Vetter
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-30 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: