github / searchkick

Download as
Browse Code ยป

Commit 548ea14d727d5f296427714fa500a793cfa21939

Authored by Andrew Kane
1 parent 75cbc783
Exists in master and in 2 other branches allow_missing, conversions_v2

Removed class methods from instances [skip ci]

Showing 3 changed files with 4 additions and 4 deletions   Show diff stats
lib/searchkick/index.rb
  Diff comments   View file @548ea14
... ... @@ -400,7 +400,7 @@ module Searchkick
400 400 if Searchkick.callbacks_value == :bulk
401 401 yield
402 402 else
403   - name = "#{record.searchkick_klass.name} #{name}" if record && record.searchkick_klass
  403 + name = "#{record.class.searchkick_klass.name} #{name}" if record && record.class.searchkick_klass
404 404 event = {
405 405 name: name,
406 406 id: search_id(record)
... ... @@ -416,7 +416,7 @@ module Searchkick
416 416 yield
417 417 else
418 418 event = {
419   - name: "#{records.first.searchkick_klass.name} #{name}",
  419 + name: "#{records.first.class.searchkick_klass.name} #{name}",
420 420 count: records.size
421 421 }
422 422 ActiveSupport::Notifications.instrument("request.searchkick", event) do
... ...
lib/searchkick/model.rb
  Diff comments   View file @548ea14
... ... @@ -51,7 +51,7 @@ module Searchkick
51 51 end
52 52  
53 53 class_eval do
54   - cattr_reader :searchkick_options, :searchkick_klass
  54 + cattr_reader :searchkick_options, :searchkick_klass, instance_reader: false
55 55  
56 56 class_variable_set :@@searchkick_options, options.dup
57 57 class_variable_set :@@searchkick_klass, self
... ...
lib/searchkick/record_indexer.rb
  Diff comments   View file @548ea14
... ... @@ -115,7 +115,7 @@ module Searchkick
115 115 single ? "Store" : "Import"
116 116 end
117 117 record = index_records.first || delete_records.first
118   - name = record.searchkick_klass.name
  118 + name = record.class.searchkick_klass.name
119 119 message = lambda do |event|
120 120 event[:name] = "#{name} #{action}"
121 121 if single
... ...