search_flip 3.8.0 → 4.0.0.beta

data/lib/search_flip/connection.rb

@@ -16,28 +16,20 @@ 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]
-    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"]
+      @version_mutex = Mutex.new
     end
 
     # 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 ||= SearchFlip::JSON.parse(version_response.to_s)["version"]["number"]
+      @version_mutex.synchronize do
+        @version ||= http_client.headers(accept: "application/json").get("#{base_url}/").parse["version"]["number"]
+      end
     end
 
     # Queries and returns the Elasticsearch cluster health.
@@ -48,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
@@ -68,7 +58,7 @@ module SearchFlip
     def msearch(criterias)
       payload = criterias.flat_map do |criteria|
         [
-          SearchFlip::JSON.generate(index: criteria.target.index_name_with_prefix, **(distribution.nil? && version.to_i < 8 ? { type: criteria.target.type_name } : {})),
+          SearchFlip::JSON.generate(index: criteria.target.index_name_with_prefix, type: criteria.target.type_name),
           SearchFlip::JSON.generate(criteria.request)
         ]
       end
@@ -100,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
@@ -116,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
@@ -136,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
@@ -172,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
@@ -273,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
@@ -287,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
@@ -304,8 +289,8 @@ module SearchFlip
     # @return [Boolean] Returns true or raises SearchFlip::ResponseError
 
     def update_mapping(index_name, mapping, type_name: nil)
-      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 } : {}
+      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.put("#{url}/_mapping", params: params, json: mapping)
 
@@ -322,12 +307,10 @@ module SearchFlip
     # @return [Hash] The current type mapping
 
     def get_mapping(index_name, type_name: nil)
-      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)
+      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 } : {}
 
-      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
@@ -359,51 +342,6 @@ module SearchFlip
       raise e
     end
 
-    # Initiates and yields a bulk object, such that index, import, create,
-    # update and delete requests can be appended to the bulk request. Please
-    # note that you need to manually pass the desired index name as well as
-    # type name (depending on the Elasticsearch version) when using #bulk on a
-    # connection object or Elasticsearch will return an error. After the bulk
-    # requests are successfully processed all existing indices will
-    # subsequently be refreshed when auto_refresh is enabled.
-    #
-    # @see SearchFlip::Config See SearchFlip::Config for auto_refresh
-    #
-    # @example
-    #   connection = SearchFlip::Connection.new
-    #
-    #   connection.bulk ignore_errors: [409] do |bulk|
-    #     bulk.create comment.id, CommentIndex.serialize(comment),
-    #       _index: CommentIndex.index_name, version: comment.version, version_type: "external_gte"
-    #
-    #     bulk.delete product.id, _index: ProductIndex.index_name, routing: product.user_id
-    #
-    #     # ...
-    #   end
-    #
-    # @param options [Hash] Specifies options regarding the bulk indexing
-    # @option options ignore_errors [Array] Specifies an array of http status
-    #   codes that shouldn't raise any exceptions, like eg 409 for conflicts,
-    #   ie when optimistic concurrency control is used.
-    # @option options raise [Boolean] Prevents any exceptions from being
-    #   raised. Please note that this only applies to the bulk response, not to
-    #   the request in general, such that connection errors, etc will still
-    #   raise.
-
-    def bulk(options = {})
-      default_options = {
-        http_client: http_client,
-        bulk_limit: bulk_limit,
-        bulk_max_mb: bulk_max_mb
-      }
-
-      SearchFlip::Bulk.new("#{base_url}/_bulk", default_options.merge(options)) do |indexer|
-        yield indexer
-      end
-
-      refresh if SearchFlip::Config[:auto_refresh]
-    end
-
     # Returns the full Elasticsearch type URL, ie base URL, index name with
     # prefix and type name.
     #
@@ -426,11 +364,5 @@ 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

@@ -26,8 +26,7 @@ module SearchFlip
 
     attr_accessor :target, :profile_value, :source_value, :suggest_values, :includes_values,
       :eager_load_values, :preload_values, :failsafe_value, :scroll_args, :terminate_after_value,
-      :timeout_value, :preference_value, :search_type_value, :routing_value, :track_total_hits_value,
-      :http_timeout_value
+      :timeout_value, :preference_value, :search_type_value, :routing_value, :track_total_hits_value
 
     # Creates a new criteria while merging the attributes (constraints,
     # settings, etc) of the current criteria with the attributes of another one
@@ -48,7 +47,7 @@ module SearchFlip
         [
           :profile_value, :failsafe_value, :terminate_after_value, :timeout_value, :offset_value,
           :limit_value, :scroll_args, :source_value, :preference_value, :search_type_value,
-          :routing_value, :track_total_hits_value, :explain_value, :http_timeout_value
+          :routing_value, :track_total_hits_value, :explain_value
         ].each do |name|
           criteria.send(:"#{name}=", other.send(name)) unless other.send(name).nil?
         end
@@ -149,22 +148,6 @@ module SearchFlip
       end
     end
 
-    # Specifies a http timeout, such that a SearchFlip::TimeoutError will be
-    # thrown when the request times out.
-    #
-    # @example
-    #   ProductIndex.http_timeout(3).search("hello world")
-    #
-    # @param value [Fixnum] The timeout value
-    #
-    # @return [SearchFlip::Criteria] A newly created extended criteria
-
-    def http_timeout(value)
-      fresh.tap do |criteria|
-        criteria.http_timeout_value = value
-      end
-    end
-
     # Specifies early query termination, such that the processing will be
     # stopped after the specified number of results has been accumulated.
     #
