Browse Source

Block Delimiters, BracesAroundHashParameters

Maarten van den Berg 6 years ago
parent
commit
76093fceef

+ 0 - 23
.rubocop.yml

45
 Metrics/PerceivedComplexity:
45
 Metrics/PerceivedComplexity:
46
   Max: 13
46
   Max: 13
47
 
47
 
48
-# Offense count: 9
49
-# Cop supports --auto-correct.
50
-# Configuration parameters: EnforcedStyle, ProceduralMethods, FunctionalMethods, IgnoredMethods.
51
-# SupportedStyles: line_count_based, semantic, braces_for_chaining
52
-# ProceduralMethods: benchmark, bm, bmbm, create, each_with_object, measure, new, realtime, tap, with_object
53
-# FunctionalMethods: let, let!, subject, watch
54
-# IgnoredMethods: lambda, proc, it
55
-Style/BlockDelimiters:
56
-  Exclude:
57
-    - 'app/controllers/activities_controller.rb'
58
-    - 'app/controllers/groups_controller.rb'
59
-    - 'app/controllers/members_controller.rb'
60
-
61
-# Offense count: 3
62
-# Cop supports --auto-correct.
63
-# Configuration parameters: EnforcedStyle.
64
-# SupportedStyles: braces, no_braces, context_dependent
65
-Style/BracesAroundHashParameters:
66
-  Exclude:
67
-    - 'app/models/activity.rb'
68
-    - 'app/models/person.rb'
69
-    - 'config/environments/production.rb'
70
-
71
 # Offense count: 2
48
 # Offense count: 2
72
 # Cop supports --auto-correct.
49
 # Cop supports --auto-correct.
73
 Style/ClassMethods:
50
 Style/ClassMethods:

+ 6 - 6
app/controllers/activities_controller.rb

171
 
171
 
172
     respond_to do |format|
172
     respond_to do |format|
173
       if @activity.save
173
       if @activity.save
174
-        format.html {
174
+        format.html do
175
           redirect_to group_activity_url(@group, @activity)
175
           redirect_to group_activity_url(@group, @activity)
176
           flash_message(:info, I18n.t('activities.created'))
176
           flash_message(:info, I18n.t('activities.created'))
177
-        }
177
+        end
178
         format.json { render :show, status: :created, location: @activity }
178
         format.json { render :show, status: :created, location: @activity }
179
       else
179
       else
180
         format.html { render :new }
180
         format.html { render :new }
205
   def update
205
   def update
206
     respond_to do |format|
206
     respond_to do |format|
207
       if @activity.update(activity_params)
207
       if @activity.update(activity_params)
208
-        format.html {
208
+        format.html do
209
           redirect_to group_activity_url(@group, @activity)
209
           redirect_to group_activity_url(@group, @activity)
210
           flash_message(:info, I18n.t('activities.updated'))
210
           flash_message(:info, I18n.t('activities.updated'))
211
-        }
211
+        end
212
         format.json { render :show, status: :ok, location: @activity }
212
         format.json { render :show, status: :ok, location: @activity }
213
       else
213
       else
214
         set_edit_parameters!
214
         set_edit_parameters!
223
   def destroy
223
   def destroy
224
     @activity.destroy
224
     @activity.destroy
225
     respond_to do |format|
225
     respond_to do |format|
226
-      format.html {
226
+      format.html do
227
         redirect_to group_activities_url(@group)
227
         redirect_to group_activities_url(@group)
228
         flash_message(:info, 'Activity was successfully destroyed.')
228
         flash_message(:info, 'Activity was successfully destroyed.')
229
-      }
229
+      end
230
       format.json { head :no_content }
230
       format.json { head :no_content }
231
     end
231
     end
232
   end
232
   end

+ 6 - 6
app/controllers/groups_controller.rb

60
 
60
 
61
     respond_to do |format|
61
     respond_to do |format|
62
       if @group.save
62
       if @group.save
63
-        format.html {
63
+        format.html do
64
           redirect_to @group
64
           redirect_to @group
65
           flash_message(:info, I18n.t('groups.created'))
65
           flash_message(:info, I18n.t('groups.created'))
66
-        }
66
+        end
67
         format.json { render :show, status: :created, location: @group }
67
         format.json { render :show, status: :created, location: @group }
68
       else
68
       else
69
         format.html { render :new }
69
         format.html { render :new }
77
   def update
77
   def update
78
     respond_to do |format|
78
     respond_to do |format|
79
       if @group.update(group_params)
79
       if @group.update(group_params)
80
-        format.html {
80
+        format.html do
81
           redirect_to @group
81
           redirect_to @group
82
           flash_message(:info, I18n.t('groups.updated'))
82
           flash_message(:info, I18n.t('groups.updated'))
83
-        }
83
+        end
84
         format.json { render :show, status: :ok, location: @group }
