diff --git a/CHANGELOG.md b/CHANGELOG.md index 70c7173..12340a0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 5.0.2 (unreleased) + +- Fixed index name for inherited models + ## 5.0.1 (2022-02-27) - Prefer `mode: :async` over `async: true` for full reindex diff --git a/lib/searchkick/model.rb b/lib/searchkick/model.rb index eeda4c1..c7daef1 100644 --- a/lib/searchkick/model.rb +++ b/lib/searchkick/model.rb @@ -88,9 +88,9 @@ module Searchkick if options[:index_name] options[:index_name] elsif options[:index_prefix].respond_to?(:call) - -> { [options[:index_prefix].call, model_name.plural, Searchkick.env, Searchkick.index_suffix].compact.join("_") } + -> { [options[:index_prefix].call, searchkick_klass.model_name.plural, Searchkick.env, Searchkick.index_suffix].compact.join("_") } else - [options.key?(:index_prefix) ? options[:index_prefix] : Searchkick.index_prefix, model_name.plural, Searchkick.env, Searchkick.index_suffix].compact.join("_") + [options.key?(:index_prefix) ? options[:index_prefix] : Searchkick.index_prefix, searchkick_klass.model_name.plural, Searchkick.env, Searchkick.index_suffix].compact.join("_") end end end diff --git a/test/inheritance_test.rb b/test/inheritance_test.rb index b0b34f3..9594b65 100644 --- a/test/inheritance_test.rb +++ b/test/inheritance_test.rb @@ -13,7 +13,7 @@ class InheritanceTest < Minitest::Test end def test_child_index_name - assert_equal "animals-#{Date.today.year}#{ENV["TEST_ENV_NUMBER"]}", Dog.searchkick_index.name + assert_equal "animals_test#{ENV["TEST_ENV_NUMBER"]}", Dog.searchkick_index.name end def test_child_search diff --git a/test/models/animal.rb b/test/models/animal.rb index 2a785d3..7e0668e 100644 --- a/test/models/animal.rb +++ b/test/models/animal.rb @@ -2,6 +2,5 @@ class Animal searchkick \ inheritance: true, text_start: [:name], - suggest: [:name], - index_name: -> { "#{name.tableize}-#{Date.today.year}#{Searchkick.index_suffix}" } + suggest: [:name] end -- libgit2 0.21.0