search_flip 4.0.0.beta11 → 4.0.0.beta14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e032e109a7c31df14182c17d874f793327081c3c4e5b866dbfb261e8aa4e503
-  data.tar.gz: 73a2ce2eb918e9f3da28f3bf129eb614c1da5492d138985732af4b41a9f15a41
+  metadata.gz: a711d443c26f483da4898b2b7e69d1ca7c2dfd1280cd4d0a7d8ae6affbcdbc0d
+  data.tar.gz: a5721bc56cc311ce664f49d89229b79fdfe525357c33b6ff9b46e5c7bc6e634f
 SHA512:
-  metadata.gz: 152130c3a91ae69dcf53ff43534b0b853786900f1c03847ffead4d52254f95aec5dbfb48362d6386a61fdb92f128b68fc22b2b66f4df27f2a099a9d6db356eea
-  data.tar.gz: '09f13f81114378ebd9dea98ae713f5be8a27dea15966bf2fc05195900be8ed74c73d6aa46d6a458a4d4aaeb8467e32cc4296fce4e22dbfee672a1dc30d4af14f'
+  metadata.gz: 43c8b33aaa23e84e65b93a624806664c7f7ea779e582ba010b21319ea8b597c4b53633edf9f6746762b2dce844a0ad0764fc1c2209fdee2ab19aea60a7dbbad4
+  data.tar.gz: 22c06e14023d4bd43475f3573b1e387bb855e43fdb0babc9b366e0f7388ecde08eaee53598d0dda148ecf1f62afb5ed0b328f91742471e7bd8f3e5c7349df146

data/.github/workflows/test.yml

@@ -7,30 +7,54 @@ jobs:
       fail-fast: false
       matrix:
         elasticsearch:
-        - plainpicture/elasticsearch:2.4.1_delete-by-query
-        - elasticsearch:5.4
-        - 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
+        - image: plainpicture/elasticsearch:2.4.1_delete-by-query
+          env:
+            discovery.type: single-node
+            xpack.security.enabled: false
+        - image: elasticsearch:5.4
+          env:
+            discovery.type: single-node
+            xpack.security.enabled: false
+        - image: docker.elastic.co/elasticsearch/elasticsearch:6.7.0
+          env:
+            discovery.type: single-node
+            xpack.security.enabled: false
+        - image: docker.elastic.co/elasticsearch/elasticsearch:7.0.0
+          env:
+            discovery.type: single-node
+            xpack.security.enabled: false
+        - image: docker.elastic.co/elasticsearch/elasticsearch:7.11.2
+          env:
+            discovery.type: single-node
+            xpack.security.enabled: false
+        - image: docker.elastic.co/elasticsearch/elasticsearch:8.1.1
+          env:
+            discovery.type: single-node
+            xpack.security.enabled: false
+        - image: opensearchproject/opensearch:1.3.14
+          env:
+            discovery.type: single-node
+            plugins.security.disabled: true
+        - image: opensearchproject/opensearch:2.11.1
+          env:
+            discovery.type: single-node
+            plugins.security.disabled: true
         ruby:
-        - 2.6
         - 2.7
         - 3.0
+        - 3.1
+        - 3.2
     services:
       elasticsearch:
-        image: ${{ matrix.elasticsearch }}
-        env:
-          discovery.type: single-node
-          xpack.security.enabled: false
+        image: ${{ matrix.elasticsearch.image }}
+        env: ${{ matrix.elasticsearch.env }}
         ports:
           - 9200:9200
     steps:
     - uses: actions/checkout@v1
-    - uses: actions/setup-ruby@v1
+    - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
-    - run: gem install bundler
     - run: bundle
     - run: bundle exec rspec
     - run: bundle exec rubocop

data/CHANGELOG.md

@@ -11,6 +11,18 @@
 * Added `SearchFlip::Connection#get_cluster_settings` and
   `#update_cluster_settings`
 
+## v3.8.0.
+
+* Support Opensearch 1.x and 2.x
+
+## v3.7.2
+
+* Fix wrong AWS signatures by generating the json before passing it to http-rb
+
+## v3.7.1
+
+* Fix thread-safety issue of http-rb
+
 ## v3.7.0
 
 * Add `SearchFlip::Connection#bulk` to allow more clean bulk indexing to

data/Gemfile

