Restored backwards compatibility for aggs method - #1739

Author: ankane

lib/searchkick/relation.rb

@@ -38,7 +38,13 @@ def aggs(*args, **kwargs)
     def aggs!(*args, **kwargs)
       check_loaded
       @options[:aggs] ||= {}
-      @options[:aggs].merge!(args.to_h { |arg| [arg, {}] })
+      args.flatten.each do |arg|
+        if arg.is_a?(Hash)
+          @options[:aggs].merge!(arg)
+        else
+          @options[:aggs][arg] = {}
+        end
+      end
       @options[:aggs].merge!(kwargs)
       self
     end

test/aggs_test.rb

@@ -156,7 +156,15 @@ def test_body_options
   end
 
   def test_relation
+    assert_aggs ({"store_id" => {1 => 1, 2 => 2}}), Product.search("Product").aggs(:store_id)
     assert_aggs ({"store_id" => {1 => 1}}), Product.search("Product").aggs(store_id: {where: {in_stock: true}})
+    assert_aggs ({"store_id" => {1 => 1}}), Product.search("Product").aggs({store_id: {where: {in_stock: true}}})
+  end
+
+  def test_relation_multiple
+    expected = {"store_id" => {1 => 1, 2 => 2}, "color" => {"blue" => 1, "green" => 1, "red" => 1}}
+    assert_aggs expected, Product.search("Product").aggs(:store_id, :color)
+    assert_aggs expected, Product.search("Product").aggs([:store_id, :color])
   end
 
   def test_relation_smart_aggs_false