Commit 548ea14d727d5f296427714fa500a793cfa21939
1 parent
75cbc783
Exists in
master
and in
2 other branches
Removed class methods from instances [skip ci]
Showing
3 changed files
with
4 additions
and
4 deletions
Show diff stats
lib/searchkick/index.rb
| @@ -400,7 +400,7 @@ module Searchkick | @@ -400,7 +400,7 @@ module Searchkick | ||
| 400 | if Searchkick.callbacks_value == :bulk | 400 | if Searchkick.callbacks_value == :bulk |
| 401 | yield | 401 | yield |
| 402 | else | 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 | event = { | 404 | event = { |
| 405 | name: name, | 405 | name: name, |
| 406 | id: search_id(record) | 406 | id: search_id(record) |
| @@ -416,7 +416,7 @@ module Searchkick | @@ -416,7 +416,7 @@ module Searchkick | ||
| 416 | yield | 416 | yield |
| 417 | else | 417 | else |
| 418 | event = { | 418 | event = { |
| 419 | - name: "#{records.first.searchkick_klass.name} #{name}", | 419 | + name: "#{records.first.class.searchkick_klass.name} #{name}", |
| 420 | count: records.size | 420 | count: records.size |
| 421 | } | 421 | } |
| 422 | ActiveSupport::Notifications.instrument("request.searchkick", event) do | 422 | ActiveSupport::Notifications.instrument("request.searchkick", event) do |
lib/searchkick/model.rb
| @@ -51,7 +51,7 @@ module Searchkick | @@ -51,7 +51,7 @@ module Searchkick | ||
| 51 | end | 51 | end |
| 52 | 52 | ||
| 53 | class_eval do | 53 | class_eval do |
| 54 | - cattr_reader :searchkick_options, :searchkick_klass | 54 | + cattr_reader :searchkick_options, :searchkick_klass, instance_reader: false |
| 55 | 55 | ||
| 56 | class_variable_set :@@searchkick_options, options.dup | 56 | class_variable_set :@@searchkick_options, options.dup |
| 57 | class_variable_set :@@searchkick_klass, self | 57 | class_variable_set :@@searchkick_klass, self |
lib/searchkick/record_indexer.rb
| @@ -115,7 +115,7 @@ module Searchkick | @@ -115,7 +115,7 @@ module Searchkick | ||
| 115 | single ? "Store" : "Import" | 115 | single ? "Store" : "Import" |
| 116 | end | 116 | end |
| 117 | record = index_records.first || delete_records.first | 117 | record = index_records.first || delete_records.first |
| 118 | - name = record.searchkick_klass.name | 118 | + name = record.class.searchkick_klass.name |
| 119 | message = lambda do |event| | 119 | message = lambda do |event| |
| 120 | event[:name] = "#{name} #{action}" | 120 | event[:name] = "#{name} #{action}" |
| 121 | if single | 121 | if single |