From 7a02236f63c2e213b0b1bba57a969cecbfd59d21 Mon Sep 17 00:00:00 2001
From: Thorsten Eckel <te@znuny.com>
Date: Fri, 3 Jul 2015 18:51:22 +0200
Subject: [PATCH] Applied rubocop cop 'Style/Next'.

---
 lib/models.rb | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/lib/models.rb b/lib/models.rb
index 1ec694f53..c521535c2 100644
--- a/lib/models.rb
+++ b/lib/models.rb
@@ -82,12 +82,13 @@ returns
       references[:model][model_class.to_s] = 0
       next if !model_attributes[:attributes]
       %w(created_by_id updated_by_id).each {|item|
-        if model_attributes[:attributes].include?(item)
-          count = model_class.where("#{item} = ?", object_id).count
-          next if count == 0
-          Rails.logger.debug "FOUND (by id) #{model_class}->#{item} #{count}!"
-          references[:model][model_class.to_s] += count
-        end
+
+        next if !model_attributes[:attributes].include?(item)
+
+        count = model_class.where("#{item} = ?", object_id).count
+        next if count == 0
+        Rails.logger.debug "FOUND (by id) #{model_class}->#{item} #{count}!"
+        references[:model][model_class.to_s] += count
       }
     }
 
@@ -95,19 +96,24 @@ returns
     list.each {|model_class, model_attributes|
       next if !model_attributes[:reflections]
       model_attributes[:reflections].each {|reflection_key, reflection_value|
+
         next if reflection_value.macro != :belongs_to
+
         if reflection_value.options[:class_name] == object_name
           count = model_class.where("#{reflection_value.name}_id = ?", object_id).count
           next if count == 0
           Rails.logger.debug "FOUND (by ref without class) #{model_class}->#{reflection_value.name} #{count}!"
           references[:model][model_class.to_s] += count
         end
-        if !reflection_value.options[:class_name] && reflection_value.name == object_name.downcase.to_sym
-          count = model_class.where("#{reflection_value.name}_id = ?", object_id).count
-          next if count == 0
-          Rails.logger.debug "FOUND (by ref with class) #{model_class}->#{reflection_value.name} #{count}!"
-          references[:model][model_class.to_s] += count
-        end
+
+        next if reflection_value.options[:class_name]
+        next if reflection_value.name != object_name.downcase.to_sym
+
+        count = model_class.where("#{reflection_value.name}_id = ?", object_id).count
+        next if count == 0
+
+        Rails.logger.debug "FOUND (by ref with class) #{model_class}->#{reflection_value.name} #{count}!"
+        references[:model][model_class.to_s] += count
       }
     }