lib/searchkick.rb in searchkick-3.0.2 vs lib/searchkick.rb in searchkick-3.0.3
- old
+ new
@@ -93,20 +93,22 @@
def self.server_version
@server_version ||= client.info["version"]["number"]
end
def self.server_below?(version)
- Gem::Version.new(server_version.sub("-", ".")) < Gem::Version.new(version.sub("-", "."))
+ Gem::Version.new(server_version.split("-")[0]) < Gem::Version.new(version.split("-")[0])
end
def self.search(term = "*", model: nil, **options, &block)
+ options = options.dup
klass = model
# make Searchkick.search(index_name: [Product]) and Product.search equivalent
unless klass
index_name = Array(options[:index_name])
if index_name.size == 1 && index_name.first.respond_to?(:searchkick_index)
klass = index_name.first
+ options.delete(:index_name)
end
end
query = Searchkick::Query.new(klass, term, options)
block.call(query.body) if block