Guard clauses for early returns

.rubocop.yml

@@ -9,6 +9,8 @@
 AllCops:
   Exclude:
     - 'db/schema.rb'
+    - 'bin/update'
+    - 'bin/setup'
 
 # Offense count: 30
 Metrics/AbcSize:
@@ -144,17 +146,6 @@ Style/DateTime:
 Style/Documentation:
   Enabled: false
 
-# Offense count: 6
-# Cop supports --auto-correct.
-Style/ExpandPathArguments:
-  Exclude:
-    - 'bin/bundle'
-    - 'bin/rails'
-    - 'bin/rake'
-    - 'bin/setup'
-    - 'bin/update'
-    - 'test/test_helper.rb'
-
 # Offense count: 140
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
@@ -170,12 +161,6 @@ Style/HashSyntax:
   Exclude:
     - 'lib/tasks/sessions.rake'
 
-# Offense count: 2
-Style/MixinUsage:
-  Exclude:
-    - 'bin/setup'
-    - 'bin/update'
-
 # Offense count: 1
 Style/MultilineTernaryOperator:
   Exclude:

app/helpers/activities_helper.rb

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

app/helpers/authentication_helper.rb

@@ -1,41 +1,43 @@
 module AuthenticationHelper
   # Create a new Session and set the relevant cookies.
-  def log_in(user, remember, new = true)
+  def log_in(user, remember, new_session = true)
     reset_session
 
     expiry = 6.hours.since
     session[:user_id] = user.id
     session[:expires] = expiry
 
-    if new
-      if remember == 1
-        token = Session.new_token
-        expiry = 1.years.since
-        cookies.signed.permanent[:remember_token] = {
-          value: token,
-          httponly: true
-        }
-        cookies.signed.permanent[:user_id] = {
-          value: user.id,
-          httponly: true
-        }
-      else
-        token = nil
-      end
-      s = Session.create!(
-        user: user,
-        ip: request.remote_ip,
-        expires: expiry,
-        remember_digest: token ? Session.digest(token) : nil
-      )
-      if remember
-        cookies.signed.permanent[:session_id] = {
-          value: s.id,
-          httponly: true
-        }
-      else
-        session[:session_id] = s.id
-      end
+    return unless new_session
+
+    if remember == 1
+      token = Session.new_token
+      expiry = 1.years.since
+      cookies.signed.permanent[:remember_token] = {
+        value: token,
+        httponly: true
+      }
+      cookies.signed.permanent[:user_id] = {
+        value: user.id,
+        httponly: true
+      }
+    else
+      token = nil
+    end
+
+    s = Session.create!(
+      user: user,
+      ip: request.remote_ip,
+      expires: expiry,
+      remember_digest: token ? Session.digest(token) : nil
+    )
+
+    if remember
+      cookies.signed.permanent[:session_id] = {
+        value: s.id,
+        httponly: true
+      }
+    else
+      session[:session_id] = s.id
     end
   end
 
@@ -127,9 +129,9 @@ module AuthenticationHelper
   end
 
   def require_admin!
-    unless current_person.is_admin?
-      flash_message(:danger, I18n.t('authentication.admin_required'))
-      redirect_to '/dashboard'
-    end
+    return if current_person.is_admin?
+
+    flash_message(:danger, I18n.t('authentication.admin_required'))
+    redirect_to '/dashboard'
   end
 end

app/helpers/groups_helper.rb

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

bin/bundle

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
 load Gem.bin_path('bundler', 'bundle')

bin/rails

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 begin
-  load File.expand_path('../spring', __FILE__)
+  load File.expand_path('spring', __dir__)
 rescue LoadError => e
   raise unless e.message.include?('spring')
 end

bin/rake

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 begin
-  load File.expand_path('../spring', __FILE__)
+  load File.expand_path('spring', __dir__)
 rescue LoadError => e
   raise unless e.message.include?('spring')
 end

bin/setup

@@ -4,7 +4,7 @@ require 'fileutils'
 include FileUtils
 
 # path to your application root.
-APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
+APP_ROOT = Pathname.new File.expand_path('..', __dir__)
 
 def system!(*args)
   system(*args) || abort("\n== Command #{args} failed ==")

bin/update

@@ -4,7 +4,7 @@ require 'fileutils'
 include FileUtils
 
 # path to your application root.
-APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
+APP_ROOT = Pathname.new File.expand_path('..', __dir__)
 
 def system!(*args)
   system(*args) || abort("\n== Command #{args} failed ==")

test/test_helper.rb

@@ -1,5 +1,5 @@
 ENV['RAILS_ENV'] ||= 'test'
-require File.expand_path('../../config/environment', __FILE__)
+require File.expand_path('../config/environment', __dir__)
 require 'rails/test_help'
 
 class ActiveSupport::TestCase