search_flip 3.0.0.beta2 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8594c0c22592c2dfa8fb54097151a87db3746221586b8c28e4c6c3c5c02dff6c
-  data.tar.gz: 55b27e4f8e3bc04c4420280d1dccafbf66e5f7e53cf6914c16f5e5dd3cb5ae10
+  metadata.gz: fa160794662cedbe89066113cb845c84daaee29451ba8c8ba4f9183689b42582
+  data.tar.gz: b55133b0f4f90f61db0b76042c1223a17035f277ba221a00c0f665512e1cb170
 SHA512:
-  metadata.gz: d54c4c22ba4637573d590288cf1a2407d0ff066e9c4505e3ee851a431ff6ebdc318424ea3af63b2c4d426f74521e27a1800c361feb97dec37c7d1159328dc819
-  data.tar.gz: 1b1bd5e46c5edfc2f1c7d3674564b1bb5627956aee05e16d06e1bdbf1107a70cdd1114bc530cb380db40cc16f383481bafc573c63e1ac3e26b218df97f0d65ed
+  metadata.gz: eb2e1e1fd39d64639b9a1f542997e6a00c6238226144fbd32f45f0023f93aa827a1c54597fb71f993090c9d78bcb8b92bbac3a5185d584f26cbeb2e1c4b1a641
+  data.tar.gz: caea53f0332131113662b24818268bfd5e3cf537ad04b07b853aba600fc4edd417d1783fd3a1d37fd6d848a75df21ec2e3d39c45a8dafab5fdc515d6f8ca43a9

data/.rubocop.yml

@@ -1,3 +1,6 @@
+AllCops:
+  NewCops: enable
+
 Style/HashTransformValues:
   Enabled: false
 

data/.travis.yml

@@ -5,9 +5,11 @@ env:
   - ES_IMAGE=elasticsearch:5.4
   - ES_IMAGE=docker.elastic.co/elasticsearch/elasticsearch:6.7.0
   - ES_IMAGE=docker.elastic.co/elasticsearch/elasticsearch:7.0.0
-  - ES_IMAGE=docker.elastic.co/elasticsearch/elasticsearch:7.4.0
+  - ES_IMAGE=docker.elastic.co/elasticsearch/elasticsearch:7.6.0
 rvm:
+  - ruby-2.5.3
   - ruby-2.6.2
+  - ruby-2.7.1
 before_install:
   - docker-compose up -d
   - sleep 10

data/CHANGELOG.md

@@ -21,6 +21,13 @@
 * `Connection#freeze_index`, `Connection#unfreeze_index`, `Index#freeze_index`
    and `Index#unfreeze_index` added
 * Added `SearchFlip::Result.from_hit`
+* Added support for `source`, `sort`, `page`, `per`, `paginate`, `explain`, and
+  `highlight` to aggregations
+* Added support for instrumentation
+
+## v2.3.2
+
+* Remove ruby 2.7 warnings
 
 ## v2.3.1
 

data/README.md

@@ -274,7 +274,7 @@ CommentIndex.create(Comment.first, { bulk_max_mb: 100 }, routing: "routing_key")
 CommentIndex.update(Comment.first, ...)
 ```
 
-Checkout the elasticsearch [Bulk API] docs for more info as well as
+Checkout the Elasticsearch [Bulk API] docs for more info as well as
 [SearchFlip::Bulk](http://www.rubydoc.info/github/mrkamel/search_flip/SearchFlip/Bulk)
 for a complete list of available options to control the bulk indexing of
 SearchFlip.
@@ -505,6 +505,14 @@ end
 query.aggregations(:average_price).average_price.value
 ```
 