@@ -2,4 +2,18 @@ source "https://rubygems.org"
 
 gemspec
 
-gem "activerecord", "< 5" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2.2")
+if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2.2")
+  gem "activerecord", ">= 3.0", "< 5"
+else
+  gem "activerecord", ">= 3.0"
+end
+
+gem "aws-sdk-core"
+gem "bundler"
+gem "factory_bot"
+gem "rake"
+gem "rspec"
+gem "rubocop"
+gem "sqlite3"
+gem "timecop"
+gem "webmock"

data/README.md

@@ -9,8 +9,9 @@
 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 and 8.x. Check section
-[Feature Support](#feature-support) for version dependent features.
+SearchFlip supports Elasticsearch 2.x, 5.x, 6.x, 7.x and 8.x as well as
+Opensearch 1.x and 2.x. Check section [Feature Support](#feature-support) for
+version dependent features.
 
 ```ruby
 CommentIndex.search("hello world", default_field: "title").where(visible: true).aggregate(:user_id).sort(id: "desc")
@@ -852,7 +853,7 @@ performance tracing, etc.
 To use instrumentation, configure the instrumenter:
 
 ```ruby
-SearchFlip::Config[:instrumenter] = ActiveSupport::Notifications.notifier
+SearchFlip::Config[:instrumenter] = ActiveSupport::Notifications
 ```
 
 Subsequently, you can subscribe to notifcations for `request.search_flip`:
@@ -970,7 +971,6 @@ SearchFlip is using Semantic Versioning: [SemVer](http://semver.org/)
 
 * Elasticsearch: [https://www.elastic.co/](https://www.elastic.co/)
 * Reference Docs: [http://www.rubydoc.info/github/mrkamel/search_flip](http://www.rubydoc.info/github/mrkamel/search_flip)
-* Travis: [http://travis-ci.org/mrkamel/search_flip](http://travis-ci.org/mrkamel/search_flip)
 * will_paginate: [https://github.com/mislav/will_paginate](https://github.com/mislav/will_paginate)
 * kaminari: [https://github.com/kaminari/kaminari](https://github.com/kaminari/kaminari)
 * Oj: [https://github.com/ohler55/oj](https://github.com/ohler55/oj)

data/UPDATING.md

@@ -8,14 +8,14 @@ inherits `Hashie::Mash`
 
 * It no longer supports symbol based access like `result[:id]`
 
-2.x:
+3.x:
 
 ```ruby
 CommentIndex.match_all.results.first[:id]
 CommentIndex.aggregate(:tags).aggregations(:tags).values.first[:doc_count]
 ```
 
-3.x
+4.x
 
 ```ruby
 CommentIndex.match_all.results.first["id"] # or .id
@@ -24,16 +24,20 @@ CommentIndex.aggregate(:tags).aggregations(:tags).values.first["doc_count"] # or
 
 * It no longer supports question mark methods like `result.title?`
 
-2.x:
+3.x:
 
 ```ruby
 CommentIndex.match_all.results.first.is_published?
 ```
 
-3.x
+4.x
 
 ```ruby
 CommentIndex.match_all.results.first.is_published == true
+
+# or
+
+!! CommentIndex.match_all.results.first.is_published
 ```
 
 * It no longer supports method based assignment like `result.some_key = "value"`.

data/lib/search_flip/aggregation.rb

@@ -30,7 +30,7 @@ module SearchFlip
       res[:aggregations] = aggregation_values if aggregation_values
 
       if must_values || must_not_values || filter_values
-        if target.connection.version.to_i >= 2
+        if target.connection.distribution || target.connection.version.to_i >= 2
           res[:filter] = {
             bool: {}
               .merge(must_values ? { must: must_values } : {})

data/lib/search_flip/aws_sigv4_plugin.rb

@@ -37,7 +37,6 @@ module SearchFlip
       }
 
       signature_request[:body] = options[:body] if options.key?(:body)
-      signature_request[:body] = options[:json].respond_to?(:to_str) ? options[:json] : JSON.generate(options[:json]) if options[:json]
 
       signature = signer.sign_request(signature_request)
 

data/lib/search_flip/bulk.rb

@@ -148,7 +148,7 @@ module SearchFlip
       return unless parsed_response["errors"]
 
       parsed_response["items"].each do |item|
-        item.each do |_, element|
+        item.each_value do |element|
           status = element["status"]
 
           next if status.between?(200, 299)

data/lib/search_flip/connection.rb

@@ -16,7 +16,17 @@ module SearchFlip
       @base_url = options[:base_url] || SearchFlip::Config[:base_url]
       @http_client = options[:http_client] || SearchFlip::HTTPClient.new
       @bulk_limit = options[:bulk_limit] || SearchFlip::Config[:bulk_limit]
-      @version_mutex = Mutex.new
+    end
+
+    # Queries and returns the Elasticsearch distribution used.
+    #
+    # @example
+    #   connection.distribution # => e.g. "opensearch"
+    #
+    # @return [String] The Elasticsearch distribution
+
+    def distribution
+      @distribution ||= SearchFlip::JSON.parse(version_response.to_s)["version"]["distribution"]
     end
 
     # Queries the cluster settings from Elasticsearch
@@ -51,18 +61,12 @@ module SearchFlip
     # Queries and returns the Elasticsearch version used.
     #
     # @example
-    #   connection.version # => e.g. 2.4.1
+    #   connection.version # => e.g. "2.4.1"
     #
     # @return [String] The Elasticsearch version
 
     def version
-      @version_mutex.synchronize do
-        @version ||= begin
-          response = http_client.headers(accept: "application/json").get("#{base_url}/")
-
-          SearchFlip::JSON.parse(response.to_s)["version"]["number"]
-        end
-      end
+      @version ||= SearchFlip::JSON.parse(version_response.to_s)["version"]["number"]
     end
 
     # Queries and returns the Elasticsearch cluster health.
@@ -93,7 +97,7 @@ module SearchFlip
     def msearch(criterias)
       payload = criterias.flat_map do |criteria|
         [
-          SearchFlip::JSON.generate(index: criteria.target.index_name_with_prefix, **(version.to_i < 8 ? { type: criteria.target.type_name } : {})),
+          SearchFlip::JSON.generate(index: criteria.target.index_name_with_prefix, **(distribution.nil? && version.to_i < 8 ? { type: criteria.target.type_name } : {})),
           SearchFlip::JSON.generate(criteria.request)
         ]
       end
@@ -329,8 +333,8 @@ module SearchFlip
     # @return [Boolean] Returns true or raises SearchFlip::ResponseError
 
     def update_mapping(index_name, mapping, type_name: nil)
-      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 } : {}
+      url = type_name && distribution.nil? && version.to_i < 8 ? type_url(index_name, type_name) : index_url(index_name)
+      params = type_name && distribution.nil? && version.to_f >= 6.7 && version.to_i < 8 ? { include_type_name: true } : {}
 
       http_client.put("#{url}/_mapping", params: params, json: mapping)
 
@@ -347,8 +351,8 @@ module SearchFlip
     # @return [Hash] The current type mapping
 
     def get_mapping(index_name, type_name: nil)
-      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 } : {}
+      url = type_name && distribution.nil? && version.to_i < 8 ? type_url(index_name, type_name) : index_url(index_name)
+      params = type_name && distribution.nil? && 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)
 
