search_flip 3.8.0 → 3.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b27a32f7b2d3ccedcdc823cbd8b8682027868e3d74cf1c135404b71dfec5f337
-  data.tar.gz: 00f45e2024a1ef108a3e8132794c036f2514ae015c13a7e7d3266b9580e44a6b
+  metadata.gz: fe72863b41e604e0e1faf6148099a0fd1e8f2619e9224dfc1a77015534574c5a
+  data.tar.gz: c199afecd685aebb5e250be8d0b4760e4b513e7aafc5475d45e471458dad12ae
 SHA512:
-  metadata.gz: 635e6b47c05282a3f55ba35bea4b6a7fa9d4743ca911483c41ce8d994fd5830eea5c80027283f6bcda025722fe46bb42d56ee72e7242d296f569e69b756b44af
-  data.tar.gz: d754585b03d8d2cd996b7c215b6ac939d9a8c6d6fdcdebc8aaf73143ab5f2b7499925120886ef0dbe2d88caf9eb137317426012a283a6e7050fdac2b1b19ac80
+  metadata.gz: ade3326e113e4132f12d35d65b962145b8a3fc8ed9eddd2e6ae99dc235805486e578f665973e6db9e60e402f4a915c7f42785e70790f0e7adefdad62e6881824
+  data.tar.gz: 4660765f5157949a6729a7de370e7816c3400341fb9521cbec0209e091e42ce460670ff3744d3ffb2a7b3650a051caa404e67b8a77dd27da0af1ef7690be2bb2

data/.github/workflows/test.yml

@@ -1,4 +1,4 @@
-on: push
+on: [push, pull_request]
 name: test
 jobs:
   test:
@@ -27,7 +27,7 @@ jobs:
           env:
             discovery.type: single-node
             xpack.security.enabled: false
-        - image: docker.elastic.co/elasticsearch/elasticsearch:8.1.1
+        - image: docker.elastic.co/elasticsearch/elasticsearch:8.11.4
           env:
             discovery.type: single-node
             xpack.security.enabled: false
@@ -39,6 +39,10 @@ jobs:
           env:
             discovery.type: single-node
             plugins.security.disabled: true
+        - image: opensearchproject/opensearch:2.13.0
+          env:
+            discovery.type: single-node
+            DISABLE_SECURITY_PLUGIN: true
         ruby:
         - 2.7
         - 3.0
@@ -50,6 +54,11 @@ jobs:
         env: ${{ matrix.elasticsearch.env }}
         ports:
           - 9200:9200
+        options: >-
+          --health-cmd "curl -sf http://localhost:9200 || exit 1"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 30
     steps:
     - uses: actions/checkout@v1
     - uses: ruby/setup-ruby@v1

data/.rubocop.yml

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

data/CHANGELOG.md

@@ -1,7 +1,24 @@
 
 # CHANGELOG
 
-## v3.8.0.
+## v3.9.1
+
+* Fix compatibility with http.rb version 6
+
+## v3.9.0
+
+* Allow to configure the elasticsearch version no matter which elasticsearch
+  version is actually in use. The version information is needed to support
+  version dependent features. Please note that manually configuring the version
+  is usually not need as the version by default is determined by sending one
+  request to elasticsearch.
+
+```ruby
+SearchFlip::Config[:version] = { number: "8.1.1" }
+SearchFlip::Config[:version] = { number: "2.13", distribution: "opensearch" }
+```
+
+## v3.8.0
 
 * Support Opensearch 1.x and 2.x
 

data/Gemfile

@@ -14,6 +14,6 @@ gem "factory_bot"
 gem "rake"
 gem "rspec"
 gem "rubocop"
-gem "sqlite3"
+gem "sqlite3", ">= 1.4"
 gem "timecop"
 gem "webmock"

data/README.md

@@ -98,6 +98,16 @@ Available config options are:
 * `auto_refresh` tells SearchFlip to automatically refresh an index after
   import, index, delete, etc operations. This is e.g. useful for testing, etc.
   Defaults to false.
+* `version` allows to configure the elasticsearch version no matter which
+  elasticsearch version is actually in use. The version information is needed to
+  support version dependent features. Please note that manually configuring the
+  version is usually not need as the version by default is determined by sending
+  one request to elasticsearch.
+
+```ruby
+SearchFlip::Config[:version] = { number: "8.1.1" }
+SearchFlip::Config[:version] = { number: "2.13", distribution: "opensearch" }
+```
 
 ## Usage
 

data/lib/search_flip/aggregation.rb

@@ -33,9 +33,9 @@ module SearchFlip
         if target.connection.distribution || target.connection.version.to_i >= 2
           res[:filter] = {
             bool: {}
-              .merge(must_values ? { must: must_values } : {})
-              .merge(must_not_values ? { must_not: must_not_values } : {})
-              .merge(filter_values ? { filter: filter_values } : {})
+                .merge(must_values ? { must: must_values } : {})
+                .merge(must_not_values ? { must_not: must_not_values } : {})
+                .merge(filter_values ? { filter: filter_values } : {})
           }
         else
           filters = (filter_values || []) + (must_not_values || []).map { |must_not_value| { not: must_not_value } }

data/lib/search_flip/connection.rb

@@ -26,7 +26,7 @@ module SearchFlip
     # @return [String] The Elasticsearch distribution
 
     def distribution
-      @distribution ||= SearchFlip::JSON.parse(version_response.to_s)["version"]["distribution"]
+      @distribution ||= SearchFlip::Config.dig(:version, :distribution) || SearchFlip::JSON.parse(version_response.to_s)["version"]["distribution"]
     end
 
     # Queries and returns the Elasticsearch version used.
@@ -37,7 +37,7 @@ module SearchFlip
     # @return [String] The Elasticsearch version
 
     def version
-      @version ||= SearchFlip::JSON.parse(version_response.to_s)["version"]["number"]
+      @version ||= SearchFlip::Config.dig(:version, :number) || SearchFlip::JSON.parse(version_response.to_s)["version"]["number"]
     end
 
     # Queries and returns the Elasticsearch cluster health.

data/lib/search_flip/http_client.rb

@@ -73,7 +73,7 @@ module SearchFlip
       final_request = plugins.inject(final_request) { |res, cur| cur.call(res, method, uri, opts) }
       final_request = final_request.headers({}) # Prevent thread-safety issue of http-rb: https://github.com/httprb/http/issues/558
 
-      response = final_request.request.send(method, uri, opts)
+      response = final_request.request.send(method, uri, **opts)
 
       raise SearchFlip::ResponseError.new(code: response.code, body: response.body.to_s) unless response.status.success?
 

data/lib/search_flip/version.rb

@@ -1,3 +1,3 @@
 module SearchFlip
-  VERSION = "3.8.0"
+  VERSION = "3.9.1"
 end

data/spec/search_flip/connection_spec.rb

@@ -5,12 +5,28 @@ RSpec.describe SearchFlip::Connection 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: search_flip
 version: !ruby/object:Gem::Version
-  version: 3.8.0
+  version: 3.9.1
 platform: ruby
 authors:
 - Benjamin Vetter
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-19 00:00:00.000000000 Z
+date: 2026-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie