Guard clause, if-unless, parentheses

.rubocop.yml

@@ -162,18 +162,6 @@ Style/ExpandPathArguments:
 Style/FrozenStringLiteralComment:
   Enabled: false
 
-# Offense count: 14
-# Configuration parameters: MinBodyLength.
-Style/GuardClause:
-  Exclude:
-    - 'app/controllers/people_controller.rb'
-    - 'app/helpers/activities_helper.rb'
-    - 'app/helpers/authentication_helper.rb'
-    - 'app/helpers/groups_helper.rb'
-    - 'app/models/activity.rb'
-    - 'app/models/person.rb'
-    - 'app/models/user.rb'
-
 # Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols.
@@ -182,27 +170,6 @@ Style/HashSyntax:
   Exclude:
     - 'lib/tasks/sessions.rake'
 
-# Offense count: 20
-# Cop supports --auto-correct.
-Style/IfUnlessModifier:
-  Exclude:
-    - 'app/controllers/activities_controller.rb'
-    - 'app/controllers/authentication_controller.rb'
-    - 'app/controllers/people_controller.rb'
-    - 'app/helpers/authentication_helper.rb'
-    - 'app/models/activity.rb'
-    - 'app/models/person.rb'
-    - 'app/models/user.rb'
-    - 'config/puma.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: require_parentheses, require_no_parentheses, require_no_parentheses_except_multiline
-Style/MethodDefParentheses:
-  Exclude:
-    - 'app/helpers/dashboard_helper.rb'
-
 # Offense count: 2
 Style/MixinUsage:
   Exclude:

app/controllers/activities_controller.rb

@@ -127,9 +127,7 @@ class ActivitiesController < ApplicationController
 
   # POST /activities/1/immediate_subgroups
   def immediate_subgroups
-    if params[:overwrite]
-      @activity.clear_subgroups!
-    end
+    @activity.clear_subgroups! if params[:overwrite]
 
     @activity.assign_subgroups!
 
@@ -284,9 +282,7 @@ class ActivitiesController < ApplicationController
       return
     end
 
-    if params[:participant]
-      params[:notes] = params[:participant][:notes]
-    end
+    params[:notes] = params[:participant][:notes] if params[:participant]
     participant.update_attributes(params.permit(:notes, :attending))
     head :no_content
   end

app/controllers/authentication_controller.rb

@@ -91,9 +91,7 @@ class AuthenticationController < ApplicationController
 
   def reset_password_form
     token = Token.find_by(token: params[:token], tokentype: Token::TYPES[:password_reset])
-    unless token_valid? token
-      return
-    end
+    return unless token_valid? token
 
     render layout: 'void'
   end

app/controllers/people_controller.rb

@@ -13,9 +13,7 @@ class PeopleController < ApplicationController
   # GET /people/1
   # GET /people/1.json
   def show
-    if @person != current_person
-      require_admin!
-    end
+    require_admin! if @person != current_person
   end
 
   # GET /people/new

app/helpers/authentication_helper.rb

@@ -74,9 +74,7 @@ module AuthenticationHelper
 
         get_user_session
 
-        if @user_session.nil? || @user_session.remember_digest.nil?
-          return false
-        end
+        return false if @user_session.nil? || @user_session.remember_digest.nil?
 
         session_password = BCrypt::Password.new @user_session.remember_digest
 
@@ -103,9 +101,7 @@ module AuthenticationHelper
     end
 
     # Edge case if a session no longer exists in the database
-    unless @user_session
-      log_out(session_broken: true)
-    end
+    log_out(session_broken: true) unless @user_session
   end
 
   def current_user

app/helpers/dashboard_helper.rb

@@ -1,5 +1,5 @@
 module DashboardHelper
-  def xeditable? obj = nil
+  def xeditable?(obj = nil)
     obj.may_change?(current_person)
   end
 end

app/models/activity.rb