@@ -451,5 +455,11 @@ module SearchFlip
     def index_url(index_name)
       "#{base_url}/#{index_name}"
     end
+
+    private
+
+    def version_response
+      @version_response ||= http_client.headers(accept: "application/json").get("#{base_url}/")
+    end
   end
 end

data/lib/search_flip/criteria.rb

@@ -350,8 +350,8 @@ module SearchFlip
       http_request = connection.http_client
       http_request = http_request.timeout(http_timeout_value) if http_timeout_value
 
-      if connection.version.to_i >= 5
-        url = connection.version.to_i < 8 ? target.type_url : target.index_url
+      if connection.distribution || connection.version.to_i >= 5
+        url = connection.distribution.nil? && 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
@@ -622,7 +622,7 @@ 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
+          url = connection.distribution.nil? && connection.version.to_i < 8 ? target.type_url : target.index_url
 
           http_request.post(
             "#{url}/_search",
@@ -630,7 +630,7 @@ module SearchFlip
             json: request
           )
         else
-          url = connection.version.to_i < 8 ? target.type_url : target.index_url
+          url = connection.distribution.nil? && connection.version.to_i < 8 ? target.type_url : target.index_url
 
           http_request.post("#{url}/_search", params: request_params, json: request)
         end

data/lib/search_flip/http_client.rb

