Naming cops

.rubocop.yml

@@ -45,24 +45,6 @@ Metrics/ModuleLength:
 Metrics/PerceivedComplexity:
   Max: 13
 
-# Offense count: 1
-Naming/AccessorMethodName:
-  Exclude:
-    - 'app/helpers/authentication_helper.rb'
-
-# Offense count: 5
-# Configuration parameters: NamePrefix, NamePrefixBlacklist, NameWhitelist, MethodDefinitionMacros.
-# NamePrefix: is_, has_, have_
-# NamePrefixBlacklist: is_, has_, have_
-# NameWhitelist: is_a?
-# MethodDefinitionMacros: define_method, define_singleton_method
-Naming/PredicateName:
-  Exclude:
-    - 'spec/**/*'
-    - 'app/helpers/authentication_helper.rb'
-    - 'app/models/activity.rb'
-    - 'app/models/group.rb'
-
 # Offense count: 9
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, ProceduralMethods, FunctionalMethods, IgnoredMethods.

app/controllers/api_controller.rb

@@ -11,7 +11,7 @@ class ApiController < ActionController::Base
   protected
 
   def api_require_authentication!
-    return if is_logged_in?
+    return if logged_in?
 
     head :unauthorized
   end

app/controllers/authentication_controller.rb

@@ -40,7 +40,7 @@ class AuthenticationController < ApplicationController
   end
 
   def login_status
-    render text: is_logged_in?
+    render text: logged_in?
   end
 
   def create_password

app/controllers/members_controller.rb

@@ -7,7 +7,7 @@ class MembersController < ApplicationController
   # GET /members
   # GET /members.json
   def index
-    @admin = @group.is_leader?(current_person)
+    @admin = @group.leader?(current_person)
     @members = @group.members
                      .joins(:person)
                      .order('members.is_leader DESC, people.first_name ASC')

app/helpers/authentication_helper.rb

@@ -43,8 +43,8 @@ module AuthenticationHelper
 
   # Determine whether the user is logged in, and if so, disable the Session, then flush session cookies.
   def log_out(session_broken: false)
-    if !session_broken && is_logged_in? && @user_session
-      get_user_session
+    if !session_broken && logged_in? && @user_session
+      user_session
 
       @user_session.update!(active: false)
     end
@@ -57,12 +57,12 @@ module AuthenticationHelper
 
   # Determine whether the current request is from a user with a non-expired session.
   # Makes @user_session available as a side effect if the user is not.
-  def is_logged_in?
+  def logged_in?
     # Case 1: User has an active session inside the cookie.
     # We verify that the session hasn't expired yet.
     if session[:user_id] && session[:expires].to_time > DateTime.now
 
-      get_user_session
+      user_session
 
       return false if !@user_session.active || @user_session.expires < Time.now
 
@@ -74,7 +74,7 @@ module AuthenticationHelper
       if cookies.signed.permanent[:remember_token] && cookies.signed.permanent[:user_id] &&
          cookies.signed.permanent[:session_id]
 
-        get_user_session
+        user_session
 
         return false if @user_session.nil? || @user_session.remember_digest.nil?
 
@@ -94,7 +94,7 @@ module AuthenticationHelper
   end
 
   # Get the Session object representing the current user's session.
-  def get_user_session
+  def user_session
     if @user_session
       @user_session
     else
@@ -107,7 +107,7 @@ module AuthenticationHelper
   end
 
   def current_user
-    get_user_session
+    user_session
     @user_session&.user
   end
 
@@ -116,7 +116,7 @@ module AuthenticationHelper
   end
 
   def require_login!
-    unless is_logged_in?
+    unless logged_in?
       flash_message(:warning, I18n.t('authentication.login_required'))
       redirect_to controller: 'authentication', action: 'login_form'
       return false

app/helpers/groups_helper.rb

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

app/models/activity.rb

@@ -95,7 +95,7 @@ class Activity < ApplicationRecord
   end
 
   # Determine whether the passed Person participates in the activity.
-  def is_participant?(person)
+  def participant?(person)
     Participant.exists?(
       activity_id: self.id,
       person_id: person.id
@@ -103,7 +103,7 @@ class Activity < ApplicationRecord
   end
 
   # Determine whether the passed Person is an organizer for the activity.
-  def is_organizer?(person)
+  def organizer?(person)
     Participant.exists?(
       person_id: person.id,
       activity_id: self.id,
@@ -128,8 +128,8 @@ class Activity < ApplicationRecord
   # Determine whether the passed Person may change this activity.
   def may_change?(person)
     person.is_admin ||
-      self.is_organizer?(person) ||
-      self.group.is_leader?(person)
+      self.organizer?(person) ||
+      self.group.leader?(person)
   end
 
   # Create Participants for all People that

app/models/group.rb

@@ -64,7 +64,7 @@ class Group < ApplicationRecord
 
   # @return [Boolean]
   #   whether the passed person is a member of the group.
-  def is_member?(person)
+  def member?(person)
     Member.exists?(
       person: person,
       group: self
@@ -73,7 +73,7 @@ class Group < ApplicationRecord
 
   # @return [Boolean]
   #   whether the passed person is a group leader.
-  def is_leader?(person)
+  def leader?(person)
     Member.exists?(
       person: person,
       group: self,

app/views/groups/show.html.haml

@@ -17,7 +17,7 @@
             = @group.activities.count
             = t 'activities.plural'
 
-          - if @group.is_leader?(current_person)
+          - if @group.leader?(current_person)
             = link_to new_group_activity_path(@group), class: 'list-group-item' do
               = t 'activities.new'