+Even various criteria for top hits aggregations can be specified elegantly:
+
+```ruby
+query = ProductIndex.aggregate(sponsored: { top_hits: {} }) do |aggregation|
+  aggregation.sort(:rank).highlight(:title).source([:id, :title])
+end
+```
+
 Checkout [Aggregatable](http://www.rubydoc.info/github/mrkamel/search_flip/SearchFlip/Aggregatable)
 as well as [Aggregation](http://www.rubydoc.info/github/mrkamel/search_flip/SearchFlip/Aggregation)
 for a complete API reference.
@@ -782,6 +790,30 @@ end
 
 These options will be passed whenever records get indexed, deleted, etc.
 
+## Instrumentation
+
+SearchFlip supports instrumentation for request execution via
+`ActiveSupport::Notifications` compatible instrumenters to e.g. allow global
+performance tracing, etc.
+
+To use instrumentation, configure the instrumenter:
+
+```ruby
+SearchFlip::Config[:instrumenter] = ActiveSupport::Notifications.notifier
+```
+
+Subsequently, you can subscribe to notifcations for `request.search_flip`:
+
+```ruby
+ActiveSupport::Notifications.subscribe("request.search_flip") do |name, start, finish, id, payload|
+  payload[:index] # the index class
+  payload[:request] # the request hash sent to Elasticsearch
+  payload[:response] # the SearchFlip::Response object or nil in case of errors
+end
+```
+
+A notification will be send for every request that is sent to Elasticsearch.
+
 ## Non-ActiveRecord models
 
 SearchFlip ships with built-in support for ActiveRecord models, but using

data/lib/search_flip.rb

@@ -1,3 +1,4 @@
+require "ruby2_keywords"
 require "forwardable"
 require "http"
 require "hashie"
@@ -6,6 +7,7 @@ require "oj"
 require "set"
 
 require "search_flip/version"
+require "search_flip/null_instrumenter"
 require "search_flip/helper"
 require "search_flip/exceptions"
 require "search_flip/json"
@@ -14,6 +16,12 @@ require "search_flip/config"
 require "search_flip/connection"
 require "search_flip/bulk"
 require "search_flip/filterable"
+require "search_flip/customable"
+require "search_flip/explainable"
+require "search_flip/highlightable"
+require "search_flip/paginatable"
+require "search_flip/sortable"
+require "search_flip/sourceable"
 require "search_flip/post_filterable"
 require "search_flip/aggregatable"
 require "search_flip/aggregation"

data/lib/search_flip/aggregatable.rb

@@ -57,7 +57,15 @@ module SearchFlip
         if block
           aggregation = yield(SearchFlip::Aggregation.new(target: target))
 
-          field_or_hash.is_a?(Hash) ? hash[field_or_hash.keys.first].merge!(aggregation.to_hash) : hash[field_or_hash].merge!(aggregation.to_hash)
+          if field_or_hash.is_a?(Hash)
+            aggregation_hash = field_or_hash.values.first
+            aggregation_hash = aggregation_hash[:top_hits] if aggregation_hash.is_a?(Hash) && aggregation_hash.key?(:top_hits)
+            aggregation_hash = aggregation_hash["top_hits"] if aggregation_hash.is_a?(Hash) && aggregation_hash.key?("top_hits")
+
+            aggregation_hash.merge!(aggregation.to_hash)
+          else
+            hash[field_or_hash].merge!(aggregation.to_hash)
+          end
         end
 
         criteria.aggregation_values = (aggregation_values || {}).merge(hash)

data/lib/search_flip/aggregation.rb

@@ -6,6 +6,12 @@ module SearchFlip
   class Aggregation
     include Filterable
     include Aggregatable
+    include Paginatable
+    include Highlightable
+    include Explainable
+    include Sourceable
+    include Sortable
+    include Customable
 
     attr_reader :target
 
@@ -40,6 +46,15 @@ module SearchFlip
         end
       end
 
+      res.update(from: offset_value_with_default, size: limit_value_with_default) if offset_value || limit_value
+
+      res[:explain] = explain_value unless explain_value.nil?
+      res[:highlight] = highlight_values if highlight_values
+      res[:sort] = sort_values if sort_values
+      res[:_source] = source_value unless source_value.nil?
+
+      res.update(custom_value) if custom_value
+
       res
     end
 
@@ -56,11 +71,10 @@ module SearchFlip
 
       fresh.tap do |aggregation|
         unsupported_methods = [
-          :profile_value, :failsafe_value, :terminate_after_value, :timeout_value, :offset_value, :limit_value,
-          :scroll_args, :highlight_values, :suggest_values, :custom_value, :source_value, :sort_values,
-          :includes_values, :preload_values, :eager_load_values, :post_must_values,
-          :post_must_not_values, :post_filter_values, :preference_value,
-          :search_type_value, :routing_value
+          :profile_value, :failsafe_value, :terminate_after_value, :timeout_value, :scroll_args,
+          :suggest_values, :includes_values, :preload_values, :eager_load_values, :post_must_values,
+          :post_must_not_values, :post_filter_values, :preference_value, :search_type_value,
+          :routing_value
         ]
 
         unsupported_methods.each do |unsupported_method|
@@ -69,10 +83,19 @@ module SearchFlip
           end
         end
 
+        aggregation.source_value = other.source_value if other.source_value
+        aggregation.offset_value = other.offset_value if other.offset_value
+        aggregation.limit_value = other.limit_value if other.limit_value
+        aggregation.scroll_args = other.scroll_args if other.scroll_args
+        aggregation.explain_value = other.explain_value unless other.explain_value.nil?
+
+        aggregation.sort_values = (aggregation.sort_values || []) + other.sort_values if other.sort_values
         aggregation.must_values = (aggregation.must_values || []) + other.must_values if other.must_values
         aggregation.must_not_values = (aggregation.must_not_values || []) + other.must_not_values if other.must_not_values
         aggregation.filter_values = (aggregation.filter_values || []) + other.filter_values if other.filter_values
 
+        aggregation.highlight_values = (aggregation.highlight_values || {}).merge(other.highlight_values) if other.highlight_values
+        aggregation.custom_value = (aggregation.custom_value || {}).merge(other.custom_value) if other.custom_value
         aggregation.aggregation_values = (aggregation.aggregation_values || {}).merge(other.aggregation_values) if other.aggregation_values
       end
     end
@@ -89,6 +112,8 @@ module SearchFlip
       end
     end
 
+    ruby2_keywords :method_missing
+
     # @api private
     #
     # Simply dups the object for api compatability.

data/lib/search_flip/bulk.rb

@@ -77,7 +77,7 @@ module SearchFlip
     #   and versioning
 
     def index(id, object, options = {})
-      perform :index, id, SearchFlip::JSON.generate(object), options
+      perform(:index, id, SearchFlip::JSON.generate(object), options)
     end
 
     # @api private
@@ -86,7 +86,7 @@ module SearchFlip
     #
     # @see #index
 
-    def import(*args)
+    ruby2_keywords def import(*args)
       index(*args)
     end
 
@@ -100,7 +100,7 @@ module SearchFlip
     #   and versioning
 
     def create(id, object, options = {})
-      perform :create, id, SearchFlip::JSON.generate(object), options
+      perform(:create, id, SearchFlip::JSON.generate(object), options)
     end
 
     # @api private
@@ -113,7 +113,7 @@ module SearchFlip
     #   and versioning
 
     def update(id, object, options = {})
-      perform :update, id, SearchFlip::JSON.generate(object), options
+      perform(:update, id, SearchFlip::JSON.generate(object), options)
     end
 
     # @api private
@@ -125,7 +125,7 @@ module SearchFlip
     #   and versioning
 
     def delete(id, options = {})
-      perform :delete, id, nil, options
+      perform(:delete, id, nil, options)
     end
 
     private

data/lib/search_flip/config.rb

@@ -4,6 +4,7 @@ module SearchFlip
     base_url: "http://127.0.0.1:9200",
     bulk_limit: 1_000,
     bulk_max_mb: 100,
-    auto_refresh: false
+    auto_refresh: false,
+    instrumenter: NullInstrumenter.new
   }
 end

data/lib/search_flip/criteria.rb

@@ -13,15 +13,20 @@ module SearchFlip
   #   CommentIndex.sort("_doc").find_each { |comment| "..." }
 
   class Criteria
+    include Sortable
+    include Sourceable
+    include Highlightable
+    include Explainable
+    include Paginatable
+    include Customable
     include Filterable
     include PostFilterable
     include Aggregatable
     extend Forwardable
 
-    attr_accessor :target, :profile_value, :source_value, :sort_values, :highlight_values, :suggest_values,
-      :offset_value, :limit_value, :includes_values, :eager_load_values, :preload_values, :failsafe_value,
-      :scroll_args, :custom_value, :terminate_after_value, :timeout_value, :preference_value, :search_type_value,
-      :routing_value, :track_total_hits_value, :explain_value
+    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
 
     # Creates a new criteria while merging the attributes (constraints,
     # settings, etc) of the current criteria with the attributes of another one
@@ -71,22 +76,6 @@ module SearchFlip
       end
     end
 
-    # Specifies whether or not to enable explanation for each hit on how
-    # its score was computed.
-    #
-    # @example
-    #   CommentIndex.explain(true)
-    #
-    # @param value [Boolean] The value for explain
-    #
-    # @return [SearchFlip::Criteria] A newly created extended criteria
-
-    def explain(value)
-      fresh.tap do |criteria|
-        criteria.explain_value = value
-      end
-    end
-
     # Specifies if or how many hits should be counted/tracked. Check out the
     # elasticsearch docs for futher details.
     #
@@ -217,7 +206,7 @@ module SearchFlip
     #
     # @return [SearchFlip::Criteria] Simply returns self
 
-    def with_settings(*args)
+    ruby2_keywords def with_settings(*args)
       fresh.tap do |criteria|
         criteria.target = target.with_settings(*args)
       end
@@ -230,81 +219,46 @@ module SearchFlip
     # @return [Hash] The generated request object
 
     def request
-      res = {}
-
-      if must_values || must_not_values || filter_values
-        res[:query] = {
-          bool: {
-            must: must_values.to_a,
-            must_not: must_not_values.to_a,
-            filter: filter_values.to_a
-          }.reject { |_, value| value.empty? }
-        }
-      end
-
-      res.update(from: offset_value_with_default, size: limit_value_with_default)
-
-      res[:track_total_hits] = track_total_hits_value unless track_total_hits_value.nil?
-      res[:explain] = explain_value unless explain_value.nil?
-      res[:timeout] = timeout_value if timeout_value
-      res[:terminate_after] = terminate_after_value if terminate_after_value
-      res[:highlight] = highlight_values if highlight_values
-      res[:suggest] = suggest_values if suggest_values
-      res[:sort] = sort_values if sort_values
-      res[:aggregations] = aggregation_values if aggregation_values
-
-      if post_must_values || post_must_not_values || post_filter_values
-        res[:post_filter] = {
-          bool: {
-            must: post_must_values.to_a,
-            must_not: post_must_not_values.to_a,
-            filter: post_filter_values.to_a
-          }.reject { |_, value| value.empty? }
-        }
-      end
-
-      res[:_source] = source_value unless source_value.nil?
-      res[:profile] = true if profile_value
+      @request ||= begin
+        res = {}
+
+        if must_values || must_not_values || filter_values
+          res[:query] = {
+            bool: {
+              must: must_values.to_a,
+              must_not: must_not_values.to_a,
+              filter: filter_values.to_a
+            }.reject { |_, value| value.empty? }
+          }
+        end
 
-      res.update(custom_value) if custom_value
+        res.update(from: offset_value_with_default, size: limit_value_with_default)
+
+        res[:track_total_hits] = track_total_hits_value unless track_total_hits_value.nil?
+        res[:explain] = explain_value unless explain_value.nil?
+        res[:timeout] = timeout_value if timeout_value
+        res[:terminate_after] = terminate_after_value if terminate_after_value
+        res[:highlight] = highlight_values if highlight_values
+        res[:suggest] = suggest_values if suggest_values
+        res[:sort] = sort_values if sort_values
+        res[:aggregations] = aggregation_values if aggregation_values
+
+        if post_must_values || post_must_not_values || post_filter_values
+          res[:post_filter] = {
+            bool: {
+              must: post_must_values.to_a,
+              must_not: post_must_not_values.to_a,
+              filter: post_filter_values.to_a
+            }.reject { |_, value| value.empty? }
+          }
+        end
 
-      res
-    end
+        res[:_source] = source_value unless source_value.nil?
+        res[:profile] = true if profile_value
 
-    # Adds highlighting of the given fields to the request.
-    #
-    # @example
-    #   CommentIndex.highlight([:title, :message])
-    #   CommentIndex.highlight(:title).highlight(:description)
-    #   CommentIndex.highlight(:title, require_field_match: false)
-    #   CommentIndex.highlight(title: { type: "fvh" })
-    #
-    # @example
-    #   query = CommentIndex.highlight(:title).search("hello")
-    #   query.results[0].highlight.title # => "<em>hello</em> world"
-    #
-    # @param fields [Hash, Array, String, Symbol] The fields to highligt.
-    #   Supports raw Elasticsearch values by passing a Hash.
-    #
-    # @param options [Hash] Extra highlighting options. Check out the Elasticsearch
-    #   docs for further details.
-    #
-    # @return [SearchFlip::Criteria] A new criteria including the highlighting
+        res.update(custom_value) if custom_value
 
-    def highlight(fields, options = {})
-      fresh.tap do |criteria|
-        criteria.highlight_values = (criteria.highlight_values || {}).merge(options)
-
-        hash =
-          if fields.is_a?(Hash)
-            fields
-          elsif fields.is_a?(Array)
-            fields.each_with_object({}) { |field, h| h[field] = {} }
-          else
-            { fields => {} }
-          end
-
-        criteria.highlight_values[:fields] = (criteria.highlight_values[:fields] || {}).merge(hash)
+        res
       end
     end
 
@@ -397,24 +351,6 @@ module SearchFlip
       true
     end
 
-    # Use to specify which fields of the source document you want Elasticsearch
-    # to return for each matching result.
-    #
-    # @example
-    #   CommentIndex.source([:id, :message]).search("hello world")
-    #   CommentIndex.source(exclude: "description")
-    #   CommentIndex.source(false)
-    #
-    # @param value Pass any allowed value to restrict the returned source
-    #
-    # @return [SearchFlip::Criteria] A newly created extended criteria
-
-    def source(value)
-      fresh.tap do |criteria|
-        criteria.source_value = value
-      end
-    end
-
     # Specify associations of the target model you want to include via
     # ActiveRecord's or other ORM's mechanisms when records get fetched from
     # the database.
@@ -472,166 +408,6 @@ module SearchFlip
       end
     end
 
-    # Specify the sort order you want Elasticsearch to use for sorting the
-    # results. When you call this multiple times, the sort orders are appended
-    # to the already existing ones. The sort arguments get passed to
-    # Elasticsearch without modifications, such that you can use sort by
-    # script, etc here as well.
-    #
-    # @example Default usage
-    #   CommentIndex.sort(:user_id, :id)
-    #
-    #   # Same as
-    #
-    #   CommentIndex.sort(:user_id).sort(:id)
-    #
-    # @example Default hash usage
-    #   CommentIndex.sort(user_id: "asc").sort(id: "desc")
-    #
-    #   # Same as
-    #
-    #   CommentIndex.sort({ user_id: "asc" }, { id: "desc" })
-    #
-    # @example Sort by native script
-    #   CommentIndex.sort("_script" => "sort_script", lang: "native", order: "asc", type: "number")
-    #
-    # @param args The sort values that get passed to Elasticsearch
-    #
-    # @return [SearchFlip::Criteria] A newly created extended criteria
-
-    def sort(*args)
-      fresh.tap do |criteria|
-        criteria.sort_values = (sort_values || []) + args
-      end
-    end
-
-    alias_method :order, :sort
-
-    # Specify the sort order you want Elasticsearch to use for sorting the
-    # results with already existing sort orders being removed.
-    #
-    # @example
-    #   CommentIndex.sort(user_id: "asc").resort(id: "desc")
-    #
-    #   # Same as
-    #
-    #   CommentIndex.sort(id: "desc")
-    #
-    # @return [SearchFlip::Criteria] A newly created extended criteria
-    #
-    # @see #sort See #sort for more details
-
-    def resort(*args)
-      fresh.tap do |criteria|
-        criteria.sort_values = args
-      end
-    end
-
-    alias_method :reorder, :resort
-
-    # Adds a fully custom field/section to the request, such that upcoming or
-    # minor Elasticsearch features as well as other custom requirements can be
-    # used without having yet specialized criteria methods.
-    #
-    # @note Use with caution, because using #custom will potentiall override
-    #   other sections like +aggregations+, +query+, +sort+, etc if you use the
-    #   the same section names.
-    #
-    # @example
-    #   CommentIndex.custom(section: { argument: "value" }).request
-    #   => {:section=>{:argument=>"value"},...}
-    #
-    # @param hash [Hash] The custom section that is added to the request
-    #
-    # @return [SearchFlip::Criteria] A newly created extended criteria
-
-    def custom(hash)
-      fresh.tap do |criteria|
-        criteria.custom_value = (custom_value || {}).merge(hash)
-      end
-    end
-
-    # Sets the request offset, ie SearchFlip's from parameter that is used
-    # to skip results in the result set from being returned.
-    #
-    # @example
-    #   CommentIndex.offset(100)
-    #
-    # @param value [Fixnum] The offset value, ie the number of results that are
-    #   skipped in the result set
-    #
-    # @return [SearchFlip::Criteria] A newly created extended criteria
-
-    def offset(value)
-      fresh.tap do |criteria|
-        criteria.offset_value = value.to_i
-      end
-    end
-
-    # @api private
-    #
-    # Returns the offset value or, if not yet set,  the default limit value (0).
-    #
-    # @return [Fixnum] The offset value
-
-    def offset_value_with_default
-      (offset_value || 0).to_i
-    end
-
-    # Sets the request limit, ie Elasticsearch's size parameter that is used
-    # to restrict the results that get returned.
-    #
-    # @example
-    #   CommentIndex.limit(100)
-    #
-    # @param value [Fixnum] The limit value, ie the max number of results that
-    #   should be returned
-    #
-    # @return [SearchFlip::Criteria] A newly created extended criteria
-
-    def limit(value)
-      fresh.tap do |criteria|
-        criteria.limit_value = value.to_i
-      end
-    end
-
-    # @api private
-    #
-    # Returns the limit value or, if not yet set, the default limit value (30).
-    #
-    # @return [Fixnum] The limit value
-
-    def limit_value_with_default
-      (limit_value || 30).to_i
-    end
-
-    # Sets pagination parameters for the criteria by using offset and limit,
-    # ie Elasticsearch's from and size parameters.
-    #
-    # @example
-    #   CommentIndex.paginate(page: 3)
-    #   CommentIndex.paginate(page: 5, per_page: 60)
-    #
-    # @param page [#to_i] The current page
-    # @param per_page [#to_i] The number of results per page
-    #
-    # @return [SearchFlip::Criteria] A newly created extended criteria
-
-    def paginate(page: 1, per_page: 30)
-      page = [page.to_i, 1].max
-      per_page = per_page.to_i
-
-      offset((page - 1) * per_page).limit(per_page)
-    end
-
-    def page(value)
-      paginate(page: value, per_page: limit_value_with_default)
-    end
-
-    def per(value)
-      paginate(page: 1 + (offset_value_with_default / limit_value_with_default), per_page: value)
-    end
-
     # Fetches the records specified by the criteria in batches using the
     # ElasicSearch scroll API and yields each batch. The batch size and scroll
     # API timeout can be specified. Check out the Elasticsearch docs for
@@ -746,30 +522,13 @@ module SearchFlip
 
     def execute
       @response ||= begin
-        http_request = connection.http_client.headers(accept: "application/json")
-
-        http_response =
-          if scroll_args && scroll_args[:id]
-            http_request.post(
-              "#{connection.base_url}/_search/scroll",
-              params: request_params,
-              json: { scroll: scroll_args[:timeout], scroll_id: scroll_args[:id] }
-            )
-          elsif scroll_args
-            http_request.post(
-              "#{target.type_url}/_search",
-              params: request_params.merge(scroll: scroll_args[:timeout]),
-              json: request
-            )
-          else
-            http_request.post("#{target.type_url}/_search", params: request_params, json: request)
-          end
-
-        SearchFlip::Response.new(self, http_response.parse)
-      rescue SearchFlip::ConnectionError, SearchFlip::ResponseError => e
-        raise e unless failsafe_value
-
-        SearchFlip::Response.new(self, "took" => 0, "hits" => { "total" => 0, "hits" => [] })
+        Config[:instrumenter].instrument("request.search_flip", index: target, request: request) do |payload|
+          response = execute!
+
+          payload[:response] = response
+
+          response
+        end
       end
     end
 
@@ -811,6 +570,7 @@ module SearchFlip
 
     def fresh
       dup.tap do |criteria|
+        criteria.instance_variable_set(:@request, nil)
         criteria.instance_variable_set(:@response, nil)
       end
     end
@@ -827,6 +587,8 @@ module SearchFlip
       end
     end
 
+    ruby2_keywords :method_missing
+
     def_delegators :response, :total_entries, :total_count, :current_page, :previous_page,
       :prev_page, :next_page, :first_page?, :last_page?, :out_of_range?, :total_pages,
       :hits, :ids, :count, :size, :length, :took, :aggregations, :suggestions,
@@ -836,6 +598,33 @@ module SearchFlip
 
     private
 
+    def execute!
+      http_request = connection.http_client.headers(accept: "application/json")
+
+      http_response =
+        if scroll_args && scroll_args[:id]
+          http_request.post(
+            "#{connection.base_url}/_search/scroll",
+            params: request_params,
+            json: { scroll: scroll_args[:timeout], scroll_id: scroll_args[:id] }
+          )
+        elsif scroll_args
+          http_request.post(
+            "#{target.type_url}/_search",
+            params: request_params.merge(scroll: scroll_args[:timeout]),
+            json: request
+          )
+        else
+          http_request.post("#{target.type_url}/_search", params: request_params, json: request)
+        end
+
+      SearchFlip::Response.new(self, http_response.parse)
+    rescue SearchFlip::ConnectionError, SearchFlip::ResponseError => e
+      raise e unless failsafe_value
+
+      SearchFlip::Response.new(self, "took" => 0, "hits" => { "total" => 0, "hits" => [] })
+    end
+
     def yield_in_batches(options = {})
       return enum_for(:yield_in_batches, options) unless block_given?