@@ -58,8 +58,22 @@ module SearchFlip
     private
 
     def execute(method, uri, options = {})
-      final_request = plugins.inject(self) { |res, cur| cur.call(res, method, uri, options) }
-      response = final_request.request.send(method, uri, options)
+      opts = options.dup
+      final_request = self
+
+      if opts[:json]
+        # Manually generate and pass the json body to http-rb to guarantee that
+        # we have the same json which is used for aws signatures and to
+        # guarantee that json is always generated as stated in the config
+
+        opts[:body] = JSON.generate(opts.delete(:json))
+        final_request = final_request.headers(content_type: "application/json")
+      end
+
+      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)
 
       raise SearchFlip::ResponseError.new(code: response.code, body: response.body.to_s) unless response.status.success?
 

data/lib/search_flip/index.rb

@@ -438,7 +438,7 @@ module SearchFlip
       # equal to _doc.
 
       def include_type_name?
-        type_name != "_doc" || connection.version.to_i < 7
+        type_name != "_doc" || (connection.distribution.nil? && connection.version.to_i < 7)
       end
 
       # Retrieves the document specified by id from Elasticsearch. Raises
@@ -455,7 +455,7 @@ module SearchFlip
       # @return [Hash] The specified document
 
       def get(id, params = {})
-        url = connection.version.to_i < 8 ? type_url : "#{index_url}/_doc"
+        url = connection.distribution.nil? && 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)
@@ -474,7 +474,7 @@ module SearchFlip
       # @return [Hash] The raw response
 
       def mget(request, params = {})
-        url = connection.version.to_i < 8 ? type_url : index_url
+        url = connection.distribution.nil? && 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)
@@ -633,7 +633,7 @@ module SearchFlip
           bulk_max_mb: connection.bulk_max_mb
         }
 
-        url = connection.version.to_i < 8 ? type_url : index_url
+        url = connection.distribution.nil? && connection.version.to_i < 8 ? type_url : index_url
 
         SearchFlip::Bulk.new("#{url}/_bulk", default_options.merge(options)) do |indexer|
           yield indexer

data/lib/search_flip/response.rb

@@ -223,7 +223,7 @@ module SearchFlip
 
     def records
       @records ||= begin
-        sort_map = ids.each_with_index.each_with_object({}) { |(id, index), hash| hash[id.to_s] = index }
+        sort_map = ids.each_with_index.with_object({}) { |(id, index), hash| hash[id.to_s] = index }
 
         scope.to_a.sort_by { |record| sort_map[criteria.target.record_id(record).to_s] }
       end

data/lib/search_flip/version.rb

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

data/search_flip.gemspec

@@ -13,6 +13,10 @@ 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.require_paths = ["lib"]
@@ -23,17 +27,6 @@ Gem::Specification.new do |spec|
     https://github.com/mrkamel/search_flip/blob/master/UPDATING.md
   MESSAGE
 
-  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"

data/spec/search_flip/aws_sigv4_plugin_spec.rb

@@ -29,15 +29,17 @@ 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: JSON.generate(key: "value")
+        body: body
       }
 
       expect(plugin.signer).to receive(:sign_request).with(signing_request).and_call_original
 
-      plugin.call(client, :get, "http://localhost/index", params: { param: "value" }, json: { key: "value" })
+      plugin.call(client, :get, "http://localhost/index", params: { param: "value" }, body: body)
     end
   end
 end

data/spec/search_flip/bulk_spec.rb

@@ -60,7 +60,7 @@ 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
+      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: "{}")
 

data/spec/search_flip/connection_spec.rb

@@ -1,6 +1,12 @@
 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
+  end
+
   describe "#version" do
     it "returns the version" do
       expect(SearchFlip::Connection.new.version).to match(/\A[0-9.]+\z/)
@@ -29,11 +35,11 @@ RSpec.describe SearchFlip::Connection do
     let(:connection) { SearchFlip::Connection.new }
 
     after do
-      connection.update_cluster_settings(persistent: { action: { auto_create_index: false } }) if connection.version.to_i > 2
+      connection.update_cluster_settings(persistent: { action: { auto_create_index: false } }) if connection.distribution || connection.version.to_i > 2
     end
 
     it "updates the cluster settings" do
