searchkick 6.0.3 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf43f99e5f6ced971320bdf629e3454e7c8f2fb111c64a0967182ef51aa942d0
-  data.tar.gz: a891ac1f9b25f25efc47836887a68a261659fe87e2754cf203f3210b855b2e31
+  metadata.gz: 33be926c61ab632ecf611bce7ceecc0f23cec9eedde74758b66c297936e48293
+  data.tar.gz: c9dd60ae1fe20336066554d08c042a2fde153d7d1bb2e49bacc32219a3943915
 SHA512:
-  metadata.gz: 2a5a20df662acbcea24702c9a5c22327e54ba9bd223896fcfcc9886fd3087edbbf59b8d806a4248e4f65b7e0df530f90788bf9d54bbce796ec5f267f83fd2caf
-  data.tar.gz: 54567b34c84d4444d12d71546d13c2c8569b1dfe710dbe0de0662cde80f16973afe37125c931733787df729bdb853f9c34a66ceb1a094962b84f4c16c79f42af
+  metadata.gz: 95ebb7c3cc4d511a7f75a1cef3f73f64e1bbf8242c18091cbacfe71bcd244840538c11f2c83db0a676f90c442668f4a1cb1c320d6e970a23bec00ee7ccec2935
+  data.tar.gz: eb7638d2cda8512314894dbcd205ccff57293b332f3e52e3fdbd4a8bb6359ea8cb309b2bd53b3b7c67515538e07422e16eca919092757106307abd22781df603

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 6.1.0 (2026-02-18)
+
+- Added `per` method
+- Fixed error with `aggs` method and non-hash arguments
+- Fixed smart aggs behavior when multiple `where` calls
+
 ## 6.0.3 (2026-01-06)
 
 - Fixed `inspect` method for `Relation`

data/lib/searchkick/query.rb

@@ -872,10 +872,21 @@ module Searchkick
           }
         end
 
-        where = {}
-        where = ensure_permitted(options[:where] || {}).reject { |k| k == field } unless options[:smart_aggs] == false
         agg_where = ensure_permitted(agg_options[:where] || {})
-        agg_filters = where_filters(where.merge(agg_where))
+        if options[:smart_aggs] != false && options[:where]
+          where = ensure_permitted(options[:where])
+          where_without_field = where.reject { |k| k == field }
+          # where_without_field = where_without_field(where, field.to_s)
+          if where_without_field.any?
+            if agg_where.any?
+              agg_where = where.merge(agg_where)
+              # agg_where = combine_agg_where(agg_where, where_without_field)
+            else
+              agg_where = where_without_field
+            end
+          end
+        end
+        agg_filters = where_filters(agg_where)
 
         # only do one level comparison for simplicity
         filters.select! do |filter|
@@ -902,6 +913,53 @@ module Searchkick
       end
     end
 
+    def where_without_field(where, field)
+      result = {}
+      where.each do |f, v|
+        case f
+        when :_and
+          r = v.map { |v2| where_without_field(v2, field) }.reject(&:empty?)
+          result[f] = r unless r.empty?
+        when :_or
+          r = v.map { |v2| where_without_field(v2, field) }
+          result[f] = r unless r.any?(&:empty?)
+        when :or
+          r = v.map { |v2| v2.map { |v3| where_without_field(v3, field) }.reject { |v2| v2.any?(&:empty?) } }
+          result[f] = r unless r.empty?
+        when :_not
+          r = where_without_field(v, field)
+          result[f] = r unless r.empty?
+        when :_script
+          result[f] = v
+        else
+          if f.to_s != field
+            result[f] = v
+          end
+        end
+      end
+      result
+    end
+
+    def combine_agg_where(agg_where, where)
+      result = agg_where.dup
+      field_keys = result.except(:_and, :_or, :or, :_not, :_script).transform_keys(&:to_s)
+      where.each do |f, v|
+        case f
+        when :_and, :_or, :or, :_not, :_script
+          if result.key?(f)
+            # combine with _and if needed
+            result[:_and] ||= []
+            result[:_and] += [{f => v}]
+          else
+            result[f] = v
+          end
+        else
+          result[f] = v unless field_keys.include?(f.to_s)
+        end
+      end
+      result
+    end
+
     def set_knn(payload, knn, per_page, offset)
       if term != "*"
         raise ArgumentError, "Use Searchkick.multi_search for hybrid search"
@@ -1049,6 +1107,7 @@ module Searchkick
       (where || {}).each do |field, value|
         field = :_id if field.to_s == "id"
 
+        # update smart aggs when adding new symbol
         if field == :or
           value.each do |or_clause|
             filters << {bool: {should: or_clause.map { |or_statement| {bool: {filter: where_filters(or_statement)}} }}}

data/lib/searchkick/relation.rb

@@ -17,7 +17,7 @@ module Searchkick
       @options = options
 
       # generate query to validate options
-      query
+      query if options.any?
     end
 
     # same as Active Record
@@ -27,17 +27,26 @@ module Searchkick
       "#<#{self.class.name} [#{entries.join(', ')}]>"
     end
 
-    def aggs(value = NO_DEFAULT_VALUE)
-      if value == NO_DEFAULT_VALUE
+    def aggs(*args, **kwargs)
+      if args.empty? && kwargs.empty?
         private_execute.aggs
       else
-        clone.aggs!(value)
+        clone.aggs!(*args, **kwargs)
       end
     end
 
-    def aggs!(value)
+    def aggs!(*args, **kwargs)
       check_loaded
-      (@options[:aggs] ||= {}).merge!(value)
+      aggs = {}
+      args.flatten.each do |arg|
+        if arg.is_a?(Hash)
+          aggs.merge!(arg)
+        else
+          aggs[arg] = {}
+        end
+      end
+      aggs.merge!(kwargs)
+      merge_option(:aggs, aggs)
       self
     end
 
