From 99affdaebdfd900f65d83e6a48e7691e6bb9c171 Mon Sep 17 00:00:00 2001 From: Andrew Kane Date: Sat, 12 Mar 2022 10:54:46 -0800 Subject: [PATCH] Fixed context for index name for inherited models --- CHANGELOG.md | 4 ++++ lib/searchkick/model.rb | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f86658f..fd6cd79 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 5.0.3 (unreleased) + +- Fixed context for index name for inherited models + ## 5.0.2 (2022-03-03) - Fixed index name for inherited models diff --git a/lib/searchkick/model.rb b/lib/searchkick/model.rb index c7daef1..557c49d 100644 --- a/lib/searchkick/model.rb +++ b/lib/searchkick/model.rb @@ -66,7 +66,7 @@ module Searchkick alias_method Searchkick.search_method_name, :searchkick_search if Searchkick.search_method_name def searchkick_index(name: nil) - index_name = name || searchkick_index_name + index_name = name || searchkick_klass.searchkick_index_name index_name = index_name.call if index_name.respond_to?(:call) index_cache = class_variable_get(:@@searchkick_index_cache) index_cache.fetch(index_name) { Searchkick::Index.new(index_name, searchkick_options) } @@ -88,9 +88,9 @@ module Searchkick if options[:index_name] options[:index_name] elsif options[:index_prefix].respond_to?(:call) - -> { [options[:index_prefix].call, searchkick_klass.model_name.plural, Searchkick.env, Searchkick.index_suffix].compact.join("_") } + -> { [options[:index_prefix].call, model_name.plural, Searchkick.env, Searchkick.index_suffix].compact.join("_") } else - [options.key?(:index_prefix) ? options[:index_prefix] : Searchkick.index_prefix, searchkick_klass.model_name.plural, Searchkick.env, Searchkick.index_suffix].compact.join("_") + [options.key?(:index_prefix) ? options[:index_prefix] : Searchkick.index_prefix, model_name.plural, Searchkick.env, Searchkick.index_suffix].compact.join("_") end end end -- libgit2 0.21.0