Improved code [skip ci]

Andrew Kane
1 parent 9b38af62
Showing 1 changed file with 9 additions and 9 deletions Show diff stats
lib/searchkick/index.rb
@@ -131,19 +131,19 @@ module Searchkick
     end
  
     def store(record)
-      maybe_notify_one(record, "Store") do
+      notify(record, "Store") do
         queue_index([record])
       end
     end
  
     def remove(record)
-      maybe_notify_one(record, "Remove") do
+      notify(record, "Remove") do
         queue_delete([record])
       end
     end
  
     def update_record(record, method_name)
-      maybe_notify_one(record, "Update") do
+      notify(record, "Update") do
         queue_update([record], method_name)
       end
     end
@@ -151,7 +151,7 @@ module Searchkick
     def bulk_delete(records)
       return if records.empty?
  
-      maybe_notify_many(records, "Delete") do
+      notify_bulk(records, "Delete") do
         queue_delete(records)
       end
     end
@@ -159,7 +159,7 @@ module Searchkick
     def bulk_index(records)
       return if records.empty?
  
-      maybe_notify_many(records, "Import") do
+      notify_bulk(records, "Import") do
         queue_index(records)
       end
     end
@@ -168,7 +168,7 @@ module Searchkick
     def bulk_update(records, method_name)
       return if records.empty?
  
-      maybe_notify_many(records, "Update") do
+      notify_bulk(records, "Update") do
         queue_update(records, method_name)
       end
     end
@@ -398,8 +398,8 @@ module Searchkick
       end
     end
  
-    def maybe_notify_one(record, name)
-      name = record && record.searchkick_klass ? "#{record.searchkick_klass.name} #{name}" : name
+    def notify(record, name)
+      name = "#{record.searchkick_klass.name} #{name}" if record && record.searchkick_klass
       event = {
         name: name,
         id: search_id(record)
@@ -413,7 +413,7 @@ module Searchkick
       end
     end
  
-    def maybe_notify_many(records, name)
+    def notify_bulk(records, name)
       event = {
         name: "#{records.first.searchkick_klass.name} #{name}",
         count: records.size
...	...	@@ -131,19 +131,19 @@ module Searchkick
131	131	end
132	132
133	133	def store(record)
134		- maybe_notify_one(record, "Store") do
	134	+ notify(record, "Store") do
135	135	queue_index([record])
136	136	end
137	137	end
138	138
139	139	def remove(record)
140		- maybe_notify_one(record, "Remove") do
	140	+ notify(record, "Remove") do
141	141	queue_delete([record])
142	142	end
143	143	end
144	144
145	145	def update_record(record, method_name)
146		- maybe_notify_one(record, "Update") do
	146	+ notify(record, "Update") do
147	147	queue_update([record], method_name)
148	148	end
149	149	end
...	...	@@ -151,7 +151,7 @@ module Searchkick
151	151	def bulk_delete(records)
152	152	return if records.empty?
153	153
154		- maybe_notify_many(records, "Delete") do
	154	+ notify_bulk(records, "Delete") do
155	155	queue_delete(records)
156	156	end
157	157	end
...	...	@@ -159,7 +159,7 @@ module Searchkick
159	159	def bulk_index(records)
160	160	return if records.empty?
161	161
162		- maybe_notify_many(records, "Import") do
	162	+ notify_bulk(records, "Import") do
163	163	queue_index(records)
164	164	end
165	165	end
...	...	@@ -168,7 +168,7 @@ module Searchkick
168	168	def bulk_update(records, method_name)
169	169	return if records.empty?
170	170
171		- maybe_notify_many(records, "Update") do
	171	+ notify_bulk(records, "Update") do
172	172	queue_update(records, method_name)
173	173	end
174	174	end
...	...	@@ -398,8 +398,8 @@ module Searchkick
398	398	end
399	399	end
400	400
401		- def maybe_notify_one(record, name)
402		- name = record && record.searchkick_klass ? "#{record.searchkick_klass.name} #{name}" : name
	401	+ def notify(record, name)
	402	+ name = "#{record.searchkick_klass.name} #{name}" if record && record.searchkick_klass
403	403	event = {
404	404	name: name,
405	405	id: search_id(record)
...	...	@@ -413,7 +413,7 @@ module Searchkick
413	413	end
414	414	end
415	415
416		- def maybe_notify_many(records, name)
	416	+ def notify_bulk(records, name)
417	417	event = {
418	418	name: "#{records.first.searchkick_klass.name} #{name}",
419	419	count: records.size
...	...