searchkick 5.5.2 → 6.0.0

data/lib/searchkick/relation.rb

@@ -5,7 +5,7 @@ module Searchkick
     # note: modifying body directly is not supported
     # and has no impact on query after being executed
     # TODO freeze body object?
-    delegate :body, :params, to: :query
+    delegate :params, to: :query
     delegate_missing_to :private_execute
 
     attr_reader :model
@@ -27,26 +27,313 @@ module Searchkick
       "#<#{self.class.name} [#{entries.join(', ')}]>"
     end
 
-    def execute
-      Searchkick.warn("The execute method is no longer needed")
-      load
+    def aggs(value = NO_DEFAULT_VALUE)
+      if value == NO_DEFAULT_VALUE
+        private_execute.aggs
+      else
+        clone.aggs!(value)
+      end
+    end
+
+    def aggs!(value)
+      check_loaded
+      (@options[:aggs] ||= {}).merge!(value)
+      self
+    end
+
+    def body(value = NO_DEFAULT_VALUE)
+      if value == NO_DEFAULT_VALUE
+        query.body
+      else
+        clone.body!(value)
+      end
+    end
+
+    def body!(value)
+      check_loaded
+      @options[:body] = value
+      self
+    end
+
+    def body_options(value)
+      clone.body_options!(value)
+    end
+
+    def body_options!(value)
+      check_loaded
+      (@options[:body_options] ||= {}).merge!(value)
+      self
+    end
+
+    def boost(value)
+      clone.boost!(value)
+    end
+
+    def boost!(value)
+      check_loaded
+      @options[:boost] = value
+      self
+    end
+
+    def boost_by(value)
+      clone.boost_by!(value)
+    end
+
+    def boost_by!(value)
+      check_loaded
+      if value.is_a?(Array)
+        value = value.to_h { |f| [f, {factor: 1}] }
+      elsif !value.is_a?(Hash)
+        value = {value => {factor: 1}}
+      end
+      (@options[:boost_by] ||= {}).merge!(value)
+      self
+    end
+
+    def boost_by_distance(value)
+      clone.boost_by_distance!(value)
+    end
+
+    def boost_by_distance!(value)
+      check_loaded
+      # legacy format
+      value = {value[:field] => value.except(:field)} if value[:field]
+      (@options[:boost_by_distance] ||= {}).merge!(value)
+      self
+    end
+
+    def boost_by_recency(value)
+      clone.boost_by_recency!(value)
+    end
+
+    def boost_by_recency!(value)
+      check_loaded
+      (@options[:boost_by_recency] ||= {}).merge!(value)
+      self
+    end
+
+    def boost_where(value)
+      clone.boost_where!(value)
+    end
+
+    def boost_where!(value)
+      check_loaded
+      # TODO merge duplicate fields
+      (@options[:boost_where] ||= {}).merge!(value)
+      self
+    end
+
+    def conversions(value)
+      clone.conversions!(value)
+    end
+
+    def conversions!(value)
+      check_loaded
+      @options[:conversions] = value
+      self
+    end
+
+    def conversions_v1(value)
+      clone.conversions_v1!(value)
+    end
+
+    def conversions_v1!(value)
+      check_loaded
+      @options[:conversions_v1] = value
+      self
+    end
+
+    def conversions_v2(value)
+      clone.conversions_v2!(value)
+    end
+
+    def conversions_v2!(value)
+      check_loaded
+      @options[:conversions_v2] = value
+      self
+    end
+
+    def conversions_term(value)
+      clone.conversions_term!(value)
+    end
+
+    def conversions_term!(value)
+      check_loaded
+      @options[:conversions_term] = value
+      self
+    end
+
+    def debug(value = true)
+      clone.debug!(value)
+    end
+
+    def debug!(value = true)
+      check_loaded
+      @options[:debug] = value
+      self
+    end
+
+    def emoji(value = true)
+      clone.emoji!(value)
+    end
+
+    def emoji!(value = true)
+      check_loaded
+      @options[:emoji] = value
+      self
+    end
+
+    def exclude(*values)
+      clone.exclude!(*values)
+    end
+
+    def exclude!(*values)
+      check_loaded
+      (@options[:exclude] ||= []).concat(values.flatten)
+      self
+    end
+
+    def explain(value = true)
+      clone.explain!(value)
+    end
+
+    def explain!(value = true)
+      check_loaded
+      @options[:explain] = value
+      self
+    end
+
+    def fields(*values)
+      clone.fields!(*values)
+    end
+
+    def fields!(*values)
+      check_loaded
+      (@options[:fields] ||= []).concat(values.flatten)
+      self
+    end
+
+    def highlight(value)
+      clone.highlight!(value)
+    end
+
+    def highlight!(value)
+      check_loaded
+      @options[:highlight] = value
+      self
+    end
+
+    def includes(*values)
+      clone.includes!(*values)
+    end
+
+    def includes!(*values)
+      check_loaded
+      (@options[:includes] ||= []).concat(values.flatten)
+      self
+    end
+
+    def index_name(*values)
+      clone.index_name!(*values)
+    end
+
+    def index_name!(*values)
+      check_loaded
+      values = values.flatten
+      if values.all? { |v| v.respond_to?(:searchkick_index) }
+        models!(*values)
+      else
+        (@options[:index_name] ||= []).concat(values)
+        self
+      end
+    end
+
+    def indices_boost(value)
+      clone.indices_boost!(value)
+    end
+
+    def indices_boost!(value)
+      check_loaded
+      (@options[:indices_boost] ||= {}).merge!(value)
+      self
+    end
+
+    def knn(value)
+      clone.knn!(value)
+    end
+
+    def knn!(value)
+      check_loaded
+      @options[:knn] = value
+      self
     end
 
