Proc style, redundant returns

.rubocop.yml

@@ -246,15 +246,6 @@ Style/RedundantParentheses:
   Exclude:
     - 'db/seeds.rb'
 
-# Offense count: 5
-# Cop supports --auto-correct.
-# Configuration parameters: AllowMultipleReturnValues.
-Style/RedundantReturn:
-  Exclude:
-    - 'app/helpers/authentication_helper.rb'
-    - 'app/models/activity.rb'
-    - 'app/models/person.rb'
-
 # Offense count: 85
 # Cop supports --auto-correct.
 Style/RedundantSelf:
@@ -282,17 +273,6 @@ Style/StringLiterals:
 Style/SymbolArray:
   EnforcedStyle: brackets
 
-# Offense count: 5
-# Cop supports --auto-correct.
-# Configuration parameters: IgnoredMethods.
-# IgnoredMethods: respond_to, define_method
-Style/SymbolProc:
-  Exclude:
-    - 'app/controllers/activities_controller.rb'
-    - 'app/models/activity.rb'
-    - 'app/models/member.rb'
-    - 'db/migrate/20180904163645_generate_calendar_tokens.rb'
-
 # Offense count: 3
 # Cop supports --auto-correct.
 # Configuration parameters: WordRegex.

app/controllers/activities_controller.rb

@@ -298,9 +298,7 @@ class ActivitiesController < ApplicationController
     uploaded_io = params[:spreadsheet]
     result = Activity.from_csv(uploaded_io.read, @group)
 
-    result.each do |a|
-      a.save!
-    end
+    result.each(&:save!)
 
     flash_message(:success, I18n.t('activities.mass_imported', count: result.count))
     redirect_to group_activities_path(@group)

app/helpers/authentication_helper.rb

@@ -64,7 +64,7 @@ module AuthenticationHelper
 
       return false if !@user_session.active || @user_session.expires < Time.now
 
-      return true
+      true
 
     else
       # Case 2: User is returning and has a remember token saved.
@@ -89,7 +89,7 @@ module AuthenticationHelper
         return false
       end
 
-      return false
+      false
     end
   end
 
@@ -127,7 +127,7 @@ module AuthenticationHelper
     Raven.user_context(
       user_firstname: current_person.first_name
     )
-    return true
+    true
   end
 
   def require_admin!

app/models/activity.rb

@@ -122,7 +122,7 @@ class Activity < ApplicationRecord
     p = c[true]
     a = c[false]
     u = c[nil]
-    return "#{p || 0}, #{a || 0}, #{u || 0}"
+    "#{p || 0}, #{a || 0}, #{u || 0}"
   end
 
   # Determine whether the passed Person may change this activity.
@@ -220,7 +220,7 @@ class Activity < ApplicationRecord
     return if self.reminder_at > Time.zone.now
 
     participants = self.participants.where(attending: nil)
-    participants.each { |p| p.send_reminder }
+    participants.each(&:send_reminder)
 
     self.reminder_done = true
     self.save
@@ -302,9 +302,7 @@ class Activity < ApplicationRecord
          .joins(:person)
          .where.not(subgroup: nil)
 
-    ps.each do |pp|
-      pp.send_subgroup_notification
-    end
+    ps.each(&:send_subgroup_notification)
   end
 
   private

app/models/member.rb

@@ -44,8 +44,6 @@ class Member < ApplicationRecord
       activity: self.group.future_activities
     )
 
-    participants.each do |p|
-      p.destroy!
-    end
+    participants.each(&:destroy!)
   end
 end

app/models/person.rb

@@ -94,7 +94,7 @@ class Person < ApplicationRecord
       result << p
     end
 
-    return result
+    result
   end
 
   # @return [String]

db/migrate/20180904163645_generate_calendar_tokens.rb

@@ -1,8 +1,6 @@
 class GenerateCalendarTokens < ActiveRecord::Migration[5.0]
   def up
-    Person.all.each do |p|
-      p.regenerate_calendar_token
-    end
+    Person.all.each(&:regenerate_calendar_token)
   end
 
   def down; end