search_flip 3.2.1 → 4.0.0.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa450fa83c07d1ed7e266ef436c26075a0bd6d8b5fd2904ed98d6b4b3921c6ab
-  data.tar.gz: b7c06e750f4b73d3ad1c8626485526b9389d95591f6c56b954f5f1f6610dec2d
+  metadata.gz: 26839c09be4ddaecd0107d683afc1c16516c0ef562b3e9cb8652b6e0c1818003
+  data.tar.gz: 22e8e36e94439280e8cb0caca5ccd0f3f552ec7518bdffaeb43365e5c8cbbea3
 SHA512:
-  metadata.gz: cd8bbc2c91f7b35f5b3d54d225082b7d2c4a0b932b1323c4de836adfa8d3118e89bc70ac6f41b27c6dec3fdf200eafec10a7b7c145f3a73ccbc2a2f7c6eb8581
-  data.tar.gz: 8c6a974604a63b210d6dd8e585549116266db09321745511ffe78cece7fe84284dd1e035c01be685522f3fd118ac21daa714b2fdcb91f00c08d23dbf93adc692
+  metadata.gz: 001b1042dd9f7f2d103adc48789c658e12c6a5abb4e223c72d0d405a41159d37cbe2d3a2a4c76efe125befed963470c518e806b31223ca468f700f3b06e6674b
+  data.tar.gz: d410d8a68b66496c246dac4b573c463b5fe08c4a998bff84146c6665a622a72ff524384d4ffb80d76ef83464858268816c794ab966ae1bba9ed962dd2ed7a105

data/.github/workflows/test.yml

@@ -28,6 +28,7 @@ jobs:
     - uses: actions/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
+    - run: gem install bundler
     - run: bundle
     - run: sleep 10
     - run: bundle exec rspec

data/.rubocop.yml

@@ -1,16 +1,24 @@
 AllCops:
   NewCops: enable
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.5
+  SuggestExtensions: false
+
+Style/CaseLikeIf:
+  Enabled: false
 
 Layout/EmptyLineBetweenDefs:
   EmptyLineBetweenClassDefs: false
 
-Gemspec/RequiredRubyVersion:
-  Enabled: false
+Lint/EmptyBlock:
+  Exclude:
+    - spec/**/*.rb
 
 Style/ExplicitBlockArgument:
   Enabled: false
 
+Gemspec/RequiredRubyVersion:
+  Enabled: false
+
 Style/HashTransformValues:
   Enabled: false
 

data/CHANGELOG.md

@@ -1,6 +1,16 @@
 
 # CHANGELOG
 
+## v4.0.0
+
+* [BREAKING] For performance reasons, `SearchFlip::Result` now no longer
+  inherits `Hashie::Mash`
+  * It no longer supports symbol based access like `result[:id]`
+  * It no longer supports question mark methods like `result.title?`
+  * It no longer supports method based assignment like `result.some_key = "value"`
+* Added `SearchFlip::Connection#get_cluster_settings` and
+  `#update_cluster_settings`
+
 ## v3.2.1
 
 * Fix `refresh` having a empty body breaking in elasticsearch 7.11

data/README.md

@@ -3,7 +3,7 @@
 
 **Full-Featured Elasticsearch Ruby Client with a Chainable DSL**
 