-    # experimental
     def limit(value)
       clone.limit!(value)
     end
 
-    # experimental
     def limit!(value)
       check_loaded
       @options[:limit] = value
       self
     end
 
-    # experimental
+    def load(value = NO_DEFAULT_VALUE)
+      if value == NO_DEFAULT_VALUE
+        private_execute
+        self
+      else
+        clone.load!(value)
+      end
+    end
+
+    def load!(value)
+      check_loaded
+      @options[:load] = value
+      self
+    end
+
+    def match(value)
+      clone.match!(value)
+    end
+
+    def match!(value)
+      check_loaded
+      @options[:match] = value
+      self
+    end
+
+    def misspellings(value)
+      clone.misspellings!(value)
+    end
+
+    def misspellings!(value)
+      check_loaded
+      @options[:misspellings] = value
+      self
+    end
+
+    def models(*values)
+      clone.models!(*values)
+    end
+
+    def models!(*values)
+      check_loaded
+      (@options[:models] ||= []).concat(values.flatten)
+      self
+    end
+
+    def model_includes(*values)
+      clone.model_includes!(*values)
+    end
+
+    def model_includes!(*values)
+      check_loaded
+      (@options[:model_includes] ||= []).concat(values.flatten)
+      self
+    end
+
     def offset(value = NO_DEFAULT_VALUE)
-      # TODO remove in Searchkick 6
       if value == NO_DEFAULT_VALUE
         private_execute.offset
       else
@@ -54,28 +341,67 @@ module Searchkick
       end
     end
 
-    # experimental
     def offset!(value)
       check_loaded
       @options[:offset] = value
       self
     end
 
-    # experimental
+    def opaque_id(value)
+      clone.opaque_id!(value)
+    end
+
+    def opaque_id!(value)
+      check_loaded
+      @options[:opaque_id] = value
+      self
+    end
+
+    def operator(value)
+      clone.operator!(value)
+    end
+
+    def operator!(value)
+      check_loaded
+      @options[:operator] = value
+      self
+    end
+
+    def order(*values)
+      clone.order!(*values)
+    end
+
+    def order!(*values)
+      check_loaded
+      (@options[:order] ||= []).concat(values.flatten)
+      self
+    end
+
+    def padding(value = NO_DEFAULT_VALUE)
+      if value == NO_DEFAULT_VALUE
+        private_execute.padding
+      else
+        clone.padding!(value)
+      end
+    end
+
+    def padding!(value)
+      check_loaded
+      @options[:padding] = value
+      self
+    end
+
     def page(value)
       clone.page!(value)
     end
 
-    # experimental
     def page!(value)
       check_loaded
       @options[:page] = value
       self
     end
 
-    # experimental
     def per_page(value = NO_DEFAULT_VALUE)
-      # TODO remove in Searchkick 6
       if value == NO_DEFAULT_VALUE
         private_execute.per_page
       else
@@ -83,71 +409,69 @@ module Searchkick
       end
     end
 
-    # experimental
     def per_page!(value)
       check_loaded
+      # TODO set limit?
       @options[:per_page] = value
       self
     end
 
-    # experimental
-    def where(value = NO_DEFAULT_VALUE)
-      if value == NO_DEFAULT_VALUE
-        Where.new(self)
-      else
-        clone.where!(value)
-      end
+    def profile(value = true)
+      clone.profile!(value)
     end
 
-    # experimental
-    def where!(value)
+    def profile!(value = true)
       check_loaded
-      if @options[:where]
-        @options[:where] = {_and: [@options[:where], ensure_permitted(value)]}
-      else
-        @options[:where] = ensure_permitted(value)
-      end
+      @options[:profile] = value
       self
     end
 
-    # experimental
-    def rewhere(value)
-      clone.rewhere!(value)
+    def request_params(value)
+      clone.request_params!(value)
     end
 
-    # experimental
-    def rewhere!(value)
+    def request_params!(value)
       check_loaded
-      @options[:where] = ensure_permitted(value)
+      (@options[:request_params] ||= {}).merge!(value)
       self
     end
 
-    # experimental
-    def order(*values)
-      clone.order!(*values)
+    def routing(value)
+      clone.routing!(value)
     end
 
-    # experimental
-    def order!(*values)
-      values = values.first if values.size == 1 && values.first.is_a?(Array)
+    def routing!(value)
       check_loaded
-      (@options[:order] ||= []).concat(values)
+      @options[:routing] = value
       self
     end
 
