Indentation fixes

.rubocop.yml

@@ -22,27 +22,6 @@ Layout/AlignHash:
     - 'app/views/api/activities/show.rabl'
     - 'db/seeds.rb'
 
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, IndentationWidth.
-# SupportedStyles: special_inside_parentheses, consistent, align_braces
-Layout/IndentHash:
-  Exclude:
-    - 'config/environments/development.rb'
-    - 'config/environments/production.rb'
-
-# Offense count: 18
-# Cop supports --auto-correct.
-# Configuration parameters: Width, IgnoredPatterns.
-Layout/IndentationWidth:
-  Exclude:
-    - 'app/controllers/activities_controller.rb'
-    - 'app/controllers/api/people_controller.rb'
-    - 'app/controllers/groups_controller.rb'
-    - 'app/controllers/members_controller.rb'
-    - 'app/controllers/people_controller.rb'
-    - 'app/models/activity.rb'
-
 # Offense count: 1
 # Cop supports --auto-correct.
 Layout/LeadingCommentSpace:
@@ -55,30 +34,6 @@ Layout/MultilineBlockLayout:
   Exclude:
     - 'app/models/activity.rb'
 
-# Offense count: 75
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, IndentationWidth.
-# SupportedStyles: aligned, indented, indented_relative_to_receiver
-Layout/MultilineMethodCallIndentation:
-  Exclude:
-    - 'app/controllers/activities_controller.rb'
-    - 'app/controllers/dashboard_controller.rb'
-    - 'app/controllers/groups_controller.rb'
-    - 'app/controllers/members_controller.rb'
-    - 'app/mailers/participant_mailer.rb'
-    - 'app/models/activity.rb'
-    - 'app/models/person.rb'
-
-# Offense count: 7
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, IndentationWidth.
-# SupportedStyles: aligned, indented
-Layout/MultilineOperationIndentation:
-  Exclude:
-    - 'app/helpers/authentication_helper.rb'
-    - 'app/models/activity.rb'
-    - 'app/models/participant.rb'
-
 # Offense count: 2
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.

app/controllers/activities_controller.rb

@@ -26,14 +26,14 @@ class ActivitiesController < ApplicationController
   def index
     if params[:past]
       @activities = @group.activities
-        .where('start < ?', Time.now)
-        .order(start: :desc)
-        .paginate(page: params[:page], per_page: 25)
+                          .where('start < ?', Time.now)
+                          .order(start: :desc)
+                          .paginate(page: params[:page], per_page: 25)
     else
       @activities = @group.activities
-        .where('start > ?', Time.now)
-        .order(start: :asc)
-        .paginate(page: params[:page], per_page: 25)
+                          .where('start > ?', Time.now)
+                          .order(start: :asc)
+                          .paginate(page: params[:page], per_page: 25)
     end
   end
 
@@ -41,26 +41,26 @@ class ActivitiesController < ApplicationController
   # GET /activities/1.json
   def show
     @participants = @activity.participants
-      .joins(:person)
-      .order(attending: :desc)
-      .order('people.first_name ASC')
+                             .joins(:person)
+                             .order(attending: :desc)
+                             .order('people.first_name ASC')
     @organizers = @activity.participants
-      .joins(:person)
-      .where(is_organizer: true)
-      .order('people.first_name ASC')
-      .map{|p| p.person.full_name}
-      .join(', ')
+                           .joins(:person)
+                           .where(is_organizer: true)
+                           .order('people.first_name ASC')
+                           .map{|p| p.person.full_name}
+                           .join(', ')
     @ownparticipant = @activity.participants
-      .find_by(person: current_person)
+                               .find_by(person: current_person)
     @counts = @activity.state_counts
     @num_participants = @counts.values.sum
     @assignable_subgroups = @activity.subgroups
-      .where(is_assignable: true)
-      .order(name: :asc)
-      .pluck(:name)
+                                     .where(is_assignable: true)
+                                     .order(name: :asc)
+                                     .pluck(:name)
     @subgroup_ids = @activity.subgroups
-      .order(name: :asc)
-      .pluck(:name, :id)
+                             .order(name: :asc)
+                             .pluck(:name, :id)
     @subgroup_ids.prepend( [I18n.t('activities.subgroups.filter_nofilter'), 'all'] )
     @subgroup_ids.append( [I18n.t('activities.subgroups.filter_nogroup'), 'withoutgroup'] )
   end
