Skip to content

Commit ec20720

Browse files
committed
bundle update
1 parent 6cfad8c commit ec20720

File tree

3 files changed

+44
-82
lines changed

3 files changed

+44
-82
lines changed

Diff for: .rubocop.yml

+34-74
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ require:
44

55
AllCops:
66
TargetRubyVersion: 2.5
7+
DisabledByDefault: true
78
Exclude:
89
- bin/**/*
910
- test/dummy/bin/**/*
@@ -13,44 +14,8 @@ Performance:
1314
Exclude:
1415
- 'test/**/*'
1516

16-
Rails:
17-
Enabled: true
18-
19-
Layout/LineLength:
20-
Enabled: false
21-
22-
Metrics/AbcSize:
23-
Max: 30
24-
25-
Metrics/MethodLength:
26-
Max: 100
27-
28-
Metrics/BlockLength:
29-
Max: 60
30-
31-
Metrics/ClassLength:
32-
Enabled: false
33-
34-
Metrics/ParameterLists:
35-
Enabled: false
36-
37-
Style/IfUnlessModifier:
38-
Enabled: false
39-
40-
Style/GuardClause:
41-
Enabled: false
42-
43-
Style/Documentation:
44-
Enabled: false
45-
46-
Style/ClassAndModuleChildren:
47-
Enabled: false
48-
49-
Naming/AccessorMethodName:
50-
Enabled: false
51-
52-
Naming/MemoizedInstanceVariableName:
53-
Enabled: false
17+
#Metrics/AbcSize:
18+
# Max: 30
5419

5520
# Prefer assert_not over assert !
5621
Rails/AssertNot:
@@ -62,25 +27,23 @@ Rails/RefuteMethods:
6227
Include:
6328
- 'test/**/*'
6429

65-
# Prefer &&/|| over and/or.
66-
Style/AndOr:
30+
Rails/IndexBy:
6731
Enabled: true
6832

69-
# Do not use braces for hash literals when they are the last argument of a
70-
# method call.
71-
Style/HashEachMethods:
33+
Rails/IndexWith:
7234
Enabled: true
7335

74-
Style/HashTransformKeys:
75-
Enabled: true
76-
77-
Style/HashTransformValues:
36+
# Prefer &&/|| over and/or.
37+
Style/AndOr:
7838
Enabled: true
7939

8040
# Align `when` with `case`.
8141
Layout/CaseIndentation:
8242
Enabled: true
8343

44+
Layout/ClosingHeredocIndentation:
45+
Enabled: true
46+
8447
# Align comments with method definitions.
8548
Layout/CommentIndentation:
8649
Enabled: true
@@ -98,10 +61,10 @@ Layout/EndAlignment:
9861
Layout/EmptyLineAfterMagicComment:
9962
Enabled: true
10063

101-
Layout/EmptyLinesAroundBlockBody:
64+
Layout/EmptyLinesAroundAccessModifier:
10265
Enabled: true
10366

104-
Layout/EmptyLinesAroundAttributeAccessor:
67+
Layout/EmptyLinesAroundBlockBody:
10568
Enabled: true
10669

10770
# In a regular class definition, no empty lines around the body.
@@ -116,13 +79,13 @@ Layout/EmptyLinesAroundMethodBody:
11679
Layout/EmptyLinesAroundModuleBody:
11780
Enabled: true
11881

119-
Layout/FirstArgumentIndentation:
120-
Enabled: true
121-
12282
# Use Ruby >= 1.9 syntax for hashes. Prefer { a: :b } over { :a => :b }.
12383
Style/HashSyntax:
12484
Enabled: true
12585

86+
Layout/FirstArgumentIndentation:
87+
Enabled: true
88+
12689
# Method definitions after `private` or `protected` isolated calls need one
12790
# extra level of indentation.
12891
Layout/IndentationConsistency:
@@ -151,10 +114,10 @@ Layout/SpaceAroundEqualsInParameterDefault:
151114
Layout/SpaceAroundKeyword:
152115
Enabled: true
153116

154-
Layout/SpaceAroundOperators:
117+
Layout/SpaceBeforeComma:
155118
Enabled: true
156119

157-
Layout/SpaceBeforeComma:
120+
Layout/SpaceBeforeComment:
158121
Enabled: true
159122

160123
Layout/SpaceBeforeFirstArg:
@@ -174,9 +137,6 @@ Style/FrozenStringLiteralComment:
174137
Style/RedundantFreeze:
175138
Enabled: true
176139

177-
Style/AccessModifierDeclarations:
178-
Enabled: false
179-
180140
# Use `foo {}` not `foo{}`.
181141
Layout/SpaceBeforeBlockBraces:
182142
Enabled: true
@@ -202,24 +162,18 @@ Style/StringLiterals:
202162
Layout/IndentationStyle:
203163
Enabled: true
204164

205-
# Blank lines should not have any spaces.
165+
# Empty lines should not have any spaces.
206166
Layout/TrailingEmptyLines:
207167
Enabled: true
208168

