github / searchkick

Download as
Browse Code ยป

Commit 426229d033be68d365158ce0599c04836f8201ea

Authored by Andrew Kane
1 parent 616c0eaf
Exists in master and in 21 other branches allow_missing, conversions_period, conversions_v2, eager_load, find_in_batches, highlighted, index_name, lazy_index_name, less_deps, nested, reindex_async_threads, reindex_refactor, relation, relation_search, routing_queue, scope_attributes, search_as_you_type, synonyms_ci, test_language, threads, wildcard

Updated reindex

Showing 2 changed files with 9 additions and 12 deletions   Show diff stats
lib/searchkick/model.rb
  Diff comments   View file @426229d
... ... @@ -8,10 +8,6 @@ module Searchkick
8 8 class_variable_set :@@searchkick_klass, self
9 9 cattr_reader :searchkick_options, :searchkick_env, :searchkick_klass
10 10  
11   - def self.searchkick_index
12   - searchkick_klass.tire.index
13   - end
14   -
15 11 extend Searchkick::Search
16 12 extend Searchkick::Reindex
17 13 include Searchkick::Similar
... ... @@ -22,16 +18,17 @@ module Searchkick
22 18  
23 19 tire.index_name index_name
24 20  
25   - descendants.each do |subclass|
26   - subclass.tire.index_name index_name
27   - end
28   -
29   - def self.inherited(subclass)
30   - subclass.tire.index_name index_name
  21 + def self.searchkick_index
  22 + searchkick_klass.tire.index
31 23 end
32 24  
33 25 def reindex
34   - tire.update_index
  26 + index = self.class.searchkick_index
  27 + if destroyed?
  28 + index.remove self
  29 + else
  30 + index.store self
  31 + end
35 32 end
36 33  
37 34 unless options[:callbacks] == false
... ...
test/inheritance_test.rb
  Diff comments   View file @426229d
... ... @@ -15,7 +15,7 @@ class TestInheritance < Minitest::Unit::TestCase
15 15 end
16 16  
17 17 def test_child_index_name
18   - assert_equal "animals_test", Dog.tire.index.name
  18 + assert_equal "animals_test", Dog.searchkick_index.name
19 19 end
20 20  
21 21 def test_child_search
... ...