Block Delimiters, BracesAroundHashParameters

.rubocop.yml

@@ -45,29 +45,6 @@ Metrics/ModuleLength:
 Metrics/PerceivedComplexity:
   Max: 13
 
-# Offense count: 9
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, ProceduralMethods, FunctionalMethods, IgnoredMethods.
-# SupportedStyles: line_count_based, semantic, braces_for_chaining
-# ProceduralMethods: benchmark, bm, bmbm, create, each_with_object, measure, new, realtime, tap, with_object
-# FunctionalMethods: let, let!, subject, watch
-# IgnoredMethods: lambda, proc, it
-Style/BlockDelimiters:
-  Exclude:
-    - 'app/controllers/activities_controller.rb'
-    - 'app/controllers/groups_controller.rb'
-    - 'app/controllers/members_controller.rb'
-
-# Offense count: 3
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: braces, no_braces, context_dependent
-Style/BracesAroundHashParameters:
-  Exclude:
-    - 'app/models/activity.rb'
-    - 'app/models/person.rb'
-    - 'config/environments/production.rb'
-
 # Offense count: 2
 # Cop supports --auto-correct.
 Style/ClassMethods:

app/controllers/activities_controller.rb

@@ -171,10 +171,10 @@ class ActivitiesController < ApplicationController
 
     respond_to do |format|
       if @activity.save
-        format.html {
+        format.html do
           redirect_to group_activity_url(@group, @activity)
           flash_message(:info, I18n.t('activities.created'))
-        }
+        end
         format.json { render :show, status: :created, location: @activity }
       else
         format.html { render :new }
@@ -205,10 +205,10 @@ class ActivitiesController < ApplicationController
   def update
     respond_to do |format|
       if @activity.update(activity_params)
-        format.html {
+        format.html do
           redirect_to group_activity_url(@group, @activity)
           flash_message(:info, I18n.t('activities.updated'))
-        }
+        end
         format.json { render :show, status: :ok, location: @activity }
       else
         set_edit_parameters!
@@ -223,10 +223,10 @@ class ActivitiesController < ApplicationController
   def destroy
     @activity.destroy
     respond_to do |format|
-      format.html {
+      format.html do
         redirect_to group_activities_url(@group)
         flash_message(:info, 'Activity was successfully destroyed.')
-      }
+      end
       format.json { head :no_content }
     end
   end

app/controllers/groups_controller.rb

@@ -60,10 +60,10 @@ class GroupsController < ApplicationController
 
     respond_to do |format|
       if @group.save
-        format.html {
+        format.html do
           redirect_to @group
           flash_message(:info, I18n.t('groups.created'))
-        }
+        end
         format.json { render :show, status: :created, location: @group }
       else
         format.html { render :new }
@@ -77,10 +77,10 @@ class GroupsController < ApplicationController
   def update
     respond_to do |format|
       if @group.update(group_params)
-        format.html {
+        format.html do
           redirect_to @group
           flash_message(:info, I18n.t('groups.updated'))
-        }
+        end
         format.json { render :show, status: :ok, location: @group }
       else
         @defaultsubgroup = DefaultSubgroup.new
@@ -95,10 +95,10 @@ class GroupsController < ApplicationController
   def destroy
     @group.destroy
     respond_to do |format|
-      format.html {
+      format.html do
         redirect_to groups_url
         flash_message(:info, I18n.t('groups.destroyed'))
-      }
+      end
       format.json { head :no_content }
     end
   end

app/controllers/members_controller.rb

@@ -87,10 +87,10 @@ class MembersController < ApplicationController
 
     respond_to do |format|
       if @member.save
-        format.html {
+        format.html do
           redirect_to group_member_url(@group, @member)
           flash_message(:info, I18n.t('groups.member_added', name: @member.person.full_name))
-        }
+        end
         format.json { render :show, status: :created, location: @member }
       else
         @possible_members = Person.where.not(id: @group.person_ids)
@@ -105,10 +105,10 @@ class MembersController < ApplicationController
   def update
     respond_to do |format|
       if @member.update(member_params)
-        format.html {
+        format.html do
           redirect_to group_member_url(@group, @member)
           flash_message(:info, I18n.t('groups.member_updated'))
-        }
+        end
         format.json { render :show, status: :ok, location: @member }
       else
         @possible_members = Person.where.not(id: @group.person_ids)
@@ -123,10 +123,10 @@ class MembersController < ApplicationController
   def destroy
     @member.destroy
     respond_to do |format|
-      format.html {
+      format.html do
         redirect_to group_members_url(@group)
         flash_message(:info, I18n.t('groups.member_removed', name: @member.person.full_name))
-      }
+      end
       format.json { head :no_content }
     end
   end

app/models/activity.rb

@@ -164,7 +164,7 @@ class Activity < ApplicationRecord
 
   # Create multiple Activities from data in a CSV file, assign to a group, return.
   def self.from_csv(content, group)
-    reader = CSV.parse(content, { headers: true, skip_blanks: true })
+    reader = CSV.parse(content, headers: true, skip_blanks: true)
 
     result = []
     reader.each do |row|

app/models/person.rb

@@ -77,7 +77,7 @@ class Person < ApplicationRecord
 
   # Create multiple Persons from data found in a csv file, return those.
   def self.from_csv(content)
-    reader = CSV.parse(content, { headers: true, skip_blanks: true })
+    reader = CSV.parse(content, headers: true, skip_blanks: true)
 
     result = []
     reader.each do |row|

config/environments/production.rb

@@ -19,7 +19,7 @@ Rails.application.configure do
   config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present?
 
   # Compress JavaScripts and CSS.
-  config.assets.js_compressor = Uglifier.new({ harmony: true })
+  config.assets.js_compressor = Uglifier.new(harmony: true)
   # config.assets.css_compressor = :sass
 
   # Do not fallback to assets pipeline if a precompiled asset is missed.