@@ -137,9 +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
-    unless self.participants.empty?
-      people = people.where('people.id NOT IN (?)', self.people.ids)
-    end
+    people = people.where('people.id NOT IN (?)', self.people.ids) unless self.participants.empty?
 
     people.each do |p|
       Participant.create(
@@ -198,13 +196,9 @@ class Activity < ApplicationRecord
         a.reminder_at = Time.zone.local(rd.year, rd.month, rd.day, rt.hour, rt.min)
       end
 
-      unless row['subgroup_division_enabled'].blank?
-        a.subgroup_division_enabled = row['subgroup_division_enabled'].casecmp('y').zero?
-      end
+      a.subgroup_division_enabled = row['subgroup_division_enabled'].casecmp('y').zero? unless row['subgroup_division_enabled'].blank?
 
-      unless row['no_response_action'].blank?
-        a.no_response_action = row['no_response_action'].casecmp('p').zero?
-      end
+      a.no_response_action = row['no_response_action'].casecmp('p').zero? unless row['no_response_action'].blank?
 
       result << a
     end
@@ -271,9 +265,7 @@ class Activity < ApplicationRecord
       groups.first[0] += 1
     end
 
-    if mail
-      self.notify_subgroups!
-    end
+    self.notify_subgroups! if mail
   end
 
   def clear_subgroups!(only_assignable = true)
@@ -310,30 +302,22 @@ class Activity < ApplicationRecord
   # Assert that the deadline for participants to change the deadline, if any,
   # is set before the event starts.
   def deadline_before_start
-    if self.deadline > self.start
-      errors.add(:deadline, I18n.t('activities.errors.must_be_before_start'))
-    end
+    errors.add(:deadline, I18n.t('activities.errors.must_be_before_start')) if self.deadline > self.start
   end
 
   # Assert that the activity's end, if any, occurs after the event's start.
   def end_after_start
-    if self.end < self.start
-      errors.add(:end, I18n.t('activities.errors.must_be_after_start'))
-    end
+    errors.add(:end, I18n.t('activities.errors.must_be_after_start')) if self.end < self.start
   end
 
   # Assert that the reminder for non-response is sent while participants still
   # can change their response.
   def reminder_before_deadline
-    if self.reminder_at > self.deadline
-      errors.add(:reminder_at, I18n.t('activities.errors.must_be_before_deadline'))
-    end
+    errors.add(:reminder_at, I18n.t('activities.errors.must_be_before_deadline')) if self.reminder_at > self.deadline
   end
 
   # Assert that there is at least one divisible subgroup.
   def subgroups_for_division_present
-    if self.subgroups.where(is_assignable: true).none? && subgroup_division_enabled?
-      errors.add(:subgroup_division_enabled, I18n.t('activities.errors.cannot_divide_without_subgroups'))
-    end
+    errors.add(:subgroup_division_enabled, I18n.t('activities.errors.cannot_divide_without_subgroups')) if self.subgroups.where(is_assignable: true).none? && subgroup_division_enabled?
   end
 end

app/models/person.rb

@@ -135,9 +135,7 @@ class Person < ApplicationRecord
       # Response
       yourresponse = "#{I18n.t 'activities.participant.yourresponse'}: #{p.human_attending}"
 
-      if p.notes.present?
-        yourresponse << " (#{p.notes})"
-      end
+      yourresponse << " (#{p.notes})" if p.notes.present?
 
       description_items << yourresponse
 
@@ -157,9 +155,7 @@ class Person < ApplicationRecord
 
       # Subgroups
       if a.subgroups.any?
-        if p.subgroup
-          description_items << "#{I18n.t 'activities.participant.yoursubgroup'}: #{p.subgroup}"
-        end
+        description_items << "#{I18n.t 'activities.participant.yoursubgroup'}: #{p.subgroup}" if p.subgroup
 
         subgroup_names = a.subgroups.map(&:name).join ', '
         description_items << "#{I18n.t 'activerecord.models.subgroup.other'}: #{subgroup_names}"
@@ -194,9 +190,7 @@ class Person < ApplicationRecord
 
   # Assert that the person's birth date, if any, lies in the past.
   def birth_date_cannot_be_in_future
-    if self.birth_date && self.birth_date > Date.today
-      errors.add(:birth_date, I18n.t('person.errors.cannot_future'))
-    end
+    errors.add(:birth_date, I18n.t('person.errors.cannot_future')) if self.birth_date && self.birth_date > Date.today
   end
 
   # Explicitly force nil to false in the admin field.

app/models/user.rb

@@ -30,8 +30,6 @@ 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 && (self.email != self.person.email)
-      errors.add(:email, I18n.t('authentication.user_person_mail_mismatch'))
-    end
+    errors.add(:email, I18n.t('authentication.user_person_mail_mismatch')) if self.person && (self.email != self.person.email)
   end
 end

config/puma.rb

@@ -17,9 +17,7 @@ env = ENV.fetch("RAILS_ENV") { "development" }
 environment env
 
 state_path "#{ENV['AARDBEI_PATH']}/tmp/pids/puma.state"
-if env == "production"
-  stdout_redirect "#{ENV['AARDBEI_PATH']}/log/stdout", "#{ENV['AARDBEI_PATH']}/log/stderr", true
-end
+stdout_redirect "#{ENV['AARDBEI_PATH']}/log/stdout", "#{ENV['AARDBEI_PATH']}/log/stderr", true if env == "production"
 
 # Specifies the number of `workers` to boot in clustered mode.
 # Workers are forked webserver processes. If using threads and workers together