search_flip 3.4.0 → 4.0.0.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6722b210d8b3d0baa98e3370f26e2f293a21ea7db15dd08ba47deb2a1dba4e1c
-  data.tar.gz: a66d9f5482e06ae11cffeece148a8eb290523ee6ec4c91f510c1258b1c780225
+  metadata.gz: b023bc6411647eaecfcb8f5b0fe535379974a0824d49699dd74ef867a67c69eb
+  data.tar.gz: 5dc4a0439f9442811f3966e86b0c6b09d09c54450a04234c3738ae0ab7935900
 SHA512:
-  metadata.gz: 4e60dbae8d1bf0c4be3964bd0daf0740c4dd89827d61481d21960af17f34b237b512dde09f08111949d9b728bc3290c59a535930e168aaa562c30c9f74faa841
-  data.tar.gz: 3b7d941dee59924dc47b486e5cd3d88af8a3a9a42e8f6952e14934087e2a0acbe0014ee09caabec373640c35c5ae1d72a433e2100fcd2257e8d920c09f39e3b6
+  metadata.gz: a5fc637e8c016531df22af678adcae60a4f4169e5f1d2215d52be0a0dff1111b849cb4d79ca36d6cbf315c8516bc51d543852ab5026339d59cb1f5d08ba356f7
+  data.tar.gz: 7cf9d55a9aca5d6d63401750d40bc656fcc345101d8ce92a300c24649e38810d399d43ff225611bbdd91a257d6cb15eee26a6c811974b987e92e72e67eded704

data/.github/workflows/test.yml

@@ -11,11 +11,11 @@ jobs:
         - 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:7.9.0
         ruby:
+        - 2.5
         - 2.6
         - 2.7
-        - 3.0
     services:
       elasticsearch:
         image: ${{ matrix.elasticsearch }}
@@ -28,7 +28,6 @@ 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,14 +1,13 @@
 AllCops:
   NewCops: enable
-  TargetRubyVersion: 2.5
-  SuggestExtensions: false
-
-Layout/EmptyLineBetweenDefs:
-  EmptyLineBetweenClassDefs: false
+  TargetRubyVersion: 2.4
 
 Gemspec/RequiredRubyVersion:
   Enabled: false
 
+Style/CaseLikeIf:
+  Enabled: false
+
 Style/ExplicitBlockArgument:
   Enabled: false
 

data/CHANGELOG.md

@@ -1,24 +1,13 @@
 
 # CHANGELOG
 
-## v3.4.0
+## v4.0.0
 
