Added async option to record reindex

Andrew Kane
1 parent 85413878
Showing 2 changed files with 17 additions and 7 deletions Show diff stats
lib/searchkick/model.rb
test/test_helper.rb
@@ -84,17 +84,26 @@ module Searchkick
           after_destroy callback_name, if: proc { self.class.search_callbacks? }
         end
  
-        def reindex(method_name = nil, refresh: false)
-          if method_name
-            self.class.searchkick_index.bulk_update([self], method_name)
+        def reindex(method_name = nil, refresh: false, async: false)
+          if async
+            if method_name
+              raise Searchkick::Error, "Partial updates not yet supported with async"
+            else
+              self.class.searchkick_index.reindex_record_async(self)
+            end
           else
-            self.class.searchkick_index.reindex_record(self)
+            if method_name
+              self.class.searchkick_index.bulk_update([self], method_name)
+            else
+              self.class.searchkick_index.reindex_record(self)
+            end
+            self.class.searchkick_index.refresh if refresh
           end
-          self.class.searchkick_index.refresh if refresh
         end unless method_defined?(:reindex)
  
+        # TODO remove this method in next major version
         def reindex_async
-          self.class.searchkick_index.reindex_record_async(self)
+          reindex(async: true)
         end unless method_defined?(:reindex_async)
  
         def similar(options = {})
@@ -372,7 +372,8 @@ class Animal
   searchkick \
     text_start: [:name],
     suggest: [:name],
-    index_name: -> { "#{name.tableize}-#{Date.today.year}" }
+    index_name: -> { "#{name.tableize}-#{Date.today.year}" },
+    callbacks: :async
     # wordnet: true
 end
...	...	@@ -84,17 +84,26 @@ module Searchkick
84	84	after_destroy callback_name, if: proc { self.class.search_callbacks? }
85	85	end
86	86
87		- def reindex(method_name = nil, refresh: false)
88		- if method_name
89		- self.class.searchkick_index.bulk_update([self], method_name)
	87	+ def reindex(method_name = nil, refresh: false, async: false)
	88	+ if async
	89	+ if method_name
	90	+ raise Searchkick::Error, "Partial updates not yet supported with async"
	91	+ else
	92	+ self.class.searchkick_index.reindex_record_async(self)
	93	+ end
90	94	else
91		- self.class.searchkick_index.reindex_record(self)
	95	+ if method_name
	96	+ self.class.searchkick_index.bulk_update([self], method_name)
	97	+ else
	98	+ self.class.searchkick_index.reindex_record(self)
	99	+ end
	100	+ self.class.searchkick_index.refresh if refresh
92	101	end
93		- self.class.searchkick_index.refresh if refresh
94	102	end unless method_defined?(:reindex)
95	103
	104	+ # TODO remove this method in next major version
96	105	def reindex_async
97		- self.class.searchkick_index.reindex_record_async(self)
	106	+ reindex(async: true)
98	107	end unless method_defined?(:reindex_async)
99	108
100	109	def similar(options = {})
...	...
...	...	@@ -372,7 +372,8 @@ class Animal
372	372	searchkick \
373	373	text_start: [:name],
374	374	suggest: [:name],
375		- index_name: -> { "#{name.tableize}-#{Date.today.year}" }
	375	+ index_name: -> { "#{name.tableize}-#{Date.today.year}" },
	376	+ callbacks: :async
376	377	# wordnet: true
377	378	end
378	379
...	...