-[![Build Status](https://secure.travis-ci.org/mrkamel/search_flip.svg?branch=master)](http://travis-ci.org/mrkamel/search_flip)
+[![Build](https://github.com/mrkamel/search_flip/workflows/test/badge.svg)](https://github.com/mrkamel/search_flip/actions?query=workflow%3Atest+branch%3Amaster)
 [![Gem Version](https://badge.fury.io/rb/search_flip.svg)](http://badge.fury.io/rb/search_flip)
 
 Using SearchFlip it is dead-simple to create index classes that correspond to
@@ -51,8 +51,7 @@ CommentIndex.search("hello world").where(available: true).sort(id: "desc").aggre
 
 ```
 
-Finally, SearchFlip comes with a minimal set of dependencies (http-rb, hashie
-and oj only).
+Finally, SearchFlip comes with a minimal set of dependencies (http-rb and oj only).
 
 ## Reference Docs
 
@@ -483,8 +482,8 @@ end
 ```
 
 Generally, aggregation results returned by Elasticsearch are returned as a
-`SearchFlip::Result`, which basically is a `Hashie::Mash`, such that you can
-access them via:
+`SearchFlip::Result`, which basically is a Hash with method-like access, such
+that you can access them via:
 
 ```ruby
 query.aggregations(:username)["mrkamel"].revenue.value
@@ -883,53 +882,6 @@ Thus, if your ORM supports `.find_each`, `#id` and `#where` you are already
 good to go. Otherwise, simply add your custom implementation of those methods
 that work with whatever ORM you use.
 
-## Date and Timestamps in JSON
-
-Elasticsearch requires dates and timestamps to have one of the formats listed
-here: [https://www.elastic.co/guide/en/elasticsearch/reference/current/mapping-date-format.html#strict-date-time](https://www.elastic.co/guide/en/elasticsearch/reference/current/mapping-date-format.html#strict-date-time).
-
-However, `JSON.generate` in ruby by default outputs something like:
-
-```ruby
-JSON.generate(time: Time.now.utc)
-# => "{\"time\":\"2018-02-22 18:19:33 UTC\"}"
-```
-
-This format is not compatible with Elasticsearch by default. If you're on
-Rails, ActiveSupport adds its own `#to_json` methods to `Time`, `Date`, etc.
-However, ActiveSupport checks whether they are used in combination with
-`JSON.generate` or not and adapt:
-
-```ruby
-Time.now.utc.to_json
-=> "\"2018-02-22T18:18:22.088Z\""
-
-JSON.generate(time: Time.now.utc)
-=> "{\"time\":\"2018-02-22 18:18:59 UTC\"}"
-```
-
-SearchFlip is using the [Oj gem](https://github.com/ohler55/oj) to generate
-JSON. More concretely, SearchFlip is using:
-
-```ruby
-Oj.dump({ key: "value" }, mode: :custom, use_to_json: true)
-```
-
-This mitigates the issues if you're on Rails:
-
-```ruby
-Oj.dump(Time.now, mode: :custom, use_to_json: true)
-# => "\"2018-02-22T18:21:21.064Z\""
-```
-
-However, if you're not on Rails, you need to add `#to_json` methods to `Time`,
-`Date` and `DateTime` to get proper serialization. You can either add them on
-your own, via other libraries or by simply using:
-
-```ruby
-require "search_flip/to_json"
-```
-
 ## Feature Support
 
 * for Elasticsearch 2.x, the delete-by-query plugin is required to delete

data/UPDATING.md

@@ -1,6 +1,46 @@
 
 # Updating from previous SearchFlip versions
 
+## Update 3.x to 4.x
+
+**[BREAKING]** For performance reasons, `SearchFlip::Result` no longer
+inherits `Hashie::Mash`
+
+* It no longer supports symbol based access like `result[:id]`
+
+2.x:
+
+```ruby
+CommentIndex.match_all.results.first[:id]
+CommentIndex.aggregate(:tags).aggregations(:tags).values.first[:doc_count]
+```
+
+3.x
+
+```ruby
+CommentIndex.match_all.results.first["id"] # or .id
+CommentIndex.aggregate(:tags).aggregations(:tags).values.first["doc_count"] # or .doc_count
+```
+
+* It no longer supports question mark methods like `result.title?`
+
+2.x:
+
+```ruby
+CommentIndex.match_all.results.first.is_published?
+```
+
+3.x
+
+```ruby
+CommentIndex.match_all.results.first.is_published == true
+```
+
+* It no longer supports method based assignment like `result.some_key = "value"`.
+
+However, this should not have any practical implications, as changing the
+results is not considered to be a common use case.
+
 ## Update 2.x to 3.x
 
 * **[BREAKING]**  No longer pass multiple arguments to `#must`, `#must_not`,

data/lib/search_flip.rb

@@ -1,7 +1,6 @@
 require "ruby2_keywords"
 require "forwardable"
 require "http"
-require "hashie"
 require "thread"
 require "oj"
 require "set"

data/lib/search_flip/bulk.rb

@@ -143,7 +143,7 @@ module SearchFlip
 
       return if options[:raise] == false
 
-      parsed_response = response.parse
+      parsed_response = SearchFlip::JSON.parse(response.to_s)
 
       return unless parsed_response["errors"]
 

data/lib/search_flip/connection.rb

@@ -19,6 +19,35 @@ module SearchFlip
       @version_mutex = Mutex.new
     end
 
+    # Queries the cluster settings from Elasticsearch
+    #
+    # @example
+    #   connection.get_cluster_settings
+    #   # => { "persistent" => { ... }, ... }
+    #
+    # @return [Hash] The cluster settings
+
+    def get_cluster_settings
+      response = http_client.get("#{base_url}/_cluster/settings")
+
+      SearchFlip::JSON.parse(response.to_s)
+    end
+
+    # Updates the cluster settings according to the specified payload
+    #
+    # @example
+    #   connection.update_cluster_settings(persistent: { action: { auto_create_index: false } })
+    #
+    # @param cluster_settings [Hash] The cluster settings
+    #
+    # @return [Boolean] Returns true or raises SearchFlip::ResponseError
+
+    def update_cluster_settings(cluster_settings)
+      http_client.put("#{base_url}/_cluster/settings", json: cluster_settings)
+
+      true
+    end
+
     # Queries and returns the Elasticsearch version used.
     #
     # @example
@@ -28,7 +57,11 @@ module SearchFlip
 
     def version
       @version_mutex.synchronize do
-        @version ||= http_client.headers(accept: "application/json").get("#{base_url}/").parse["version"]["number"]
+        @version ||= begin
+          response = http_client.headers(accept: "application/json").get("#{base_url}/")
+
+          SearchFlip::JSON.parse(response.to_s)["version"]["number"]
+        end
       end
     end
 
@@ -40,7 +73,9 @@ module SearchFlip
     # @return [Hash] The raw response
 
     def cluster_health
-      http_client.headers(accept: "application/json").get("#{base_url}/_cluster/health").parse
+      response = http_client.headers(accept: "application/json").get("#{base_url}/_cluster/health")
+
+      SearchFlip::JSON.parse(response.to_s)
     end
 
     # Uses the Elasticsearch Multi Search API to execute multiple search requests
@@ -71,7 +106,7 @@ module SearchFlip
           .headers(accept: "application/json", content_type: "application/x-ndjson")
           .post("#{base_url}/_msearch", body: payload)
 
-      raw_response.parse["responses"].map.with_index do |response, index|
+      SearchFlip::JSON.parse(raw_response.to_s)["responses"].map.with_index do |response, index|
         SearchFlip::Response.new(criterias[index], response)
       end
     end
@@ -90,10 +125,11 @@ module SearchFlip
     # @return [Hash] The raw response
 
     def update_aliases(payload)
-      http_client
+      response = http_client
         .headers(accept: "application/json", content_type: "application/json")
         .post("#{base_url}/_aliases", body: SearchFlip::JSON.generate(payload))
-        .parse
+
+      SearchFlip::JSON.parse(response.to_s)
     end
 
     # Sends an analyze request to Elasticsearch. Raises
@@ -105,10 +141,11 @@ module SearchFlip
     # @return [Hash] The raw response
 
     def analyze(request, params = {})
-      http_client
+      response = http_client
         .headers(accept: "application/json")
         .post("#{base_url}/_analyze", json: request, params: params)
-        .parse
+
+      SearchFlip::JSON.parse(response.to_s)
     end
 
     # Fetches information about the specified index aliases. Raises
@@ -124,10 +161,11 @@ module SearchFlip
     # @return [Hash] The raw response
 
     def get_aliases(index_name: "*", alias_name: "*")
-      http_client
+      response = http_client
         .headers(accept: "application/json", content_type: "application/json")
         .get("#{base_url}/#{index_name}/_alias/#{alias_name}")
-        .parse
+
+      SearchFlip::JSON.parse(response.to_s)
     end
 
     # Returns whether or not the associated Elasticsearch alias already
@@ -159,10 +197,11 @@ module SearchFlip
     # @return [Array] The raw response
 
     def get_indices(name = "*", params: {})
-      http_client
+      response = http_client
         .headers(accept: "application/json", content_type: "application/json")
         .get("#{base_url}/_cat/indices/#{name}", params: params)
-        .parse
+
+      SearchFlip::JSON.parse(response.to_s)
     end
 
     alias_method :cat_indices, :get_indices
@@ -259,10 +298,11 @@ module SearchFlip
     # @return [Hash] The index settings
 
     def get_index_settings(index_name)
-      http_client
+      response = http_client
         .headers(accept: "application/json")
         .get("#{index_url(index_name)}/_settings")
-        .parse
+
+      SearchFlip::JSON.parse(response.to_s)
     end
 
     # Sends a refresh request to Elasticsearch. Raises
@@ -310,7 +350,9 @@ module SearchFlip
       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 } : {}
 
-      http_client.headers(accept: "application/json").get("#{url}/_mapping", params: params).parse
+      response = http_client.headers(accept: "application/json").get("#{url}/_mapping", params: params)
+
+      SearchFlip::JSON.parse(response.to_s)
     end
 
     # Deletes the specified index from Elasticsearch. Raises

data/lib/search_flip/criteria.rb

@@ -608,7 +608,7 @@ module SearchFlip
           http_request.post("#{target.type_url}/_search", params: request_params, json: request)
         end
 
-      SearchFlip::Response.new(self, http_response.parse)
+      SearchFlip::Response.new(self, SearchFlip::JSON.parse(http_response.to_s))
     rescue SearchFlip::ConnectionError, SearchFlip::ResponseError => e
       raise e unless failsafe_value
 

data/lib/search_flip/index.rb

@@ -455,7 +455,9 @@ module SearchFlip
       # @return [Hash] The specified document
 
       def get(id, params = {})
-        connection.http_client.headers(accept: "application/json").get("#{type_url}/#{id}", params: params).parse
+        response = connection.http_client.headers(accept: "application/json").get("#{type_url}/#{id}", params: params)
+
+        SearchFlip::JSON.parse(response.to_s)
       end
 
       # Retrieves the documents specified by ids from elasticsearch.
@@ -471,7 +473,9 @@ module SearchFlip
       # @return [Hash] The raw response
 
       def mget(request, params = {})
-        connection.http_client.headers(accept: "application/json").post("#{type_url}/_mget", json: request, params: params).parse
+        response = connection.http_client.headers(accept: "application/json").post("#{type_url}/_mget", json: request, params: params)
+
+        SearchFlip::JSON.parse(response.to_s)
       end
 
       # Sends an analyze request to Elasticsearch. Raises
@@ -483,7 +487,9 @@ module SearchFlip
       # @return [Hash] The raw response
 
       def analyze(request, params = {})
-        connection.http_client.headers(accept: "application/json").post("#{index_url}/_analyze", json: request, params: params).parse
+        response = connection.http_client.headers(accept: "application/json").post("#{index_url}/_analyze", json: request, params: params)
+
+        SearchFlip::JSON.parse(response.to_s)
       end
 
       # Sends a index refresh request to Elasticsearch. Raises

data/lib/search_flip/json.rb

@@ -2,7 +2,8 @@ module SearchFlip
   class JSON
     @default_options = {
       mode: :custom,
-      use_to_json: true
+      time_format: :xmlschema,
+      bigdecimal_as_decimal: false
     }
 
     def self.default_options
@@ -12,5 +13,9 @@ module SearchFlip
     def self.generate(obj)
       Oj.dump(obj, default_options)
     end
+
+    def self.parse(json)
+      Oj.load(json, default_options)
+    end
   end
 end

data/lib/search_flip/response.rb

@@ -156,8 +156,7 @@ module SearchFlip
     end
 
     # Returns the results, ie hits, wrapped in a SearchFlip::Result object
-    # which basically is a Hashie::Mash. Check out the Hashie docs for further
-    # details.
+    # which basically is a Hash with method-like access.
     #
     # @example
     #   CommentIndex.search("hello world").results
@@ -166,7 +165,7 @@ module SearchFlip
     # @return [Array] An array of results
 
     def results
-      @results ||= hits["hits"].map { |hit| Result.from_hit(hit) }
+      @results ||= hits["hits"].map { |hit| SearchFlip::Result.from_hit(hit) }
     end
 
     # Returns the named sugggetion, if a name is specified or alle suggestions.
@@ -304,13 +303,13 @@ module SearchFlip
 
       @aggregations[key] =
         if response["aggregations"].nil? || response["aggregations"][key].nil?
-          Result.new
+          SearchFlip::Result.new
         elsif response["aggregations"][key]["buckets"].is_a?(Array)
-          response["aggregations"][key]["buckets"].each_with_object({}) { |bucket, hash| hash[bucket["key"]] = Result.new(bucket) }
+          response["aggregations"][key]["buckets"].each_with_object({}) { |bucket, hash| hash[bucket["key"]] = SearchFlip::Result.convert(bucket) }
         elsif response["aggregations"][key]["buckets"].is_a?(Hash)
-          Result.new response["aggregations"][key]["buckets"]
+          SearchFlip::Result.convert(response["aggregations"][key]["buckets"])
         else
-          Result.new response["aggregations"][key]
+          SearchFlip::Result.convert(response["aggregations"][key])
         end
     end
   end

data/lib/search_flip/result.rb

@@ -1,29 +1,51 @@
 module SearchFlip
-  # The SearchFlip::Result class basically is a hash wrapper that uses
-  # Hashie::Mash to provide convenient method access to the hash attributes.
+  # The SearchFlip::Result class is a simple Hash, but extended with
+  # method-like access. Keys assigned via methods are stored as strings.
+  #
+  # @example method access
+  #   result = SearchFlip::Result.new
+  #   result["some_key"] = "value"
+  #   result.some_key # => "value"
 
-  class Result < Hashie::Mash
-    def self.disable_warnings?(*args)
-      true
-    end
+  class Result < Hash
+    def self.convert(hash)
+      res = self[hash]
 
-    # Creates a SearchFlip::Result object from a raw hit. Useful for e.g.
-    # top hits aggregations.
-    #
-    # @example
-    #   query = ProductIndex.aggregate(top_sales: { top_hits: "..." })
-    #   top_sales_hits = query.aggregations(:top_sales).top_hits.hits.hits
-    #
-    #   SearchFlip::Result.from_hit(top_sales_hits.first)
+      res.each do |key, value|
+        if value.is_a?(Hash)
+          res[key] = convert(value)
+        elsif value.is_a?(Array)
+          res[key] = convert_array(value)
+        end
+      end
 
-    def self.from_hit(hit)
-      raw_result = (hit["_source"] || {}).dup
+      res
+    end
 
-      raw_result["_hit"] = hit.each_with_object({}) do |(key, value), hash|
-        hash[key] = value if key != "_source"
+    def self.convert_array(arr)
+      arr.map do |obj|
+        if obj.is_a?(Hash)
+          convert(obj)
+        elsif obj.is_a?(Array)
+          convert_array(obj)
+        else
+          obj
+        end
       end
+    end
 
-      new(raw_result)
+    def method_missing(name, *args, &block)
+      self[name.to_s]
+    end
+
+    def respond_to_missing?(name, include_private = false)
+      key?(name.to_s) || super
+    end
+
+    def self.from_hit(hit)
+      res = convert(hit["_source"] || {})
+      res["_hit"] = convert(self[hit].tap { |hash| hash.delete("_source") })
+      res
     end
   end
 end

data/lib/search_flip/to_json.rb

@@ -1,29 +1 @@
-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
+warn "[DEPRECATION] Using search_flip/to_json is not neccessary anymore"

data/lib/search_flip/version.rb

@@ -1,3 +1,3 @@
 module SearchFlip
-  VERSION = "3.2.1"
+  VERSION = "4.0.0.beta4"
 end

data/search_flip.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.post_install_message = <<~MESSAGE
     Thanks for using search_flip!
-    When upgrading to 3.x, please check out
+    When upgrading major versions, please check out
     https://github.com/mrkamel/search_flip/blob/master/UPDATING.md
   MESSAGE
 
@@ -35,7 +35,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "timecop"
   spec.add_development_dependency "webmock"
 
-  spec.add_dependency "hashie"
   spec.add_dependency "http"
   spec.add_dependency "oj"
   spec.add_dependency "ruby2_keywords"

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

@@ -19,6 +19,35 @@ RSpec.describe SearchFlip::Connection do
     end
   end
 
+  describe "#get_cluster_settings" do
+    it "returns the cluster settings" do
+      expect(SearchFlip::Connection.new.get_cluster_settings).to be_kind_of(Hash)
+    end
+  end
+
+  describe "#update_cluster_settings" do
+    let(:connection) { SearchFlip::Connection.new }
+
+    after do
+      connection.update_cluster_settings(persistent: { action: { auto_create_index: false } }) if connection.version.to_i > 2
+    end
+
+    it "updates the cluster settings" do
+      if 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 } })
+
+        expect(connection.get_cluster_settings["persistent"]["action"]["auto_create_index"]).to eq("true")
+      end
+    end
+
+    it "returns true" do
+      if connection.version.to_i > 2
+        expect(connection.update_cluster_settings(persistent: { action: { auto_create_index: false } })).to eq(true)
+      end
+    end
+  end
+
   describe "#msearch" do
     it "sends multiple queries and returns all responses" do
       ProductIndex.import create(:product)

data/spec/search_flip/criteria_spec.rb

@@ -1313,7 +1313,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
 

data/spec/search_flip/json_spec.rb

@@ -0,0 +1,45 @@
+require File.expand_path("../spec_helper", __dir__)
+
+RSpec.describe SearchFlip::JSON do
+  describe ".generate" do
+    it "encodes timestamps correctly" do
+      Timecop.freeze "2020-06-01 12:00:00 UTC" do
+        expect(described_class.generate(timestamp: Time.now.utc)).to eq('{"timestamp":"2020-06-01T12:00:00Z"}')
+      end
+    end
+
+    it "encodes bigdecimals as string" do
+      expect(described_class.generate(value: BigDecimal(1))).to eq('{"value":"1.0"}')
+    end
+
+    it "delegates to Oj" do
+      allow(Oj).to receive(:dump)
+
+      payload = { key: "value" }
+
+      described_class.generate(payload)
+
+      expect(Oj).to have_received(:dump).with(payload, mode: :custom, time_format: :xmlschema, bigdecimal_as_decimal: false)
+    end
+
+    it "generates json" do
+      expect(described_class.generate(key: "value")).to eq('{"key":"value"}')
+    end
+  end
+
+  describe ".parse" do
+    it "returns the parsed json payload" do
+      expect(described_class.parse('{"key":"value"}')).to eq("key" => "value")
+    end
+
+    it "delegates to Oj" do
+      allow(Oj).to receive(:load)
+
+      payload = '{"key":"value"}'
+
+      described_class.parse(payload)
+
+      expect(Oj).to have_received(:load).with(payload, mode: :custom, time_format: :xmlschema, bigdecimal_as_decimal: false)
+    end
+  end
+end

data/spec/search_flip/result_spec.rb

@@ -1,6 +1,29 @@
 require File.expand_path("../spec_helper", __dir__)
 
 RSpec.describe SearchFlip::Result do
+  describe ".convert" do
+    it "deeply converts hashes and arrays" do
+      result = described_class.convert("parent" => { "child" => [{ "key1" => "value" }, { "key2" => 3 }] })
+
+      expect(result.parent.child[0].key1).to eq("value")
+      expect(result.parent.child[1].key2).to eq(3)
+    end
+  end
+
+  describe "#method_missing" do
+    it "returns the value of the key equal to the message name" do
+      expect(described_class.convert("some_key" => "value").some_key).to eq("value")
+      expect(described_class.new.some_key).to be_nil
+    end
+  end
+
+  describe "#responds_to_missing?" do
+    it "returns true/false if the key equal to the message name is present or not" do
+      expect(described_class.convert("some_key" => nil).respond_to?(:some_key)).to eq(true)
+      expect(described_class.convert("some_key" => nil).respond_to?(:other_key)).to eq(false)
+    end
+  end
+
   describe ".from_hit" do
     it "adds a _hit key into _source and merges the hit keys into it" do
       result = SearchFlip::Result.from_hit("_score" => 1.0, "_source" => { "name" => "Some name" })
@@ -8,12 +31,6 @@ RSpec.describe SearchFlip::Result do
       expect(result).to eq("name" => "Some name", "_hit" => { "_score" => 1.0 })
     end
 
-    it "allows deep method access" do
-      result = SearchFlip::Result.from_hit("_source" => { "key1" => [{ "key2" => "value" }] })
-
-      expect(result.key1[0].key2).to eq("value")
-    end
-
     it "works with the _source being disabled" do
       result = SearchFlip::Result.from_hit("_id" => 1)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: search_flip
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 4.0.0.beta4
 platform: ruby
 authors:
 - Benjamin Vetter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-13 00:00:00.000000000 Z
+date: 2021-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -150,20 +150,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: hashie
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  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
@@ -259,11 +245,11 @@ files:
 - spec/search_flip/criteria_spec.rb
 - spec/search_flip/http_client_spec.rb
 - spec/search_flip/index_spec.rb
+- spec/search_flip/json_spec.rb
 - spec/search_flip/model_spec.rb
 - spec/search_flip/null_instrumenter_spec.rb
 - spec/search_flip/response_spec.rb
 - spec/search_flip/result_spec.rb
-- spec/search_flip/to_json_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/mrkamel/search_flip
 licenses:
@@ -271,7 +257,7 @@ licenses:
 metadata: {}
 post_install_message: |
   Thanks for using search_flip!
-  When upgrading to 3.x, please check out
+  When upgrading major versions, please check out
   https://github.com/mrkamel/search_flip/blob/master/UPDATING.md
 rdoc_options: []
 require_paths:
@@ -283,9 +269,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.2.3
 signing_key: 
@@ -300,9 +286,9 @@ test_files:
 - spec/search_flip/criteria_spec.rb
 - spec/search_flip/http_client_spec.rb
 - spec/search_flip/index_spec.rb
+- spec/search_flip/json_spec.rb
 - spec/search_flip/model_spec.rb
 - spec/search_flip/null_instrumenter_spec.rb
 - spec/search_flip/response_spec.rb
 - spec/search_flip/result_spec.rb
-- spec/search_flip/to_json_spec.rb
 - spec/spec_helper.rb

data/spec/search_flip/to_json_spec.rb

@@ -1,28 +0,0 @@
-require File.expand_path("../spec_helper", __dir__)
-require "search_flip/to_json"
-
-RSpec.describe "to_json" do
-  it "uses the correct format for Time" do
-    Timecop.freeze Time.parse("2018-01-01 12:00:00 UTC") do
-      expect(Time.now.utc.to_json).to eq("\"2018-01-01T12:00:00.000000Z\"")
-    end
-  end
-
-  it "uses the correct format for Date" do
-    Timecop.freeze Time.parse("2018-01-01 12:00:00 UTC") do
-      expect(Date.today.to_json).to eq("\"2018-01-01\"")
-    end
-  end
-
-  it "uses the correct format for DateTime" do
-    Timecop.freeze Time.parse("2018-01-01 12:00:00 UTC") do
-      expect(Time.now.utc.to_json).to eq("\"2018-01-01T12:00:00.000000Z\"")
-    end
-  end
-
-  it "uses the correct format for TimeWithZone" do
-    Timecop.freeze Time.parse("2018-01-01 12:00:00 UTC") do
-      expect(Time.find_zone("UTC").now.to_json).to eq("\"2018-01-01T12:00:00.000000Z\"")
-    end
-  end
-end