@@ -88,10 +88,10 @@ class ActivitiesController < ApplicationController
     @subgroup_options.prepend(['--', 'nil'])
 
     @participants = @activity.participants
-      .joins(:person)
-      .where.not(attending: false)
-      .order(:subgroup_id)
-      .order('people.first_name', 'people.last_name')
+                             .joins(:person)
+                             .where.not(attending: false)
+                             .order(:subgroup_id)
+                             .order('people.first_name', 'people.last_name')
   end
 
   # POST /activities/1/update_subgroups

app/controllers/dashboard_controller.rb

@@ -3,18 +3,18 @@ class DashboardController < ApplicationController
 
   def home
     @upcoming = current_person
-      .participants
-      .joins(:activity)
-      .where('activities.end >= ? OR (activities.end IS NULL AND activities.start >= ?)', DateTime.now, DateTime.now)
-      .order('activities.start ASC')
+                .participants
+                .joins(:activity)
+                .where('activities.end >= ? OR (activities.end IS NULL AND activities.start >= ?)', DateTime.now, DateTime.now)
+                .order('activities.start ASC')
     @user_organized = @upcoming
-      .where(is_organizer: true)
-      .limit(3)
+                      .where(is_organizer: true)
+                      .limit(3)
     @upcoming = @upcoming
-      .paginate(page: params[:upage], per_page: 10)
+                .paginate(page: params[:upage], per_page: 10)
     @need_response = @upcoming
-      .where(attending: nil)
-      .paginate(page: params[:nrpage], per_page: 5)
+                     .where(attending: nil)
+                     .paginate(page: params[:nrpage], per_page: 5)
   end
 
   def set_settings_params!

app/controllers/groups_controller.rb

@@ -22,10 +22,10 @@ class GroupsController < ApplicationController
   # GET /groups/1.json
   def show
     @organized_activities = current_person
-      .organized_activities
-      .joins(:activity)
-      .where('activities.group_id': @group.id)
-      .where('start > ?', Date.today)
+                            .organized_activities
+                            .joins(:activity)
+                            .where('activities.group_id': @group.id)
+                            .where('start > ?', Date.today)
 
     if @organized_activities.any?
       @groupmenu = 'col-md-6'
@@ -34,13 +34,13 @@ class GroupsController < ApplicationController
     end
 
     @upcoming = @group.activities
-      .where('start > ?', Date.today)
-      .order('start ASC')
+                      .where('start > ?', Date.today)
+                      .order('start ASC')
     @upcoming_ps = Participant
-      .where(person: current_person)
-      .where(activity: @upcoming)
-      .map{ |p| [p.activity_id, p]}
-      .to_h
+                   .where(person: current_person)
+                   .where(activity: @upcoming)
+                   .map{ |p| [p.activity_id, p]}
+                   .to_h
   end
 
   # GET /groups/new

app/controllers/members_controller.rb

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

app/helpers/authentication_helper.rb

@@ -70,7 +70,7 @@ module AuthenticationHelper
       # Case 2: User is returning and has a remember token saved.
       # We get the Session, check the token and expiry, and log the user in.
       if cookies.signed.permanent[:remember_token] && cookies.signed.permanent[:user_id] &&
-          cookies.signed.permanent[:session_id]
+         cookies.signed.permanent[:session_id]
 
         get_user_session
 
@@ -81,7 +81,7 @@ module AuthenticationHelper
         session_password = BCrypt::Password.new @user_session.remember_digest
 
         if @user_session.expires > DateTime.now &&
-            session_password == cookies.signed.permanent[:remember_token]
+           session_password == cookies.signed.permanent[:remember_token]
           log_in @user_session.user, false, false
           return true
         end

app/mailers/participant_mailer.rb

@@ -21,21 +21,21 @@ class ParticipantMailer < ApplicationMailer
     @subgroup = participant.subgroup.name
 
     @others = participant
-      .subgroup
-      .participants
-      .where.not(person: @person)
-      .map { |pp| pp.person.full_name }
-      .sort
-      .join(', ')
+              .subgroup
+              .participants
+              .where.not(person: @person)
+              .map { |pp| pp.person.full_name }
+              .sort
+              .join(', ')
 
     @subgroups = @activity
