Negated if, Not

.rubocop.yml

@@ -221,23 +221,6 @@ Style/MutableConstant:
     - 'app/models/participant.rb'
     - 'app/models/token.rb'
 
-# Offense count: 18
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: both, prefix, postfix
-Style/NegatedIf:
-  Exclude:
-    - 'app/controllers/activities_controller.rb'
-    - 'app/controllers/authentication_controller.rb'
-    - 'app/controllers/dashboard_controller.rb'
-    - 'app/controllers/members_controller.rb'
-    - 'app/helpers/activities_helper.rb'
-    - 'app/helpers/authentication_helper.rb'
-    - 'app/helpers/groups_helper.rb'
-    - 'app/models/activity.rb'
-    - 'app/models/member.rb'
-    - 'app/models/person.rb'
-
 # Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, MinBodyLength.
@@ -246,17 +229,6 @@ Style/Next:
   Exclude:
     - 'db/seeds.rb'
 
-# Offense count: 12
-# Cop supports --auto-correct.
-Style/Not:
-  Exclude:
-    - 'app/controllers/authentication_controller.rb'
-    - 'app/controllers/members_controller.rb'
-    - 'app/helpers/authentication_helper.rb'
-    - 'app/models/activity.rb'
-    - 'app/models/member.rb'
-    - 'app/models/person.rb'
-
 # Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: Strict.

app/controllers/activities_controller.rb

@@ -161,7 +161,7 @@ class ActivitiesController < ApplicationController
     @non_organizers_options.sort!
     @organizers_options.sort!
 
-    @subgroup = Subgroup.new if !@subgroup
+    @subgroup ||= Subgroup.new
     @subgroups = @activity.subgroups.order(is_assignable: :desc, name: :asc)
   end
 

app/controllers/authentication_controller.rb

@@ -16,7 +16,7 @@ class AuthenticationController < ApplicationController
 
         flash_message(:success, I18n.t(:greeting, name: u.person.first_name))
         redirect_to root_path
-      elsif u && (not u.confirmed)
+      elsif u && !u.confirmed
         flash_message(:warning, I18n.t('authentication.activation_required'))
         redirect_to action: 'login_form'
       else
@@ -46,7 +46,7 @@ class AuthenticationController < ApplicationController
   def create_password
     person = Person.find_by(email: params[:user][:email])
 
-    if not person
+    unless person
       flash_message(:warning, I18n.t('authentication.unknown_email'))
       redirect_to action: 'create_password_form'
       return
@@ -59,7 +59,7 @@ class AuthenticationController < ApplicationController
       return
     end
 
-    if not user
+    unless user
       user = User.new
       user.person = person
       user.email = person.email
@@ -79,7 +79,7 @@ class AuthenticationController < ApplicationController
 
   def forgotten_password
     user = User.find_by(email: params[:password_reset][:email])
-    if not user
+    unless user
       flash_message(:danger, I18n.t('authentication.unknown_email'))
       redirect_to action: 'forgotten_password_form'
       return
@@ -91,7 +91,7 @@ class AuthenticationController < ApplicationController
 
   def reset_password_form
     token = Token.find_by(token: params[:token], tokentype: Token::TYPES[:password_reset])
-    if not token_valid? token
+    unless token_valid? token
       return
     end
 

app/controllers/dashboard_controller.rb

@@ -52,7 +52,7 @@ class DashboardController < ApplicationController
     new = params[:new_password]
     confirm = params[:new_password_confirm]
 
-    if !u.authenticate(current)
+    unless u.authenticate(current)
       flash_message(:danger, t('authentication.invalid_pass'))
       redirect_to settings_path
       return

app/controllers/members_controller.rb

@@ -42,11 +42,11 @@ class MembersController < ApplicationController
   def process_invite
     @person = Person.find_by(email: params[:person][:email])
     new_rec = false
-    if not @person
+    unless @person
       @person = Person.new(invite_params)
       new_rec = true
 
-      if not @person.save
+      unless @person.save
         respond_to do |format|
           format.html { render 'invite' }
           format.json { render json: @person.errors, status: :unprocessable_entity }

app/helpers/activities_helper.rb

@@ -1,6 +1,6 @@
 module ActivitiesHelper
   def require_organizer!
-    if !@activity.may_change?(current_person)
+    unless @activity.may_change?(current_person)
       flash_message(:danger, I18n.t('authentication.organizer_required'))
       redirect_to group_activity_path(@group, @activity)
     end

app/helpers/authentication_helper.rb

@@ -103,7 +103,7 @@ module AuthenticationHelper
     end
 
     # Edge case if a session no longer exists in the database
-    if not @user_session
+    unless @user_session
       log_out(session_broken: true)
     end
   end
@@ -118,7 +118,7 @@ module AuthenticationHelper
   end
 
   def require_login!
-    if !is_logged_in?
+    unless is_logged_in?
       flash_message(:warning, I18n.t('authentication.login_required'))
       redirect_to controller: 'authentication', action: 'login_form'
       return false
@@ -131,7 +131,7 @@ module AuthenticationHelper
   end
 
   def require_admin!
-    if !current_person.is_admin?
+    unless current_person.is_admin?
       flash_message(:danger, I18n.t('authentication.admin_required'))
       redirect_to '/dashboard'
     end

app/helpers/groups_helper.rb

@@ -2,7 +2,7 @@ module GroupsHelper
   def require_membership!
     return unless require_login!
 
-    if !(@group.is_member?(current_person) || current_person.is_admin?)
+    unless @group.is_member?(current_person) || current_person.is_admin?
       flash_message(:danger, I18n.t('groups.membership_required'))
       redirect_to dashboard_home_path
     end
@@ -11,8 +11,8 @@ module GroupsHelper
   def require_leader!
     return unless require_login!
 
-    if !(@group.is_leader?(current_person) ||
-         current_person.is_admin?)
+    unless @group.is_leader?(current_person) ||
+           current_person.is_admin?
       flash_message(:danger, I18n.t('groups.leadership_required'))
       redirect_to dashboard_home_path
     end

app/models/activity.rb

@@ -137,7 +137,7 @@ class Activity < ApplicationRecord
   #  2. do not have Participants (and thus, no way to confirm) yet
   def create_missing_participants!
     people = self.group.people
-    if not self.participants.empty?
+    unless self.participants.empty?
       people = people.where('people.id NOT IN (?)', self.people.ids)
     end
 

app/models/member.rb

@@ -22,7 +22,7 @@ class Member < ApplicationRecord
   def create_future_participants!
     activities = self.group.future_activities
 
-    if not self.person.activities.empty?
+    unless self.person.activities.empty?
       activities = activities.where(
         'activities.id NOT IN (?)', self.person.activities.ids
       )

app/models/person.rb

@@ -82,7 +82,7 @@ class Person < ApplicationRecord
     result = []
     reader.each do |row|
       p = Person.find_by(email: row['email'])
-      if not p
+      unless p
         p = Person.new
         p.first_name  = row['first_name']
         p.infix       = row['infix']
@@ -207,7 +207,7 @@ class Person < ApplicationRecord
   # Ensure the person's user email is updated at the same time as the person's
   # email.
   def update_user_email
-    if not self.user.nil?
+    unless self.user.nil?
       self.user.update!(email: self.email)
     end
   end