Improved code [skip ci]

Andrew Kane
1 parent 621c76bd
Showing 1 changed file with 11 additions and 10 deletions Show diff stats
lib/searchkick/index.rb
@@ -397,14 +397,14 @@ module Searchkick
     end
  
     def notify(record, name)
-      name = "#{record.searchkick_klass.name} #{name}" if record && record.searchkick_klass
-      event = {
-        name: name,
-        id: search_id(record)
-      }
       if Searchkick.callbacks_value == :bulk
         yield
       else
+        name = "#{record.searchkick_klass.name} #{name}" if record && record.searchkick_klass
+        event = {
+          name: name,
+          id: search_id(record)
+        }
         ActiveSupport::Notifications.instrument("request.searchkick", event) do
           yield
         end
@@ -412,14 +412,15 @@ module Searchkick
     end
  
     def notify_bulk(records, name)
-      event = {
-        name: "#{records.first.searchkick_klass.name} #{name}",
-        count: records.size
-      }
-      event[:id] = search_id(records.first) if records.size == 1
       if Searchkick.callbacks_value == :bulk
         yield
       else
+        event = {
+          name: "#{records.first.searchkick_klass.name} #{name}",
+          count: records.size
+        }
+        # TODO remove
+        event[:id] = search_id(records.first) if records.size == 1
         ActiveSupport::Notifications.instrument("request.searchkick", event) do
           yield
         end
...	...	@@ -397,14 +397,14 @@ module Searchkick
397	397	end
398	398
399	399	def notify(record, name)
400		- name = "#{record.searchkick_klass.name} #{name}" if record && record.searchkick_klass
401		- event = {
402		- name: name,
403		- id: search_id(record)
404		- }
405	400	if Searchkick.callbacks_value == :bulk
406	401	yield
407	402	else
	403	+ name = "#{record.searchkick_klass.name} #{name}" if record && record.searchkick_klass
	404	+ event = {
	405	+ name: name,
	406	+ id: search_id(record)
	407	+ }
408	408	ActiveSupport::Notifications.instrument("request.searchkick", event) do
409	409	yield
410	410	end
...	...	@@ -412,14 +412,15 @@ module Searchkick
412	412	end
413	413
414	414	def notify_bulk(records, name)
415		- event = {
416		- name: "#{records.first.searchkick_klass.name} #{name}",
417		- count: records.size
418		- }
419		- event[:id] = search_id(records.first) if records.size == 1
420	415	if Searchkick.callbacks_value == :bulk
421	416	yield
422	417	else
	418	+ event = {
	419	+ name: "#{records.first.searchkick_klass.name} #{name}",
	420	+ count: records.size
	421	+ }
	422	+ # TODO remove
	423	+ event[:id] = search_id(records.first) if records.size == 1
423	424	ActiveSupport::Notifications.instrument("request.searchkick", event) do
424	425	yield
425	426	end
...	...