@@ -347,15 +330,10 @@ module SearchFlip
       dupped_request.delete(:from)
       dupped_request.delete(:size)
 
-      http_request = connection.http_client
-      http_request = http_request.timeout(http_timeout_value) if http_timeout_value
-
-      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)
+      if connection.version.to_i >= 5
+        connection.http_client.post("#{target.type_url}/_delete_by_query", params: request_params.merge(params), json: dupped_request)
       else
-        http_request.delete("#{target.type_url}/_query", params: request_params.merge(params), json: dupped_request)
+        connection.http_client.delete("#{target.type_url}/_query", params: request_params.merge(params), json: dupped_request)
       end
 
       target.refresh if SearchFlip::Config[:auto_refresh]
@@ -523,8 +501,8 @@ module SearchFlip
     end
 
     # Executes the search request for the current criteria, ie sends the
-    # request to Elasticsearch and returns the response. Connection, timeout
-    # and response errors will be rescued if you specify the criteria to be
+    # request to Elasticsearch and returns the response. Connection and
+    # response errors will be rescued if you specify the criteria to be
     # #failsafe, such that an empty response is returned instead.
     #
     # @example
@@ -612,7 +590,6 @@ module SearchFlip
 
     def execute!
       http_request = connection.http_client.headers(accept: "application/json")
-      http_request = http_request.timeout(http_timeout_value) if http_timeout_value
 
       http_response =
         if scroll_args && scroll_args[:id]
@@ -622,21 +599,17 @@ module SearchFlip
             json: { scroll: scroll_args[:timeout], scroll_id: scroll_args[:id] }
           )
         elsif scroll_args
-          url = connection.distribution.nil? && connection.version.to_i < 8 ? target.type_url : target.index_url
-
           http_request.post(
-            "#{url}/_search",
+            "#{target.type_url}/_search",
             params: request_params.merge(scroll: scroll_args[:timeout]),
             json: request
           )
         else
-          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)
+          http_request.post("#{target.type_url}/_search", params: request_params, json: request)
         end
 
       SearchFlip::Response.new(self, SearchFlip::JSON.parse(http_response.to_s))
-    rescue SearchFlip::ConnectionError, SearchFlip::TimeoutError, SearchFlip::ResponseError => e
+    rescue SearchFlip::ConnectionError, SearchFlip::ResponseError => e
       raise e unless failsafe_value
 
       SearchFlip::Response.new(self, "took" => 0, "hits" => { "total" => 0, "hits" => [] })

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)
@@ -58,32 +37,14 @@ module SearchFlip
     private
 
     def execute(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)
+      final_request = plugins.inject(self) { |res, cur| cur.call(res, method, uri, options) }
+      response = final_request.request.send(method, uri, options)
 
       raise SearchFlip::ResponseError.new(code: response.code, body: response.body.to_s) unless response.status.success?
 
       response
     rescue HTTP::ConnectionError => e
       raise SearchFlip::ConnectionError, e.message
-    rescue HTTP::TimeoutError => e
-      raise SearchFlip::TimeoutError, e.message
-    rescue HTTP::Error => e
-      raise SearchFlip::HttpError, e.message
     end
   end
 end

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,14 +247,14 @@ 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,
         :find_each, :find_each_result, :failsafe, :total_entries, :total_count, :timeout, :terminate_after,
         :records, :results, :must, :must_not, :should, :preference, :search_type, :routing,
-        :track_total_hits, :explain, :http_timeout
+        :track_total_hits, :explain
 
       # Override to specify the type name used within Elasticsearch. Recap,
       # this gem uses an individual index for each index class, because
@@ -438,7 +438,7 @@ module SearchFlip
       # equal to _doc.
 
       def include_type_name?
-        type_name != "_doc" || (connection.distribution.nil? && connection.version.to_i < 7)
+        type_name != "_doc" || connection.version.to_i < 7
       end
 
       # Retrieves the document specified by id from Elasticsearch. Raises
@@ -455,8 +455,7 @@ module SearchFlip
       # @return [Hash] The specified document
 
       def get(id, params = {})
-        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)
+        response = connection.http_client.headers(accept: "application/json").get("#{type_url}/#{id}", params: params)
 
         SearchFlip::JSON.parse(response.to_s)
       end
@@ -474,8 +473,7 @@ module SearchFlip
       # @return [Hash] The raw response
 
       def mget(request, params = {})
-        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)
+        response = connection.http_client.headers(accept: "application/json").post("#{type_url}/_mget", json: request, params: params)
 
         SearchFlip::JSON.parse(response.to_s)
       end
@@ -489,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
@@ -601,7 +597,7 @@ module SearchFlip
         scope
       end
 
-      # Initiates and yields a bulk object, such that index, import, create,
+      # Initiates and yields the bulk object, such that index, import, create,
       # update and delete requests can be appended to the bulk request. Sends a
       # refresh request afterwards if auto_refresh is enabled.
       #
@@ -633,9 +629,7 @@ module SearchFlip
           bulk_max_mb: connection.bulk_max_mb
         }
 
-        url = connection.distribution.nil? && connection.version.to_i < 8 ? type_url : index_url
-
-        SearchFlip::Bulk.new("#{url}/_bulk", default_options.merge(options)) do |indexer|
+        SearchFlip::Bulk.new("#{type_url}/_bulk", default_options.merge(options)) do |indexer|
           yield indexer
         end
 

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.
@@ -224,7 +223,7 @@ module SearchFlip
 
     def records
       @records ||= begin
-        sort_map = ids.each_with_index.with_object({}) { |(id, index), hash| hash[id.to_s] = index }
+        sort_map = ids.each_with_index.each_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
@@ -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