Fixed index name for inherited models - fixes #1548

Andrew Kane
1 parent 460f3891
Showing 4 changed files with 8 additions and 5 deletions Show diff stats
CHANGELOG.md
lib/searchkick/model.rb
test/inheritance_test.rb
test/models/animal.rb
+## 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
@@ -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
@@ -13,7 +13,7 @@ class InheritanceTest &lt; 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
@@ -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
	1	+## 5.0.2 (unreleased)
	2	+
	3	+- Fixed index name for inherited models
	4	+
1	5	## 5.0.1 (2022-02-27)
2	6
3	7	- Prefer `mode: :async` over `async: true` for full reindex
...	...
...	...	@@ -88,9 +88,9 @@ module Searchkick
88	88	if options[:index_name]
89	89	options[:index_name]
90	90	elsif options[:index_prefix].respond_to?(:call)
91		- -> { [options[:index_prefix].call, model_name.plural, Searchkick.env, Searchkick.index_suffix].compact.join("_") }
	91	+ -> { [options[:index_prefix].call, searchkick_klass.model_name.plural, Searchkick.env, Searchkick.index_suffix].compact.join("_") }
92	92	else
93		- [options.key?(:index_prefix) ? options[:index_prefix] : Searchkick.index_prefix, model_name.plural, Searchkick.env, Searchkick.index_suffix].compact.join("_")
	93	+ [options.key?(:index_prefix) ? options[:index_prefix] : Searchkick.index_prefix, searchkick_klass.model_name.plural, Searchkick.env, Searchkick.index_suffix].compact.join("_")
94	94	end
95	95	end
96	96	end
...	...
...	...	@@ -13,7 +13,7 @@ class InheritanceTest < Minitest::Test
13	13	end
14	14
15	15	def test_child_index_name
16		- assert_equal "animals-#{Date.today.year}#{ENV["TEST_ENV_NUMBER"]}", Dog.searchkick_index.name
	16	+ assert_equal "animals_test#{ENV["TEST_ENV_NUMBER"]}", Dog.searchkick_index.name
17	17	end
18	18
19	19	def test_child_search
...	...
...	...	@@ -2,6 +2,5 @@ class Animal
2	2	searchkick \
3	3	inheritance: true,
4	4	text_start: [:name],
5		- suggest: [:name],
6		- index_name: -> { "#{name.tableize}-#{Date.today.year}#{Searchkick.index_suffix}" }
	5	+ suggest: [:name]
7	6	end
...	...