Flattened where options

Author: ankane

lib/searchkick/relation.rb

@@ -575,11 +575,12 @@ def where!(value)
       check_loaded
       value = ensure_permitted(value)
       if @options[:where]
+        if @options[:where][:_and].is_a?(Array)
+          merge_option(:where, {_and: @options[:where][:_and] + [value]})
         # keep simple when possible for smart aggs
-        if !@options[:where].keys.intersect?(value.keys)
+        elsif !@options[:where].keys.intersect?(value.keys)
           merge_option(:where, value)
         else
-          # TODO flatten
           @options[:where] = {_and: [@options[:where], value]}
         end
       else