Cleaner code [skip ci]

Andrew Kane
1 parent 9900ad44
Showing 1 changed file with 9 additions and 8 deletions Show diff stats
lib/searchkick/index.rb
@@ -434,15 +434,16 @@ module Searchkick
         else
           retries = 0
           records = records.select(&:should_index?)
-          begin
-            delete_records =
-              if delete
-                # determine which records to delete
-                (record_ids - records.map { |r| r.id.to_s }).map { |id| m = klass.new; m.id = id; m }
-              else
-                []
-              end
  
+          delete_records =
+            if delete
+              # determine which records to delete
+              (record_ids - records.map { |r| r.id.to_s }).map { |id| m = klass.new; m.id = id; m }
+            else
+              []
+            end
+
+          begin
             # bulk reindex
             method_name ? bulk_update(records, method_name) : import(records)
             bulk_delete(delete_records)
...	...	@@ -434,15 +434,16 @@ module Searchkick
434	434	else
435	435	retries = 0
436	436	records = records.select(&:should_index?)
437		- begin
438		- delete_records =
439		- if delete
440		- # determine which records to delete
441		- (record_ids - records.map { \|r\| r.id.to_s }).map { \|id\| m = klass.new; m.id = id; m }
442		- else
443		- []
444		- end
445	437
	438	+ delete_records =
	439	+ if delete
	440	+ # determine which records to delete
	441	+ (record_ids - records.map { \|r\| r.id.to_s }).map { \|id\| m = klass.new; m.id = id; m }
	442	+ else
	443	+ []
	444	+ end
	445	+
	446	+ begin
446	447	# bulk reindex
447	448	method_name ? bulk_update(records, method_name) : import(records)
448	449	bulk_delete(delete_records)
...	...