-    # experimental
-    def reorder(*values)
-      clone.reorder!(*values)
+    def scope_results(value)
+      clone.scope_results!(value)
     end
 
-    # experimental
-    def reorder!(*values)
+    def scope_results!(value)
       check_loaded
-      @options[:order] = values
+      @options[:scope_results] = value
+      self
+    end
+
+    def scroll(value = NO_DEFAULT_VALUE, &block)
+      if value == NO_DEFAULT_VALUE
+        private_execute.scroll(&block)
+      elsif block_given?
+        clone.scroll!(value).scroll(&block)
+      else
+        clone.scroll!(value)
+      end
+    end
+
+    def scroll!(value)
+      check_loaded
+      @options[:scroll] = value
       self
     end
 
-    # experimental
     def select(*values, &block)
       if block_given?
         private_execute.select(*values, &block)
@@ -156,65 +480,173 @@ module Searchkick
       end
     end
 
-    # experimental
     def select!(*values)
       check_loaded
-      (@options[:select] ||= []).concat(values)
+      (@options[:select] ||= []).concat(values.flatten)
+      self
+    end
+
+    def similar(value = true)
+      clone.similar!(value)
+    end
+
+    def similar!(value = true)
+      check_loaded
+      @options[:similar] = value
+      self
+    end
+
+    def smart_aggs(value)
+      clone.smart_aggs!(value)
+    end
+
+    def smart_aggs!(value)
+      check_loaded
+      @options[:smart_aggs] = value
+      self
+    end
+
+    def suggest(value = true)
+      clone.suggest!(value)
+    end
+
+    def suggest!(value = true)
+      check_loaded
+      @options[:suggest] = value
+      self
+    end
+
+    def total_entries(value = NO_DEFAULT_VALUE)
+      if value == NO_DEFAULT_VALUE
+        private_execute.total_entries
+      else
+        clone.total_entries!(value)
+      end
+    end
+
+    def total_entries!(value)
+      check_loaded
+      @options[:total_entries] = value
+      self
+    end
+
+    def track(value = true)
+      clone.track!(value)
+    end
+
+    def track!(value = true)
+      check_loaded
+      @options[:track] = value
+      self
+    end
+
+    def type(*values)
+      clone.type!(*values)
+    end
+
+    def type!(*values)
+      check_loaded
+      (@options[:type] ||= []).concat(values.flatten)
+      self
+    end
+
+    def where(value = NO_DEFAULT_VALUE)
+      if value == NO_DEFAULT_VALUE
+        Where.new(self)
+      else
+        clone.where!(value)
+      end
+    end
+
+    def where!(value)
+      check_loaded
+      if @options[:where]
+        @options[:where] = {_and: [@options[:where], ensure_permitted(value)]}
+      else
+        @options[:where] = ensure_permitted(value)
+      end
+      self
+    end
+
+    def first(value = NO_DEFAULT_VALUE)
+      result =
+        if loaded?
+          private_execute
+        else
+          limit = value == NO_DEFAULT_VALUE ? 1 : value
+          previous_limit = (@options[:limit] || @options[:per_page])&.to_i
+          if previous_limit && previous_limit < limit
+            limit = previous_limit
+          end
+          limit(limit).load
+        end
+
+      if value == NO_DEFAULT_VALUE
+        result.first
+      else
+        result.first(value)
+      end
+    end
+
+    def pluck(*keys)
+      if @options[:load] == false
+        select(*keys).send(:private_execute).pluck(*keys)
+      else
+        private_execute.pluck(*keys)
+      end
+    end
+
+    def reorder(*values)
+      clone.reorder!(*values)
+    end
+
+    def reorder!(*values)
+      check_loaded
+      @options[:order] = values
       self
     end
 
-    # experimental
     def reselect(*values)
       clone.reselect!(*values)
     end
 
-    # experimental
     def reselect!(*values)
       check_loaded
       @options[:select] = values
       self
     end
 
-    # experimental
-    def includes(*values)
-      clone.includes!(*values)
+    def rewhere(value)
+      clone.rewhere!(value)
     end
 
-    # experimental
-    def includes!(*values)
+    def rewhere!(value)
       check_loaded
-      (@options[:includes] ||= []).concat(values)
+      @options[:where] = ensure_permitted(value)
       self
     end
 
-    # experimental
     def only(*keys)
       Relation.new(@model, @term, **@options.slice(*keys))
     end
 
-    # experimental
     def except(*keys)
       Relation.new(@model, @term, **@options.except(*keys))
     end
 
-    # experimental
-    def load
-      private_execute
-      self
-    end
-
     def loaded?
       !@execute.nil?
     end
 
-    def respond_to_missing?(method_name, include_all)
-      Results.new(nil, nil, nil).respond_to?(method_name, include_all) || super
+    undef_method :respond_to_missing?
+
+    def respond_to_missing?(...)
+      Results.new(nil, nil, nil).respond_to?(...) || super
     end
 
-    # TODO uncomment in 6.0
-    # def to_yaml
-    #   private_execute.to_a.to_yaml
-    # end
+    def to_yaml
+      private_execute.to_a.to_yaml
+    end
 
     private