Better callback handling [skip ci]

Andrew
1 parent 3df58036
Showing 4 changed files with 13 additions and 13 deletions Show diff stats
lib/searchkick.rb
lib/searchkick/index.rb
lib/searchkick/model.rb
lib/searchkick/record_indexer.rb
@@ -125,8 +125,12 @@ module Searchkick
     self.callbacks_value = false
   end
-  def self.callbacks?
-    callbacks_value != false
+  def self.callbacks?(default: true)
+    if callbacks_value.nil?
+      default
+    else
+      callbacks_value != false
+    end
   end
   def self.callbacks(value)
@@ -179,8 +179,6 @@ module Searchkick
     # reindex
     def reindex(scope, method_name, scoped:, full: false, **options)
-      return unless Searchkick.callbacks?
-
       refresh = options.fetch(:refresh, !scoped)
       if method_name
@@ -65,13 +65,13 @@ module Searchkick
           end
         end
-        if callbacks
-          if respond_to?(:after_commit)
-            after_commit :reindex
-          elsif respond_to?(:after_save)
-            after_save :reindex
-            after_destroy :reindex
-          end
+        # always add callbacks, even when callbacks is false
+        # so Model.callbacks block can be used
+        if respond_to?(:after_commit)
+          after_commit :reindex, if: -> { Searchkick.callbacks?(default: callbacks) }
+        elsif respond_to?(:after_save)
+          after_save :reindex, if: -> { Searchkick.callbacks?(default: callbacks) }
+          after_destroy :reindex, if: -> { Searchkick.callbacks?(default: callbacks) }
         end
         def reindex(method_name = nil, **options)
@@ -8,8 +8,6 @@ module Searchkick
     end
     def reindex(method_name = nil, refresh: false, mode: nil)
-      return unless Searchkick.callbacks?
-
       unless [true, nil, :async, :queue].include?(mode)
         raise ArgumentError, "Invalid value for mode"
       end
	@@ -179,8 +179,6 @@ module Searchkick		@@ -179,8 +179,6 @@ module Searchkick
179	# reindex	179	# reindex
180		180
181	def reindex(scope, method_name, scoped:, full: false, **options)	181	def reindex(scope, method_name, scoped:, full: false, **options)
182	- return unless Searchkick.callbacks?
183	-
184	refresh = options.fetch(:refresh, !scoped)	182	refresh = options.fetch(:refresh, !scoped)
185		183
186	if method_name	184	if method_name