209169
# No trailing whitespace.
210170
Layout/TrailingWhitespace:
211171
Enabled: true
212172

213-
Layout/SpaceAroundMethodCallOperator:
214-
Enabled: true
215-
216173
# Use quotes for string literals when they are enough.
217174
Style/RedundantPercentQ:
218175
Enabled: true
219176

220-
Lint/DeprecatedOpenSSLConstant:
221-
Enabled: true
222-
223177
Lint/AmbiguousOperator:
224178
Enabled: true
225179

@@ -248,19 +202,16 @@ Lint/UselessAssignment:
248202
Lint/DeprecatedClassMethods:
249203
Enabled: true
250204

251-
Lint/AssignmentInCondition:
252-
Enabled: false
253-
254-
Lint/RaiseException:
205+
Lint/DeprecatedOpenSSLConstant:
255206
Enabled: true
256207

257-
Lint/StructNewOverride:
208+
Style/ParenthesesAroundCondition:
258209
Enabled: true
259210

260-
Style/ExponentialNotation:
211+
Style/HashTransformKeys:
261212
Enabled: true
262213

263-
Style/ParenthesesAroundCondition:
214+
Style/HashTransformValues:
264215
Enabled: true
265216

266217
Style/RedundantBegin:
@@ -274,16 +225,19 @@ Style/Semicolon:
274225
Enabled: true
275226
AllowAsExpressionSeparator: true
276227

277-
Style/SlicingWithRange:
278-
Enabled: true
279-
280228
# Prefer Foo.method over Foo::method
281229
Style/ColonMethodCall:
282230
Enabled: true
283231

284232
Style/TrivialAccessors:
285233
Enabled: true
286234

235+
Style/SlicingWithRange:
236+
Enabled: true
237+
238+
Style/RedundantRegexpEscape:
239+
Enabled: true
240+
287241
Performance/FlatMap:
288242
Enabled: true
289243

@@ -304,3 +258,9 @@ Performance/ReverseEach:
304258

305259
Performance/UnfreezeString:
306260
Enabled: true
261+
262+
Performance/DeletePrefix:
263+
Enabled: true
264+
265+
Performance/DeleteSuffix:
266+
Enabled: true

Diff for: Gemfile.lock

+9-7
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,10 @@ GEM
9090
crass (1.0.6)
9191
erubi (1.9.0)
9292
execjs (2.7.0)
93-
ffi (1.12.2)
93+
ffi (1.13.0)
9494
globalid (0.4.2)
9595
activesupport (>= 4.2.0)
96-
i18n (1.8.2)
96+
i18n (1.8.3)
9797
concurrent-ruby (~> 1.0)
9898
jquery-rails (4.4.0)
9999
rails-dom-testing (>= 1, < 3)
@@ -157,26 +157,28 @@ GEM
157157
rb-fsevent (0.10.4)
158158
rb-inotify (0.10.1)
159159
ffi (~> 1.0)
160+
regexp_parser (1.7.0)
160161
rexml (3.2.4)
161-
rubocop (0.84.0)
162+
rubocop (0.85.0)
162163
parallel (~> 1.10)
163164
parser (>= 2.7.0.1)
164165
rainbow (>= 2.2.2, < 4.0)
166+
regexp_parser (>= 1.7)
165167
rexml
166168
rubocop-ast (>= 0.0.3)
167169
ruby-progressbar (~> 1.7)
168170
unicode-display_width (>= 1.4.0, < 2.0)
169171
rubocop-ast (0.0.3)
170172
parser (>= 2.7.0.1)
171-
rubocop-performance (1.6.0)
173+
rubocop-performance (1.6.1)
172174
rubocop (>= 0.71.0)
173175
rubocop-rails (2.5.2)
174176
activesupport
175177
rack (>= 1.1)
176178
rubocop (>= 0.72.0)
177179
ruby-progressbar (1.10.1)
178180
ruby_dep (1.5.0)
179-
sassc (2.3.0)
181+
sassc (2.4.0)
180182
ffi (~> 1.9)
181183
sassc-rails (2.1.2)
182184
railties (>= 4.0.0)
@@ -185,7 +187,7 @@ GEM
185187
sprockets-rails
186188
tilt
187189
selectize-rails (0.12.6)
188-
sprockets (4.0.0)
190+
sprockets (4.0.1)
189191
concurrent-ruby (~> 1.0)
190192
rack (> 1, < 3)
191193
sprockets-rails (3.2.1)
@@ -217,7 +219,7 @@ GEM
217219
railties (>= 6.0.0)
218220
websocket-driver (0.7.2)
219221
websocket-extensions (>= 0.1.0)
220-
websocket-extensions (0.1.4)
222+
websocket-extensions (0.1.5)
221223
zeitwerk (2.3.0)
222224

223225
PLATFORMS

Diff for: lib/form_core/virtual_model.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ def inspect
2222

2323
def serializable_hash(options = {})
2424
options = (options || {}).reverse_merge include: self.class._embeds_reflections.keys
25-
super **options
25+
super(**options)
2626
end
2727

2828
# Hack

0 commit comments

Comments
 (0)