@@ -61,7 +70,7 @@ module Searchkick
 
     def body_options!(value)
       check_loaded
-      (@options[:body_options] ||= {}).merge!(value)
+      merge_option(:body_options, value)
       self
     end
 
@@ -86,7 +95,7 @@ module Searchkick
       elsif !value.is_a?(Hash)
         value = {value => {factor: 1}}
       end
-      (@options[:boost_by] ||= {}).merge!(value)
+      merge_option(:boost_by, value)
       self
     end
 
@@ -98,7 +107,7 @@ module Searchkick
       check_loaded
       # legacy format
       value = {value[:field] => value.except(:field)} if value[:field]
-      (@options[:boost_by_distance] ||= {}).merge!(value)
+      merge_option(:boost_by_distance, value)
       self
     end
 
@@ -108,7 +117,7 @@ module Searchkick
 
     def boost_by_recency!(value)
       check_loaded
-      (@options[:boost_by_recency] ||= {}).merge!(value)
+      merge_option(:boost_by_recency, value)
       self
     end
 
@@ -119,7 +128,7 @@ module Searchkick
     def boost_where!(value)
       check_loaded
       # TODO merge duplicate fields
-      (@options[:boost_where] ||= {}).merge!(value)
+      merge_option(:boost_where, value)
       self
     end
 
@@ -189,7 +198,7 @@ module Searchkick
 
     def exclude!(*values)
       check_loaded
-      (@options[:exclude] ||= []).concat(values.flatten)
+      concat_option(:exclude, values.flatten)
       self
     end
 
@@ -209,7 +218,7 @@ module Searchkick
 
     def fields!(*values)
       check_loaded
-      (@options[:fields] ||= []).concat(values.flatten)
+      concat_option(:fields, values.flatten)
       self
     end
 
@@ -229,7 +238,7 @@ module Searchkick
 
     def includes!(*values)
       check_loaded
-      (@options[:includes] ||= []).concat(values.flatten)
+      concat_option(:includes, values.flatten)
       self
     end
 
@@ -243,7 +252,7 @@ module Searchkick
       if values.all? { |v| v.respond_to?(:searchkick_index) }
         models!(*values)
       else
-        (@options[:index_name] ||= []).concat(values)
+        concat_option(:index_name, values)
         self
       end
     end
@@ -254,7 +263,7 @@ module Searchkick
 
     def indices_boost!(value)
       check_loaded
-      (@options[:indices_boost] ||= {}).merge!(value)
+      merge_option(:indices_boost, value)
       self
     end
 
@@ -319,7 +328,7 @@ module Searchkick
 
     def models!(*values)
       check_loaded
-      (@options[:models] ||= []).concat(values.flatten)
+      concat_option(:models, values.flatten)
       self
     end
 
@@ -329,7 +338,7 @@ module Searchkick
 
     def model_includes!(*values)
       check_loaded
-      (@options[:model_includes] ||= []).concat(values.flatten)
+      concat_option(:model_includes, values.flatten)
       self
     end
 
@@ -373,7 +382,7 @@ module Searchkick
 
     def order!(*values)
       check_loaded
-      (@options[:order] ||= []).concat(values.flatten)
+      concat_option(:order, values.flatten)
       self
     end
 
@@ -409,6 +418,10 @@ module Searchkick
       end
     end
 
+    def per(value)
+      per_page(value)
+    end
+
     def per_page!(value)
       check_loaded
       # TODO set limit?
@@ -432,7 +445,7 @@ module Searchkick
 
     def request_params!(value)
       check_loaded
-      (@options[:request_params] ||= {}).merge!(value)
+      merge_option(:request_params, value)
       self
     end
 
@@ -482,7 +495,7 @@ module Searchkick
 
     def select!(*values)
       check_loaded
-      (@options[:select] ||= []).concat(values.flatten)
+      concat_option(:select, values.flatten)
       self
     end
 
@@ -546,7 +559,7 @@ module Searchkick
 
     def type!(*values)
       check_loaded
-      (@options[:type] ||= []).concat(values.flatten)
+      concat_option(:type, values.flatten)
       self
     end
 
@@ -560,10 +573,18 @@ module Searchkick
 
     def where!(value)
       check_loaded
+      value = ensure_permitted(value)
       if @options[:where]
-        @options[:where] = {_and: [@options[:where], ensure_permitted(value)]}
+        if @options[:where][:_and].is_a?(Array)
+          merge_option(:where, {_and: @options[:where][:_and] + [value]})
+        # keep simple when possible for smart aggs
+        elsif !@options[:where].keys.intersect?(value.keys)
+          merge_option(:where, value)
+        else
+          @options[:where] = {_and: [@options[:where], value]}
+        end
       else
-        @options[:where] = ensure_permitted(value)
+        @options[:where] = value
       end
       self
     end
@@ -683,7 +704,25 @@ module Searchkick
 
     def initialize_copy(other)
       super
+      # shallow dup and avoid updating values in-place
+      @options = @options.dup
       @execute = nil
     end
+
+    def concat_option(key, value)
+      if @options[key]
+        @options[key] += value
+      else
+        @options[key] = value.to_ary
+      end
+    end
+
+    def merge_option(key, value)
+      if @options[key]
+        @options[key] = @options[key].merge(value)
+      else
+        @options[key] = value.to_hash
+      end
+    end
   end
 end

data/lib/searchkick/version.rb

@@ -1,3 +1,3 @@
 module Searchkick
-  VERSION = "6.0.3"
+  VERSION = "6.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: searchkick
 version: !ruby/object:Gem::Version
-  version: 6.0.3
+  version: 6.1.0
 platform: ruby
 authors:
 - Andrew Kane