Moved queue methods [skip ci]

Andrew Kane
1 parent 1008590e
Showing 2 changed files with 18 additions and 18 deletions Show diff stats
lib/searchkick/bulk_indexer.rb
lib/searchkick/index.rb
@@ -43,18 +43,6 @@ module Searchkick
       end
     end
  
-    def bulk_index(records)
-      Searchkick.indexer.queue(records.map { |r| RecordData.new(index, r).index_data })
-    end
-
-    def bulk_delete(records)
-      Searchkick.indexer.queue(records.reject { |r| r.id.blank? }.map { |r| RecordData.new(index, r).delete_data })
-    end
-
-    def bulk_update(records, method_name)
-      Searchkick.indexer.queue(records.map { |r| RecordData.new(index, r).update_data(method_name) })
-    end
-
     def batches_left
       Searchkick.with_redis { |r| r.scard(batches_key) }
     end
@@ -134,28 +134,28 @@ module Searchkick
     # use helpers for notifications
  
     def store(record)
-      bulk_indexer.bulk_index([record])
+      queue_index([record])
     end
  
     def remove(record)
-      bulk_indexer.bulk_delete([record])
+      queue_delete([record])
     end
  
     def update_record(record, method_name)
-      bulk_indexer.bulk_update([record], method_name)
+      queue_update([record], method_name)
     end
  
     def bulk_delete(records)
-      bulk_indexer.bulk_delete(records)
+      queue_delete(records)
     end
  
     def bulk_index(records)
-      bulk_indexer.bulk_index(records)
+      queue_index(records)
     end
     alias_method :import, :bulk_index
  
     def bulk_update(records, method_name)
-      bulk_indexer.bulk_update(records, method_name)
+      queue_update(records, method_name)
     end
  
     def search_id(record)
@@ -272,6 +272,18 @@ module Searchkick
       Searchkick.client
     end
  
+    def queue_index(records)
+      Searchkick.indexer.queue(records.map { |r| RecordData.new(self, r).index_data })
+    end
+
+    def queue_delete(records)
+      Searchkick.indexer.queue(records.reject { |r| r.id.blank? }.map { |r| RecordData.new(self, r).delete_data })
+    end
+
+    def queue_update(records, method_name)
+      Searchkick.indexer.queue(records.map { |r| RecordData.new(self, r).update_data(method_name) })
+    end
+
     def bulk_indexer
       @bulk_indexer ||= BulkIndexer.new(self)
     end
...	...	@@ -43,18 +43,6 @@ module Searchkick
43	43	end
44	44	end
45	45
46		- def bulk_index(records)
47		- Searchkick.indexer.queue(records.map { \|r\| RecordData.new(index, r).index_data })
48		- end
49		-
50		- def bulk_delete(records)
51		- Searchkick.indexer.queue(records.reject { \|r\| r.id.blank? }.map { \|r\| RecordData.new(index, r).delete_data })
52		- end
53		-
54		- def bulk_update(records, method_name)
55		- Searchkick.indexer.queue(records.map { \|r\| RecordData.new(index, r).update_data(method_name) })
56		- end
57		-
58	46	def batches_left
59	47	Searchkick.with_redis { \|r\| r.scard(batches_key) }
60	48	end
...	...
...	...	@@ -134,28 +134,28 @@ module Searchkick
134	134	# use helpers for notifications
135	135
136	136	def store(record)
137		- bulk_indexer.bulk_index([record])
	137	+ queue_index([record])
138	138	end
139	139
140	140	def remove(record)
141		- bulk_indexer.bulk_delete([record])
	141	+ queue_delete([record])
142	142	end
143	143
144	144	def update_record(record, method_name)
145		- bulk_indexer.bulk_update([record], method_name)
	145	+ queue_update([record], method_name)
146	146	end
147	147
148	148	def bulk_delete(records)
149		- bulk_indexer.bulk_delete(records)
	149	+ queue_delete(records)
150	150	end
151	151
152	152	def bulk_index(records)
153		- bulk_indexer.bulk_index(records)
	153	+ queue_index(records)
154	154	end
155	155	alias_method :import, :bulk_index
156	156
157	157	def bulk_update(records, method_name)
158		- bulk_indexer.bulk_update(records, method_name)
	158	+ queue_update(records, method_name)
159	159	end
160	160
161	161	def search_id(record)
...	...	@@ -272,6 +272,18 @@ module Searchkick
272	272	Searchkick.client
273	273	end
274	274
	275	+ def queue_index(records)
	276	+ Searchkick.indexer.queue(records.map { \|r\| RecordData.new(self, r).index_data })
	277	+ end
	278	+
	279	+ def queue_delete(records)
	280	+ Searchkick.indexer.queue(records.reject { \|r\| r.id.blank? }.map { \|r\| RecordData.new(self, r).delete_data })
	281	+ end
	282	+
	283	+ def queue_update(records, method_name)
	284	+ Searchkick.indexer.queue(records.map { \|r\| RecordData.new(self, r).update_data(method_name) })
	285	+ end
	286	+
275	287	def bulk_indexer
276	288	@bulk_indexer \|\|= BulkIndexer.new(self)
277	289	end
...	...