lib/searchkick.rb in searchkick-1.3.5 vs lib/searchkick.rb in searchkick-1.3.6

@@ -10,10 +10,18 @@
 require "searchkick/model"
 require "searchkick/tasks"
 require "searchkick/middleware"
 require "searchkick/logging" if defined?(ActiveSupport::Notifications)
 
+# background jobs
+begin
+  require "active_job"
+rescue LoadError
+  # do nothing
+end
+require "searchkick/reindex_v2_job" if defined?(ActiveJob)
+
 module Searchkick
   class Error < StandardError; end
   class MissingIndexError < Error; end
   class UnsupportedVersionError < Error; end
   class InvalidQueryError < Elasticsearch::Transport::Transport::Errors::BadRequest; end
@@ -150,15 +158,8 @@
     end
     nil
   end
 end
 
-ActiveSupport.on_load(:active_job) do
-  require "searchkick/reindex_v2_job"
-end
-
 # TODO find better ActiveModel hook
 ActiveModel::Callbacks.send(:include, Searchkick::Model)
-
-ActiveSupport.on_load(:active_record) do
-  ActiveRecord::Base.send(:extend, Searchkick::Model)
-end
+ActiveRecord::Base.send(:extend, Searchkick::Model) if defined?(ActiveRecord)