-* Expose `Http#timeout` via `SearchFlip::HTTPClient`
-
-## v3.3.0
-
-* Update httprb
-* Changed oj default options
-* Allow to set oj json options
-
-## v3.2.1
-
-* Fix `refresh` having a empty body breaking in elasticsearch 7.11
-
-## v3.2.0
-
-* Fix `index_scope` not being passed in `each_record` without block
-* Added `SearchFlip::Criteria#match_none`
+* [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"`
 
 ## v3.1.2
 

data/README.md

@@ -51,7 +51,7 @@ CommentIndex.search("hello world").where(available: true).sort(id: "desc").aggre
 
 ```
 
-Finally, SearchFlip comes with a minimal set of dependencies.
+Finally, SearchFlip comes with a minimal set of dependencies (http-rb and oj only).
 
 ## Reference Docs
 
@@ -418,14 +418,6 @@ Simply matches all documents:
 CommentIndex.match_all
 ```
 
-* `match_none`
-
-Simply matches none documents at all:
-
-```ruby
-CommentIndex.match_none
-```
-
 * `all`
 
 Simply returns the criteria as is or an empty criteria when called on the index
@@ -482,8 +474,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
@@ -756,7 +748,7 @@ end
 This allows to use different clusters per index e.g. when migrating indices to
 new versions of Elasticsearch.
 
-You can specify basic auth, additional headers, request timeouts, etc via:
+You can specify basic auth, additional headers, etc via:
 
 ```ruby
 http_client = SearchFlip::HTTPClient.new
@@ -773,9 +765,6 @@ http_client = http_client.via("proxy.host", 8080)
 # Custom headers
 http_client = http_client.headers(key: "value")
 
-# Timeouts
-http_client = http_client.timeout(20)
-
 SearchFlip::Connection.new(base_url: "...", http_client: http_client)
 ```
 
@@ -885,52 +874,57 @@ 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.
 
-## JSON
+## Date and Timestamps in JSON
 
-SearchFlip is using the [Oj gem](https://github.com/ohler55/oj) to generate
-JSON. More concretely, SearchFlip is using:
+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
-Oj.dump({ key: "value" }, mode: :custom, use_to_json: true, time_format: :xmlschema, bigdecimal_as_decimal: false)
+JSON.generate(time: Time.now.utc)
+# => "{\"time\":\"2018-02-22 18:19:33 UTC\"}"
 ```
 
-The `use_to_json` option is used for maximum compatibility, most importantly
-when using rails `ActiveSupport::TimeWithZone` timestamps, which `oj` can not
-serialize natively. However, `use_to_json` adds performance overhead. You can
-change the json options via:
+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
-SearchFlip::Config[:json_options] = {
-  mode: :custom,
-  use_to_json: false,
-  time_format: :xmlschema,
-  bigdecimal_as_decimal: false
-}
+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\"}"
 ```
 
-However, you then have to convert timestamps manually for indexation via e.g.:
+SearchFlip is using the [Oj gem](https://github.com/ohler55/oj) to generate
+JSON. More concretely, SearchFlip is using:
 
 ```ruby
-class MyIndex
-  # ...
+Oj.dump({ key: "value" }, mode: :custom, use_to_json: true)
+```
 
-  def self.serialize(model)
-    {
-      # ...
+This mitigates the issues if you're on Rails:
 
-      created_at: model.created_at.to_time
-    }
-  end
-end
+```ruby
+Oj.dump(Time.now, mode: :custom, use_to_json: true)
+# => "\"2018-02-22T18:21:21.064Z\""
 ```
 
-Please check out the oj docs for more details.
+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
   records via queries
-* `#match_none` is only available with Elasticsearch >= 5
 * `#track_total_hits` is only available with Elasticsearch >= 7
 
 ## Keeping your Models and Indices in Sync

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,9 +1,7 @@
 require "ruby2_keywords"
 require "forwardable"
 require "http"
-require "hashie"
 require "thread"
-require "json"
 require "oj"
 require "set"
 

data/lib/search_flip/bulk.rb

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

data/lib/search_flip/config.rb

@@ -5,12 +5,6 @@ module SearchFlip
     bulk_limit: 1_000,
     bulk_max_mb: 100,
     auto_refresh: false,
-    instrumenter: NullInstrumenter.new,
-    json_options: {
-      mode: :custom,
-      use_to_json: true,
-      time_format: :xmlschema,
-      bigdecimal_as_decimal: false
-    }
+    instrumenter: NullInstrumenter.new
   }
 end

data/lib/search_flip/connection.rb

@@ -28,11 +28,7 @@ module SearchFlip
 
     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
+        @version ||= http_client.headers(accept: "application/json").get("#{base_url}/").parse["version"]["number"]
       end
     end
 
@@ -44,9 +40,7 @@ module SearchFlip
     # @return [Hash] The raw response
 
     def cluster_health
-      response = http_client.headers(accept: "application/json").get("#{base_url}/_cluster/health")
-
-      SearchFlip::JSON.parse(response.to_s)
+      http_client.headers(accept: "application/json").get("#{base_url}/_cluster/health").parse
     end
 
     # Uses the Elasticsearch Multi Search API to execute multiple search requests
@@ -96,11 +90,10 @@ module SearchFlip
     # @return [Hash] The raw response
 
     def update_aliases(payload)
-      response = http_client
+      http_client
         .headers(accept: "application/json", content_type: "application/json")
         .post("#{base_url}/_aliases", body: SearchFlip::JSON.generate(payload))
-
-      SearchFlip::JSON.parse(response.to_s)
+        .parse
     end
 
     # Sends an analyze request to Elasticsearch. Raises
@@ -112,11 +105,10 @@ module SearchFlip
     # @return [Hash] The raw response
 
     def analyze(request, params = {})
-      response = http_client
+      http_client
         .headers(accept: "application/json")
         .post("#{base_url}/_analyze", json: request, params: params)
-
-      SearchFlip::JSON.parse(response.to_s)
+        .parse
     end
 
     # Fetches information about the specified index aliases. Raises
@@ -132,11 +124,10 @@ module SearchFlip
     # @return [Hash] The raw response
 
     def get_aliases(index_name: "*", alias_name: "*")
-      response = http_client
+      http_client
         .headers(accept: "application/json", content_type: "application/json")
         .get("#{base_url}/#{index_name}/_alias/#{alias_name}")
-
-      SearchFlip::JSON.parse(response.to_s)
+        .parse
     end
 
     # Returns whether or not the associated Elasticsearch alias already
@@ -168,11 +159,10 @@ module SearchFlip
     # @return [Array] The raw response
 
     def get_indices(name = "*", params: {})
-      response = http_client
+      http_client
         .headers(accept: "application/json", content_type: "application/json")
         .get("#{base_url}/_cat/indices/#{name}", params: params)
-
-      SearchFlip::JSON.parse(response.to_s)
+        .parse
     end
 
     alias_method :cat_indices, :get_indices
@@ -269,11 +259,10 @@ module SearchFlip
     # @return [Hash] The index settings
 
     def get_index_settings(index_name)
-      response = http_client
+      http_client
         .headers(accept: "application/json")
         .get("#{index_url(index_name)}/_settings")
-
-      SearchFlip::JSON.parse(response.to_s)
+        .parse
     end
 
     # Sends a refresh request to Elasticsearch. Raises
@@ -283,7 +272,7 @@ module SearchFlip
     # @return [Boolean] Returns true or raises SearchFlip::ResponseError
 
     def refresh(index_names = nil)
-      http_client.post("#{index_names ? index_url(Array(index_names).join(",")) : base_url}/_refresh")
+      http_client.post("#{index_names ? index_url(Array(index_names).join(",")) : base_url}/_refresh", json: {})
 
       true
     end
@@ -321,9 +310,7 @@ 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 } : {}
 
-      response = http_client.headers(accept: "application/json").get("#{url}/_mapping", params: params)
-
-      SearchFlip::JSON.parse(response.to_s)
+      http_client.headers(accept: "application/json").get("#{url}/_mapping", params: params).parse
     end
 
     # Deletes the specified index from Elasticsearch. Raises

data/lib/search_flip/filterable.rb

@@ -235,22 +235,6 @@ module SearchFlip
       filter(match_all: options)
     end
 
-    # Adds a match none filter to the criteria, which simply matches none
-    # documents at all. Check out the Elasticsearch docs for further details.
-    #
-    # @example Basic usage
-    #   CommentIndex.match_none
-    #
-    # @example Filter chaining
-    #   query = CommentIndex.search("...")
-    #   query = query.match_none unless current_user.admin?
-    #
-    # @return [SearchFlip::Criteria] A newly created extended criteria
-
-    def match_none
-      filter(match_none: {})
-    end
-
     # Adds an exists filter to the criteria, which selects all documents for
     # which the specified field has a non-null value.
     #

data/lib/search_flip/http_client.rb

@@ -1,28 +1,7 @@
 module SearchFlip
-  # The SearchFlip::HTTPClient class wraps the http gem and responsible for the
-  # http request/response handling, ie communicating with Elasticsearch. You
-  # only need to use it directly if you need authentication to communicate with
-  # Elasticsearch or if you want to set some custom http settings.
-  #
-  # @example
-  #   http_client = SearchFlip::HTTPClient.new
-  #
-  #   # Basic Auth
-  #   http_client = http_client.basic_auth(user: "username", pass: "password")
-  #
-  #   # Raw Auth Header
-  #   http_client = http_client.auth("Bearer VGhlIEhUVFAgR2VtLCBST0NLUw")
-  #
-  #   # Proxy Settings
-  #   http_client = http_client.via("proxy.host", 8080)
-  #
-  #   # Custom headers
-  #   http_client = http_client.headers(key: "value")
-  #
-  #   # Timeouts
-  #   http_client = http_client.timeout(20)
-  #
-  #   SearchFlip::Connection.new(base_url: "...", http_client: http_client)
+  # The SearchFlip::HTTPClient class wraps the http gem, is for internal use
+  # and responsible for the http request/response handling, ie communicating
+  # with Elasticsearch.
 
   class HTTPClient
     attr_accessor :request, :plugins
@@ -35,11 +14,11 @@ module SearchFlip
     class << self
       extend Forwardable
 
-      def_delegators :new, :headers, :via, :basic_auth, :auth, :timeout
+      def_delegators :new, :headers, :via, :basic_auth, :auth
       def_delegators :new, :get, :post, :put, :delete, :head
     end
 
-    [:headers, :via, :basic_auth, :auth, :timeout].each do |method|
+    [:headers, :via, :basic_auth, :auth].each do |method|
       define_method method do |*args|
         dup.tap do |client|
           client.request = request.send(method, *args)

data/lib/search_flip/index.rb

@@ -153,7 +153,7 @@ module SearchFlip
       #   scope to be applied to the scope
 
       def each_record(scope, index_scope: false)
-        return enum_for(:each_record, scope, index_scope: index_scope) unless block_given?
+        return enum_for(:each_record, scope) unless block_given?
 
         if scope.respond_to?(:find_each)
           (index_scope ? self.index_scope(scope) : scope).find_each do |record|
@@ -247,8 +247,8 @@ module SearchFlip
         SearchFlip::Criteria.new(target: self)
       end
 
-      def_delegators :criteria, :all, :profile, :where, :where_not, :filter, :range, :match_all, :match_none,
-        :exists, :exists_not, :post_where, :post_where_not, :post_range, :post_exists, :post_exists_not,
+      def_delegators :criteria, :all, :profile, :where, :where_not, :filter, :range, :match_all, :exists,
+        :exists_not, :post_where, :post_where_not, :post_range, :post_exists, :post_exists_not,
         :post_filter, :post_must, :post_must_not, :post_should, :aggregate, :scroll, :source,
         :includes, :eager_load, :preload, :sort, :resort, :order, :reorder, :offset, :limit, :paginate,
         :page, :per, :search, :highlight, :suggest, :custom, :find_in_batches, :find_results_in_batches,
@@ -487,9 +487,7 @@ module SearchFlip
       # @return [Hash] The raw response
 
       def analyze(request, params = {})
-        response = connection.http_client.headers(accept: "application/json").post("#{index_url}/_analyze", json: request, params: params)
-
-        SearchFlip::JSON.parse(response.to_s)
+        connection.http_client.headers(accept: "application/json").post("#{index_url}/_analyze", json: request, params: params).parse
       end
 
       # Sends a index refresh request to Elasticsearch. Raises

data/lib/search_flip/json.rb

@@ -1,11 +1,11 @@
 module SearchFlip
   class JSON
     def self.generate(obj)
-      Oj.dump(obj, SearchFlip::Config[:json_options])
+      Oj.dump(obj, mode: :custom, use_to_json: true)
     end
 
-    def self.parse(json)
-      ::JSON.parse(json)
+    def self.parse(str)
+      Oj.load(str)
     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,55 @@
 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
+
+    # rubocop:disable Lint/MissingSuper
 
-      new(raw_result)
+    def method_missing(name, *args, &block)
+      self[name.to_s]
+    end
+
+    # rubocop:enable Lint/MissingSuper
+
+    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 +1,29 @@
-warn "[DEPRECATION] Using search_flip/to_json is not neccessary anymore"
+require "time"
+require "date"
+require "json"
+
+class Time
+  def to_json(*args)
+    iso8601(6).to_json
+  end
+end
+
+class Date
+  def to_json(*args)
+    iso8601.to_json
+  end
+end
+
+class DateTime
+  def to_json(*args)
+    iso8601(6).to_json
+  end
+end
+
+if defined?(ActiveSupport)
+  class ActiveSupport::TimeWithZone
+    def to_json(*args)
+      iso8601(6).to_json
+    end
+  end
+end

data/lib/search_flip/version.rb

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

data/search_flip.gemspec

@@ -35,9 +35,7 @@ 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 "json"
   spec.add_dependency "oj"
   spec.add_dependency "ruby2_keywords"
 end

data/spec/search_flip/aggregation_spec.rb

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

data/spec/search_flip/criteria_spec.rb

@@ -416,18 +416,6 @@ RSpec.describe SearchFlip::Criteria do
     end
   end
 
-  describe "#match_none" do
-    it "does not match any documents" do
-      if ProductIndex.connection.version.to_i >= 5
-        ProductIndex.import create(:product)
-
-        query = ProductIndex.match_none
-
-        expect(query.records).to eq([])
-      end
-    end
-  end
-
   describe "#exists" do
     it "sets up the constraints correctly and is chainable" do
       product1 = create(:product, title: "title1", description: "description1")
@@ -1313,7 +1301,7 @@ RSpec.describe SearchFlip::Criteria do
       ProductIndex.import create(:product)
 
       query = ProductIndex.match_all.explain(true)
-      expect(query.results.first._hit.key?(:_explanation)).to eq(true)
+      expect(query.results.first._hit.key?("_explanation")).to eq(true)
     end
   end
 

data/spec/search_flip/http_client_spec.rb

@@ -7,7 +7,7 @@ class HttpTestRequest
     self.calls = []
   end
 
-  [:headers, :via, :basic_auth, :auth, :timeout].each do |method|
+  [:via, :basic_auth, :auth].each do |method|
     define_method method do |*args|
       dup.tap do |request|
         request.calls = calls + [[method, args]]
@@ -20,7 +20,7 @@ RSpec.describe SearchFlip::HTTPClient do
   describe "delegation" do
     subject { SearchFlip::HTTPClient }
 
-    [:headers, :via, :basic_auth, :auth, :timeout].each do |method|
+    [:headers, :via, :basic_auth, :auth].each do |method|
       it { should delegate(method).to(:new) }
     end
 
@@ -56,12 +56,8 @@ RSpec.describe SearchFlip::HTTPClient do
     end
   end
 
-  [:headers, :via, :basic_auth, :auth, :timeout].each do |method|
+  [:via, :basic_auth, :auth].each do |method|
     describe "##{method}" do
-      it "is understood by HTTP" do
-        expect(HTTP.respond_to?(method)).to eq(true)
-      end
-
       it "creates a dupped instance" do
         client = SearchFlip::HTTPClient.new
         client.request = HttpTestRequest.new

data/spec/search_flip/index_spec.rb

@@ -5,8 +5,8 @@ RSpec.describe SearchFlip::Index do
     subject { ProductIndex }
 
     methods = [
-      :all, :profile, :where, :where_not, :filter, :range, :match_all, :match_none,
-      :exists, :exists_not, :post_where, :post_where_not, :post_filter, :post_must,
+      :all, :profile, :where, :where_not, :filter, :range, :match_all, :exists,
+      :exists_not, :post_where, :post_where_not, :post_filter, :post_must,
       :post_must_not, :post_should, :post_range, :post_exists, :post_exists_not,
       :aggregate, :scroll, :source, :includes, :eager_load, :preload, :sort, :resort,
       :order, :reorder, :offset, :limit, :paginate, :page, :per, :search,
@@ -211,18 +211,12 @@ RSpec.describe SearchFlip::Index do
         mapping = { properties: { id: { type: "long" } } }
 
         allow(TestIndex).to receive(:mapping).and_return(mapping)
-        allow(TestIndex.connection).to receive(:update_mapping)
+        allow(TestIndex.connection).to receive(:update_mapping).and_call_original
 
         TestIndex.update_mapping
 
         expect(TestIndex.connection).to have_received(:update_mapping).with("test", { "test" => mapping }, type_name: "test")
       end
-
-      it "updates the mapping" do
-        TestIndex.create_index
-
-        expect(TestIndex.update_mapping).to eq(true)
-      end
     end
   end
 
@@ -264,19 +258,12 @@ RSpec.describe SearchFlip::Index do
         TestIndex.create_index
         TestIndex.update_mapping
 
-        allow(TestIndex.connection).to receive(:get_mapping)
+        allow(TestIndex.connection).to receive(:get_mapping).and_call_original
 
         TestIndex.get_mapping
 
         expect(TestIndex.connection).to have_received(:get_mapping).with("test", type_name: "test")
       end
-
-      it "returns the mapping" do
-        TestIndex.create_index
-        TestIndex.update_mapping
-
-        expect(TestIndex.get_mapping).to be_present
-      end
     end
   end
 

data/spec/search_flip/json_spec.rb

@@ -2,16 +2,6 @@ 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:00.000Z"}')
-      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)
 
@@ -19,7 +9,7 @@ RSpec.describe SearchFlip::JSON do
 
       described_class.generate(payload)
 
-      expect(Oj).to have_received(:dump).with(payload, mode: :custom, use_to_json: true, time_format: :xmlschema, bigdecimal_as_decimal: false)
+      expect(Oj).to have_received(:dump).with(payload, mode: :custom, use_to_json: true)
     end
 
     it "generates json" do
@@ -28,18 +18,14 @@ RSpec.describe SearchFlip::JSON do
   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 JSON" do
-      allow(JSON).to receive(:parse)
+    it "delegates to Oj" do
+      allow(Oj).to receive(:load)
 
       payload = '{"key":"value"}'
 
       described_class.parse(payload)
 
-      expect(JSON).to have_received(:parse).with(payload)
+      expect(Oj).to have_received(:load).with(payload)
     end
   end
 end

data/spec/search_flip/null_instrumenter_spec.rb

@@ -7,7 +7,7 @@ RSpec.describe SearchFlip::NullInstrumenter do
     it "calls start" do
       allow(subject).to receive(:start)
 
-      subject.instrument("name", { key: "value" }) { true }
+      subject.instrument("name", { key: "value" }) {}
 
       expect(subject).to have_received(:start)
     end
@@ -15,7 +15,7 @@ RSpec.describe SearchFlip::NullInstrumenter do
     it "calls finish" do
       allow(subject).to receive(:finish)
 
-      subject.instrument("name", { key: "value" }) { true }
+      subject.instrument("name", { key: "value" }) {}
 
       expect(subject).to have_received(:finish)
     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)
 

data/spec/search_flip/to_json_spec.rb

@@ -0,0 +1,28 @@
+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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: search_flip
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 4.0.0.beta
 platform: ruby
 authors:
 - Benjamin Vetter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-15 00:00:00.000000000 Z
+date: 2020-10-29 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
@@ -178,20 +164,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: json
-  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: oj
   requirement: !ruby/object:Gem::Requirement
@@ -278,6 +250,7 @@ files:
 - 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:
@@ -297,11 +270,11 @@ 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
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Full-Featured Elasticsearch Ruby Client with a Chainable DSL
@@ -319,4 +292,5 @@ test_files:
 - 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