Rubocop: if/unless modifier

.rubocop_todo.yml

@@ -424,19 +424,6 @@ Style/IdenticalConditionalBranches:
   Exclude:
     - 'app/helpers/application_helper.rb'
 
-# Offense count: 11
-# Cop supports --auto-correct.
-# Configuration parameters: MaxLineLength.
-Style/IfUnlessModifier:
-  Exclude:
-    - 'app/models/entities/lead.rb'
-    - 'app/models/entities/opportunity.rb'
-    - 'app/models/setting.rb'
-    - 'db/migrate/20100928030620_remove_uuid.rb'
-    - 'lib/fat_free_crm.rb'
-    - 'lib/fat_free_crm/mail_processor/base.rb'
-    - 'lib/tasks/ffcrm/update_data.rake'
-
 # Offense count: 27
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.

app/models/entities/lead.rb

@@ -151,9 +151,7 @@ def reject
   # Attach a task to the lead if it hasn't been attached already.
   #----------------------------------------------------------------------------
   def attach!(task)
-    unless task_ids.include?(task.id)
-      tasks << task
-    end
+    tasks << task unless task_ids.include?(task.id)
   end
 
   # Discard a task from the lead.
@@ -176,16 +174,12 @@ def full_name(format = nil)
 
   #----------------------------------------------------------------------------
   def increment_leads_count
-    if campaign_id
-      Campaign.increment_counter(:leads_count, campaign_id)
-    end
+    Campaign.increment_counter(:leads_count, campaign_id) if campaign_id
   end
 
   #----------------------------------------------------------------------------
   def decrement_leads_count
-    if campaign_id
-      Campaign.decrement_counter(:leads_count, campaign_id)
-    end
+    Campaign.decrement_counter(:leads_count, campaign_id) if campaign_id
   end
 
   # Make sure at least one user has been selected if the lead is being shared.

app/models/entities/opportunity.rb

@@ -175,16 +175,12 @@ def users_for_shared_access
 
   #----------------------------------------------------------------------------
   def increment_opportunities_count
-    if campaign_id
-      Campaign.increment_counter(:opportunities_count, campaign_id)
-    end
+    Campaign.increment_counter(:opportunities_count, campaign_id) if campaign_id
   end
 
   #----------------------------------------------------------------------------
   def decrement_opportunities_count
-    if campaign_id
-      Campaign.decrement_counter(:opportunities_count, campaign_id)
-    end
+    Campaign.decrement_counter(:opportunities_count, campaign_id) if campaign_id
   end
 
   ActiveSupport.run_load_hooks(:fat_free_crm_opportunity, self)

app/models/setting.rb

@@ -56,15 +56,11 @@ def [](name)
       # Check database
       if database_and_table_exists?
         if setting = find_by_name(name.to_s)
-          unless setting.value.nil?
-            return cache[name] = setting.value
-          end
+          return cache[name] = setting.value unless setting.value.nil?
         end
       end
       # Check YAML settings
-      if yaml_settings.key?(name)
-        return cache[name] = yaml_settings[name]
-      end
+      return cache[name] = yaml_settings[name] if yaml_settings.key?(name)
     end
 
     # Set setting value

db/migrate/20100928030620_remove_uuid.rb

@@ -4,9 +4,7 @@ class RemoveUuid < ActiveRecord::Migration
   def self.up
     [:users, :accounts, :campaigns, :leads, :contacts, :opportunities, :tasks].each do |table|
       remove_column table, :uuid
-      if self.uuid_configured?
-        execute("DROP TRIGGER IF EXISTS #{table}_uuid")
-      end
+      execute("DROP TRIGGER IF EXISTS #{table}_uuid") if self.uuid_configured?
     end
   end
 

lib/fat_free_crm.rb

@@ -26,9 +26,7 @@ def application?
 end
 
 # Load Fat Free CRM as a Rails Engine, unless running as a Rails Application
-unless defined?(FatFreeCRM::Application)
-  require 'fat_free_crm/engine'
-end
+require 'fat_free_crm/engine' unless defined?(FatFreeCRM::Application)
 
 require 'fat_free_crm/load_settings' # register load hook for Setting
 

lib/fat_free_crm/mail_processor/base.rb

@@ -82,9 +82,7 @@ def connect!(options = {})
       def disconnect!
         if @imap
           @imap.logout
-          unless @imap.disconnected?
-            @imap.disconnect rescue nil
-          end
+          @imap.disconnect rescue nil unless @imap.disconnected?
         end
       end
 

lib/tasks/ffcrm/update_data.rake

@@ -217,9 +217,7 @@ in a console and continue. This is strongly discouraged. You have been warned!
         tmp = Address.where(scope)
         tmp.map { |t| t.country = ct[2] }
 
-        unless tmp.blank?
-          addresses_to_update << tmp
-        end
+        addresses_to_update << tmp unless tmp.blank?
       end
 
       Address.transaction do