Use better ActiveRecord hook - fixes ankane#910

mikelkew · Apr 30, 2017 · 1fb35cc · 1fb35cc
1 parent 00c7807
commit 1fb35cc
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/lib/searchkick.rb b/lib/searchkick.rb
@@ -207,4 +207,7 @@ def self.callbacks_value=(value)
 
 # TODO find better ActiveModel hook
 ActiveModel::Callbacks.send(:include, Searchkick::Model)
-ActiveRecord::Base.send(:extend, Searchkick::Model) if defined?(ActiveRecord)
+
+ActiveSupport.on_load(:active_record) do
+  extend Searchkick::Model
+end