-      if connection.version.to_i > 2
+      if connection.distribution || connection.version.to_i > 2
         connection.update_cluster_settings(persistent: { action: { auto_create_index: false } })
         connection.update_cluster_settings(persistent: { action: { auto_create_index: true } })
 
@@ -42,7 +48,7 @@ RSpec.describe SearchFlip::Connection do
     end
 
     it "returns true" do
-      if connection.version.to_i > 2
+      if connection.distribution || connection.version.to_i > 2
         expect(connection.update_cluster_settings(persistent: { action: { auto_create_index: false } })).to eq(true)
       end
     end
@@ -121,7 +127,7 @@ RSpec.describe SearchFlip::Connection do
     it "returns the specified indices" do
       connection = SearchFlip::Connection.new
 
-      expect(connection.get_indices.map { |index| index["index"] }.to_set).to eq(["comments", "products"].to_set)
+      expect(connection.get_indices.map { |index| index["index"] }.grep_v(/^\./).to_set).to eq(["comments", "products"].to_set)
       expect(connection.get_indices("com*").map { |index| index["index"] }).to eq(["comments"])
     end
 
@@ -199,7 +205,7 @@ RSpec.describe SearchFlip::Connection do
     it "freezes the specified index" do
       connection = SearchFlip::Connection.new
 
-      if connection.version.to_f >= 6.6 && connection.version.to_i < 8
+      if connection.distribution.nil? && connection.version.to_f >= 6.6 && connection.version.to_i < 8
         begin
           connection.create_index("index_name")
           connection.freeze_index("index_name")
@@ -216,7 +222,7 @@ RSpec.describe SearchFlip::Connection do
     it "unfreezes the specified index" do
       connection = SearchFlip::Connection.new
 
-      if connection.version.to_f >= 6.6 && connection.version.to_i < 8
+      if connection.distribution.nil? && connection.version.to_f >= 6.6 && connection.version.to_i < 8
         begin
           connection.create_index("index_name")
           connection.freeze_index("index_name")
@@ -270,7 +276,7 @@ RSpec.describe SearchFlip::Connection do
   end
 
   describe "#update_mapping" do
-    if SearchFlip::Connection.new.version.to_i >= 7
+    if SearchFlip::Connection.new.then { |connection| connection.distribution || connection.version.to_i >= 7 }
       it "updates the mapping of an index without type name" do
         begin
           connection = SearchFlip::Connection.new
@@ -295,7 +301,7 @@ RSpec.describe SearchFlip::Connection do
 
         connection.create_index("index_name")
 
-        if connection.version.to_i < 8
+        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 } })
@@ -350,9 +356,9 @@ RSpec.describe SearchFlip::Connection do
 
       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 } : {}
+          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
 
@@ -375,14 +381,14 @@ RSpec.describe SearchFlip::Connection 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 } : {}
+        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.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 } : {}
+          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
 
@@ -390,8 +396,8 @@ RSpec.describe SearchFlip::Connection do
 
       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 } : {}
+          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
 
@@ -404,7 +410,7 @@ RSpec.describe SearchFlip::Connection 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 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(
@@ -427,7 +433,7 @@ RSpec.describe SearchFlip::Connection do
       }
 
       connection.bulk(options) do |indexer|
-        indexer.index 1, { id: 1 }, _index: ProductIndex.index_name, ** connection.version.to_i < 8 ? { _type: ProductIndex.type_name } : {}
+        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)

data/spec/search_flip/criteria_spec.rb

@@ -435,7 +435,7 @@ RSpec.describe SearchFlip::Criteria do
 
   describe "#match_none" do
     it "does not match any documents" do
-      if ProductIndex.connection.version.to_i >= 5
+      if ProductIndex.connection.distribution || ProductIndex.connection.version.to_i >= 5
         ProductIndex.import create(:product)
 
         query = ProductIndex.match_none
@@ -479,7 +479,7 @@ RSpec.describe SearchFlip::Criteria do
 
   describe "#post_search" do
     it "sets up the constraints correctly and is chainable" do
-      if ProductIndex.connection.version.to_i >= 2
+      if ProductIndex.connection.distribution || 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 +886,7 @@ RSpec.describe SearchFlip::Criteria do
 
   describe "#profile" do
     it "sets up the constraints correctly" do