-      .subgroups
-      .order(name: :asc)
+                 .subgroups
+                 .order(name: :asc)
 
     @organizers = @activity
-      .organizer_names
-      .sort
-      .join(', ')
+                  .organizer_names
+                  .sort
+                  .join(', ')
 
     subject = I18n.t('activities.emails.subgroup_notification.subject', subgroup: @subgroup, activity: @activity.name)
 

app/models/activity.rb

@@ -79,8 +79,8 @@ class Activity < ApplicationRecord
   after_commit :schedule_subgroup_division,
                if: Proc.new { |a| (a.previous_changes['deadline'] ||
                                    a.previous_changes['subgroup_division_enabled']) &&
-                                  !a.subgroup_division_done &&
-                                  a.subgroup_division_enabled
+                 !a.subgroup_division_done &&
+                 a.subgroup_division_enabled
                    }
 
   # Get all people (not participants) that are organizers. Does not include
@@ -127,8 +127,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.is_organizer?(person) ||
+      self.group.is_leader?(person)
   end
 
   # Create Participants for all People that
@@ -244,19 +244,19 @@ class Activity < ApplicationRecord
 
     # Get participants in random order
     ps = self
-      .participants
-      .where(attending: true)
-      .where(subgroup: nil)
-      .to_a
+         .participants
+         .where(attending: true)
+         .where(subgroup: nil)
+         .to_a
 
     ps.shuffle!
 
     # Get groups, link to participant count
     groups = self
-      .subgroups
-      .where(is_assignable: true)
-      .to_a
-      .map { |sg| [sg.participants.count, sg] }
+             .subgroups
+             .where(is_assignable: true)
+             .to_a
+             .map { |sg| [sg.participants.count, sg] }
 
     ps.each do |p|
       # Sort groups so the group with the least participants gets the following participant
@@ -277,16 +277,16 @@ class Activity < ApplicationRecord
 
   def clear_subgroups!(only_assignable = true)
     sgs = self
-      .subgroups
+          .subgroups
 
     if only_assignable
-    sgs = sgs
-      .where(is_assignable: true)
+      sgs = sgs
+            .where(is_assignable: true)
     end
 
     ps = self
-      .participants
-      .where(subgroup: sgs)
+         .participants
+         .where(subgroup: sgs)
 
     ps.each do |p|
       p.subgroup = nil
@@ -297,9 +297,9 @@ class Activity < ApplicationRecord
   # Notify participants of the current subgroups, if any.
   def notify_subgroups!
     ps = self
-      .participants
-      .joins(:person)
-      .where.not(subgroup: nil)
+         .participants
+         .joins(:person)
+         .where.not(subgroup: nil)
 
     ps.each do |pp|
       pp.send_subgroup_notification

app/models/participant.rb

@@ -66,7 +66,7 @@ class Participant < ApplicationRecord
 
   def may_change?(person)
     self.activity.may_change?(person) ||
-    self.person == person
+      self.person == person
   end
 
   # Set attending to true if nil, and notify the Person via email.

app/models/person.rb

@@ -112,13 +112,13 @@ class Person < ApplicationRecord
     tzid = 1.seconds.since.time_zone.tzinfo.name
 
     selection = self
-      .participants
-      .joins(:activity)
-      .where('"end" > ?', 3.months.ago)
+                .participants
+                .joins(:activity)
+                .where('"end" > ?', 3.months.ago)
 
     if skip_absent
       selection = selection
-        .where.not(attending: false)
+                  .where.not(attending: false)
     end
 
     selection.each do |p|

config/environments/development.rb

@@ -60,7 +60,7 @@ Rails.application.configure do
     authentication: :plain
   }
   config.action_mailer.mailgun_settings = {
-        api_key: ENV['MAILGUN_API_KEY'],
-        domain: ENV['MAILGUN_DOMAIN']
+    api_key: ENV['MAILGUN_API_KEY'],
+    domain: ENV['MAILGUN_DOMAIN']
   }
 end

config/environments/production.rb

@@ -92,7 +92,7 @@ Rails.application.configure do
     authentication: :plain
   }
   config.action_mailer.mailgun_settings = {
-        api_key: ENV['MAILGUN_API_KEY'],
-        domain: ENV['MAILGUN_DOMAIN']
+    api_key: ENV['MAILGUN_API_KEY'],
+    domain: ENV['MAILGUN_DOMAIN']
   }
 end