Refactor aggs method to accept positional and keyword arguments (#1739)

Author: james-reading

lib/searchkick/relation.rb

@@ -27,17 +27,19 @@ def inspect
       "#<#{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)
+      @options[:aggs] ||= {}
+      @options[:aggs].merge!(args.to_h { |arg| [arg, {}] })
+      @options[:aggs].merge!(kwargs)
       self
     end
 

test/aggs_test.rb

@@ -163,6 +163,12 @@ def test_relation_smart_aggs_false
     assert_aggs ({"store_id" => {2 => 2}}), Product.search("Product").where(color: "red").aggs(store_id: {where: {in_stock: false}}).smart_aggs(false)
   end
 
+  def test_relation_with_positional_args
+    aggs = Product.search("Product").aggs(:color, store_id: {where: {in_stock: true}}).aggs
+    assert_equal ({"blue" => 1, "green" => 1, "red" => 1}), buckets_as_hash(aggs["color"])
+    assert_equal ({1 => 1}), buckets_as_hash(aggs["store_id"])
+  end
+
   protected
 
   def assert_aggs(expected, options)