-      if ProductIndex.connection.version.to_i >= 2
+      if ProductIndex.connection.distribution || ProductIndex.connection.version.to_i >= 2
         expect(ProductIndex.profile(true).raw_response["profile"]).not_to be_nil
       end
     end
@@ -1322,7 +1322,7 @@ RSpec.describe SearchFlip::Criteria do
 
   describe "#track_total_hits" do
     it "is added to the request" do
-      if ProductIndex.connection.version.to_i >= 7
+      if ProductIndex.connection.distribution || ProductIndex.connection.version.to_i >= 7
         query = ProductIndex.track_total_hits(false)
 
         expect(query.request[:track_total_hits]).to eq(false)
@@ -1350,7 +1350,7 @@ RSpec.describe SearchFlip::Criteria do
 
   describe "#preference" do
     it "sets the preference" do
-      url = ProductIndex.connection.version.to_i < 8 ? "products/products" : "products"
+      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")
         .to_return(status: 200, headers: { content_type: "application/json" }, body: "{}")
@@ -1363,7 +1363,7 @@ RSpec.describe SearchFlip::Criteria do
 
   describe "#search_type" do
     it "sets the search_type" do
-      url = ProductIndex.connection.version.to_i < 8 ? "products/products" : "products"
+      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")
         .to_return(status: 200, headers: { content_type: "application/json" }, body: "{}")
@@ -1376,7 +1376,7 @@ RSpec.describe SearchFlip::Criteria do
 
   describe "#routing" do
     it "sets the search_type" do
-      url = ProductIndex.connection.version.to_i < 8 ? "products/products" : "products"
+      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")
         .to_return(status: 200, headers: { content_type: "application/json" }, body: "{}")

data/spec/search_flip/http_client_spec.rb

@@ -36,6 +36,12 @@ RSpec.describe SearchFlip::HTTPClient do
 
         expect(SearchFlip::HTTPClient.new.send(method, "http://localhost/path", body: "body", params: { key: "value" }).body.to_s).to eq("success")
       end
+
+      it "generates json, passes it as body and sets the content type when the json option is used" do
+        stub_request(method, "http://localhost/path").with(body: '{"key":"value"}', headers: { "Content-Type" => "application/json" }).to_return(body: "success")
+
+        expect(SearchFlip::HTTPClient.new.send(method, "http://localhost/path", json: { "key" => "value" }).body.to_s).to eq("success")
+      end
     end
   end
 

data/spec/search_flip/index_spec.rb

@@ -77,7 +77,7 @@ RSpec.describe SearchFlip::Index do
         include SearchFlip::Index
       end
 
-      expect(klass.include_type_name?).to eq(klass.connection.version.to_i < 7)
+      expect(klass.include_type_name?).to eq(klass.connection.distribution.nil? && klass.connection.version.to_i < 7)
     end
 
     it "returns true if the type name is not equal to _doc" do
@@ -185,7 +185,7 @@ RSpec.describe SearchFlip::Index do
   end
 
   describe ".update_mapping" do
-    if TestIndex.connection.version.to_i >= 7
+    if TestIndex.connection.distribution || TestIndex.connection.version.to_i >= 7
       context "without type name" do
         it "delegates to connection" do
           TestIndex.create_index
@@ -215,7 +215,7 @@ RSpec.describe SearchFlip::Index do
 
         TestIndex.update_mapping
 
-        if TestIndex.connection.version.to_i < 8
+        if TestIndex.connection.distribution.nil? && 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)
@@ -245,7 +245,7 @@ RSpec.describe SearchFlip::Index do
   end
 
   describe ".get_mapping" do
-    if TestIndex.connection.version.to_i >= 7
+    if TestIndex.connection.distribution || TestIndex.connection.version.to_i >= 7
       context "without type name" do
         it "delegates to connection" do
           allow(TestIndex).to receive(:include_type_name?).and_return(false)
@@ -272,7 +272,7 @@ RSpec.describe SearchFlip::Index do
 
         TestIndex.get_mapping
 
-        if TestIndex.connection.version.to_i < 8
+        if TestIndex.connection.distribution.nil? && 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")
@@ -340,7 +340,7 @@ RSpec.describe SearchFlip::Index do
 
       TestIndex.type_url
 
