From e5143356f383e12a7b1c70fabfedb2b0c2dd16f2 Mon Sep 17 00:00:00 2001 From: Andrew Date: Wed, 12 Sep 2018 10:53:27 +0200 Subject: [PATCH] Fixed deprecation warnings in code --- lib/searchkick/query.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/searchkick/query.rb b/lib/searchkick/query.rb index 2b023ad..224bd06 100644 --- a/lib/searchkick/query.rb +++ b/lib/searchkick/query.rb @@ -660,11 +660,11 @@ module Searchkick def set_boost_by_indices(payload) return unless options[:indices_boost] - indices_boost = options[:indices_boost].each_with_object({}) do |(key, boost), memo| + indices_boost = options[:indices_boost].map do |key, boost| index = key.respond_to?(:searchkick_index) ? key.searchkick_index.name : key # try to use index explicitly instead of alias: https://github.com/elasticsearch/elasticsearch/issues/4756 index_by_alias = Searchkick.client.indices.get_alias(index: index).keys.first - memo[index_by_alias || index] = boost + {(index_by_alias || index) => boost} end payload[:indices_boost] = indices_boost @@ -812,7 +812,7 @@ module Searchkick # TODO id transformation for arrays def set_order(payload) order = options[:order].is_a?(Enumerable) ? options[:order] : {options[:order] => :asc} - id_field = :_uid + id_field = below60? ? :_uid : :_id payload[:sort] = order.is_a?(Array) ? order : Hash[order.map { |k, v| [k.to_s == "id" ? id_field : k, v] }] end -- libgit2 0.21.0