84
         format.json { render :show, status: :ok, location: @group }
85
       else
85
       else
86
         @defaultsubgroup = DefaultSubgroup.new
86
         @defaultsubgroup = DefaultSubgroup.new
95
   def destroy
95
   def destroy
96
     @group.destroy
96
     @group.destroy
97
     respond_to do |format|
97
     respond_to do |format|
98
-      format.html {
98
+      format.html do
99
         redirect_to groups_url
99
         redirect_to groups_url
100
         flash_message(:info, I18n.t('groups.destroyed'))
100
         flash_message(:info, I18n.t('groups.destroyed'))
101
-      }
101
+      end
102
       format.json { head :no_content }
102
       format.json { head :no_content }
103
     end
103
     end
104
   end
104
   end

+ 6 - 6
app/controllers/members_controller.rb

87
 
87
 
88
     respond_to do |format|
88
     respond_to do |format|
89
       if @member.save
89
       if @member.save
90
-        format.html {
90
+        format.html do
91
           redirect_to group_member_url(@group, @member)
91
           redirect_to group_member_url(@group, @member)
92
           flash_message(:info, I18n.t('groups.member_added', name: @member.person.full_name))
92
           flash_message(:info, I18n.t('groups.member_added', name: @member.person.full_name))
93
-        }
93
+        end
94
         format.json { render :show, status: :created, location: @member }
94
         format.json { render :show, status: :created, location: @member }
95
       else
95
       else
96
         @possible_members = Person.where.not(id: @group.person_ids)
96
         @possible_members = Person.where.not(id: @group.person_ids)
105
   def update
105
   def update
106
     respond_to do |format|
106
     respond_to do |format|
107
       if @member.update(member_params)
107
       if @member.update(member_params)
108
-        format.html {
108
+        format.html do
109
           redirect_to group_member_url(@group, @member)
109
           redirect_to group_member_url(@group, @member)
110
           flash_message(:info, I18n.t('groups.member_updated'))
110
           flash_message(:info, I18n.t('groups.member_updated'))
111
-        }
111
+        end
112
         format.json { render :show, status: :ok, location: @member }
112
         format.json { render :show, status: :ok, location: @member }
113
       else
113
       else
114
         @possible_members = Person.where.not(id: @group.person_ids)
114
         @possible_members = Person.where.not(id: @group.person_ids)
123
   def destroy
123
   def destroy
124
     @member.destroy
124
     @member.destroy
125
     respond_to do |format|
125
     respond_to do |format|
126
-      format.html {
126
+      format.html do
127
         redirect_to group_members_url(@group)
127
         redirect_to group_members_url(@group)
128
         flash_message(:info, I18n.t('groups.member_removed', name: @member.person.full_name))
128
         flash_message(:info, I18n.t('groups.member_removed', name: @member.person.full_name))
129
-      }
129
+      end
130
       format.json { head :no_content }
130
       format.json { head :no_content }
131
     end
131
     end
132
   end
132
   end

+ 1 - 1
app/models/activity.rb

164
 
164
 
165
   # Create multiple Activities from data in a CSV file, assign to a group, return.
165
   # Create multiple Activities from data in a CSV file, assign to a group, return.
166
   def self.from_csv(content, group)
166
   def self.from_csv(content, group)
167
-    reader = CSV.parse(content, { headers: true, skip_blanks: true })
167
+    reader = CSV.parse(content, headers: true, skip_blanks: true)
168
 
168
 
169
     result = []
169
     result = []
170
     reader.each do |row|
170
     reader.each do |row|

+ 1 - 1
app/models/person.rb

77
 
77
 
78
   # Create multiple Persons from data found in a csv file, return those.
78
   # Create multiple Persons from data found in a csv file, return those.
79
   def self.from_csv(content)
79
   def self.from_csv(content)
80
-    reader = CSV.parse(content, { headers: true, skip_blanks: true })
80
+    reader = CSV.parse(content, headers: true, skip_blanks: true)
81
 
81
 
82
     result = []
82
     result = []
83
     reader.each do |row|
83
     reader.each do |row|

+ 1 - 1
config/environments/production.rb

19
   config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present?
19
   config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present?
20
 
20
 
21
   # Compress JavaScripts and CSS.
21
   # Compress JavaScripts and CSS.
22
-  config.assets.js_compressor = Uglifier.new({ harmony: true })
22
+  config.assets.js_compressor = Uglifier.new(harmony: true)
23
   # config.assets.css_compressor = :sass
23
   # config.assets.css_compressor = :sass
24
 
24
 
25
   # Do not fallback to assets pipeline if a precompiled asset is missed.
25
   # Do not fallback to assets pipeline if a precompiled asset is missed.