-      expect(TestIndex.connection).to have_received(:type_url).with("test", TestIndex.connection.version.to_i < 8 ? "test" : "_doc")
+      expect(TestIndex.connection).to have_received(:type_url).with("test", TestIndex.connection.distribution.nil? && TestIndex.connection.version.to_i < 8 ? "test" : "_doc")
     end
   end
 
@@ -433,7 +433,7 @@ RSpec.describe SearchFlip::Index do
 
       products = create_list(:product, 2)
 
-      if ProductIndex.connection.version.to_i >= 5
+      if ProductIndex.connection.distribution || ProductIndex.connection.version.to_i >= 5
         expect { ProductIndex.create products, {}, routing: "r1" }.to(change { ProductIndex.total_count }.by(2))
 
         expect(ProductIndex.get(products.first.id, routing: "r1")["_routing"]).to eq("r1")
@@ -447,7 +447,7 @@ RSpec.describe SearchFlip::Index do
     it "allows respects class options" do
       products = create_list(:product, 2)
 
-      if ProductIndex.connection.version.to_i >= 5
+      if ProductIndex.connection.distribution || ProductIndex.connection.version.to_i >= 5
         allow(ProductIndex).to receive(:index_options).and_return(routing: "r1")
 
         expect { ProductIndex.create products }.to(change { ProductIndex.total_count }.by(2))

data/spec/search_flip/response_spec.rb

@@ -82,7 +82,7 @@ RSpec.describe SearchFlip::Response do
 
       ProductIndex.import products
 
-      expect(ProductIndex.match_all.results.map(&:id).to_set).to eq(products.map(&:id).to_set)
+      expect(ProductIndex.match_all.results.to_set(&:id)).to eq(products.to_set(&:id))
     end
   end
 
@@ -126,7 +126,7 @@ RSpec.describe SearchFlip::Response do
 
       response = ProductIndex.match_all.response
 
-      expect(response.ids.to_set).to eq(products.map(&:id).map(&:to_s).to_set)
+      expect(response.ids.to_set).to eq(products.map(&:id).to_set(&:to_s))
       expect(response.ids).to eq(response.raw_response["hits"]["hits"].map { |hit| hit["_id"] })
     end
   end

data/spec/spec_helper.rb

@@ -86,7 +86,7 @@ class CommentIndex
   include SearchFlip::Index
 
   def self.type_name
-    connection.version.to_i < 8 ? "comments" : "_doc"
+    connection.distribution.nil? && connection.version.to_i < 8 ? "comments" : "_doc"
   end
 
   def self.index_name
@@ -113,7 +113,7 @@ class ProductIndex
   include SearchFlip::Index
 
   def self.mapping
-    if ProductIndex.connection.version.to_i >= 5
+    if ProductIndex.connection.distribution || ProductIndex.connection.version.to_i >= 5
       {
         properties: {
           category: {
@@ -136,7 +136,7 @@ class ProductIndex
   end
 
   def self.type_name
-    connection.version.to_i < 8 ? "products" : "_doc"
+    connection.distribution.nil? && connection.version.to_i < 8 ? "products" : "_doc"
   end
 
   def self.index_name
@@ -177,7 +177,7 @@ class TestIndex
   end
 
   def self.type_name
-    connection.version.to_i < 8 ? "test" : "_doc"
+    connection.distribution.nil? && connection.version.to_i < 8 ? "test" : "_doc"
   end
 
   def self.index_name

metadata

@@ -1,155 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: search_flip
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta11
+  version: 4.0.0.beta14
 platform: ruby
 authors:
 - Benjamin Vetter
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-27 00:00:00.000000000 Z
+date: 2024-01-19 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: aws-sdk-core
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: factory_bot
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: timecop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: http
   requirement: !ruby/object:Gem::Requirement
@@ -268,7 +128,10 @@ files:
 homepage: https://github.com/mrkamel/search_flip
 licenses:
 - MIT
-metadata: {}
+metadata:
+  homepage_uri: https://github.com/mrkamel/search_flip
+  source_code_uri: https://github.com/mrkamel/search_flip
+  changelog_uri: https://github.com/mrkamel/search_flip/blob/master/CHANGELOG.md
 post_install_message: |
   Thanks for using search_flip!
   When upgrading major versions, please check out