and/or -> &&/||

.rubocop.yml

@@ -67,16 +67,6 @@ Performance/Casecmp:
   Exclude:
     - 'app/models/activity.rb'
 
-# Offense count: 7
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: always, conditionals
-Style/AndOr:
-  Exclude:
-    - 'app/controllers/authentication_controller.rb'
-    - 'app/models/activity.rb'
-    - 'app/models/user.rb'
-
 # Offense count: 9
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, ProceduralMethods, FunctionalMethods, IgnoredMethods.

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 and not u.confirmed
+      elsif u && (not u.confirmed)
         flash_message(:warning, I18n.t('authentication.activation_required'))
         redirect_to action: 'login_form'
       else
@@ -53,7 +53,7 @@ class AuthenticationController < ApplicationController
     end
 
     user = User.find_by(person: person)
-    if user and user.confirmed
+    if user && user.confirmed
       flash_message(:warning, I18n.t('authentication.already_activated'))
       redirect_to action: 'login'
       return
@@ -161,7 +161,7 @@ class AuthenticationController < ApplicationController
       redirect_to action: 'login'
       return false
     end
-    if token.expires and token.expires < DateTime.now
+    if token.expires && (token.expires < DateTime.now)
       flash_message(:warning, I18n.t('authentication.token_expired'))
       redirect_to action: 'login'
       return false

app/models/activity.rb

@@ -122,7 +122,7 @@ class Activity < ApplicationRecord
     p = c[true]
     a = c[false]
     u = c[nil]
-    return "#{p or 0}, #{a or 0}, #{u or 0}"
+    return "#{p || 0}, #{a || 0}, #{u || 0}"
   end
 
   # Determine whether the passed Person may change this activity.

app/models/user.rb

@@ -30,7 +30,7 @@ class User < ApplicationRecord
   # Assert that the user's email address is the same as the email address of
   # the associated Person.
   def email_same_as_person
-    if self.person and self.email != self.person.email
+    if self.person && (self.email != self.person.email)
       errors.add(:email, I18n.t('authentication.user_person_mail_mismatch'))
     end
   end