Skip to content

Commit 140b4f2

Browse files
committed
Update Rubocop todo
1 parent ca6b193 commit 140b4f2

File tree

3 files changed

+22
-75
lines changed

3 files changed

+22
-75
lines changed

.rubocop_todo.yml

Lines changed: 12 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,12 @@
11
# This configuration was generated by
22
# `rubocop --auto-gen-config`
3-
# on 2015-08-31 04:23:33 -0500 using RuboCop version 0.33.0.
3+
# on 2015-09-20 17:56:22 -0500 using RuboCop version 0.34.0.
44
# The point is for the user to remove these configuration records
55
# one by one as the offenses are removed from the code base.
66
# Note that changes in the inspected code, or installation of new
77
# versions of RuboCop, may require this file to be generated again.
88

9-
# Offense count: 1
10-
# Configuration parameters: AllowSafeAssignment.
11-
Lint/AssignmentInCondition:
12-
Exclude:
13-
- 'lib/active_model/serializer/adapter/json_api.rb'
14-
15-
# Offense count: 1
16-
Lint/EmptyEnsure:
17-
Exclude:
18-
- 'test/serializers/adapter_for_test.rb'
19-
20-
# Offense count: 1
9+
# Offense count: 2
2110
Lint/HandleExceptions:
2211
Exclude:
2312
- 'Rakefile'
@@ -28,11 +17,10 @@ Lint/UnusedBlockArgument:
2817
Exclude:
2918
- 'lib/active_model/serializer/adapter/json_api/fragment_cache.rb'
3019

31-
# Offense count: 9
20+
# Offense count: 7
3221
# Cop supports --auto-correct.
3322
Lint/UnusedMethodArgument:
3423
Exclude:
35-
- 'lib/active_model/serializer/adapter.rb'
3624
- 'lib/active_model/serializer/adapter/null.rb'
3725
- 'lib/active_model/serializer/pass_through_serializer.rb'
3826
- 'test/fixtures/poro.rb'
@@ -43,20 +31,19 @@ Lint/UselessAccessModifier:
4331
Exclude:
4432
- 'lib/active_model/serializable_resource.rb'
4533

46-
# Offense count: 3
34+
# Offense count: 2
4735
Lint/UselessAssignment:
4836
Exclude:
4937
- 'bench/perf.rb'
5038
- 'lib/active_model/serializer/adapter/json_api/fragment_cache.rb'
51-
- 'test/test_helper.rb'
5239

5340
# Offense count: 1
5441
# Configuration parameters: EnforcedStyle, SupportedStyles.
5542
Rails/Date:
5643
Exclude:
5744
- 'test/fixtures/poro.rb'
5845

59-
# Offense count: 8
46+
# Offense count: 4
6047
# Configuration parameters: EnforcedStyle, SupportedStyles.
6148
Rails/TimeZone:
6249
Exclude:
@@ -78,14 +65,13 @@ Style/AndOr:
7865
Exclude:
7966
- 'lib/active_model/serializer/lint.rb'
8067

81-
# Offense count: 46
68+
# Offense count: 25
8269
# Cop supports --auto-correct.
8370
# Configuration parameters: EnforcedStyle, SupportedStyles.
8471
Style/BracesAroundHashParameters:
8572
Exclude:
8673
- 'test/action_controller/adapter_selector_test.rb'
8774
- 'test/action_controller/json_api/pagination_test.rb'
88-
- 'test/action_controller/serialization_test.rb'
8975
- 'test/adapter/json_api/linked_test.rb'
9076
- 'test/adapter/json_api/pagination_links_test.rb'
9177
- 'test/adapter/null_test.rb'
@@ -97,9 +83,8 @@ Style/BracesAroundHashParameters:
9783
- 'test/serializers/attributes_test.rb'
9884
- 'test/serializers/fieldset_test.rb'
9985
- 'test/serializers/root_test.rb'
100-
- 'test/serializers/urls_test.rb'
10186

102-
# Offense count: 167
87+
# Offense count: 174
10388
# Configuration parameters: EnforcedStyle, SupportedStyles.
10489
Style/ClassAndModuleChildren:
10590
Enabled: false
@@ -120,12 +105,11 @@ Style/EachWithObject:
120105
Exclude:
121106
- 'lib/active_model/serializer/fieldset.rb'
122107

123-
# Offense count: 3
108+
# Offense count: 2
124109
# Configuration parameters: MinBodyLength.
125110
Style/GuardClause:
126111
Exclude:
127112
- 'lib/active_model/serializer.rb'
128-
- 'lib/active_model/serializer/adapter/json_api.rb'
129113
- 'test/capture_warnings.rb'
130114

131115
# Offense count: 12
@@ -149,34 +133,12 @@ Style/IndentArray:
149133
Style/IndentHash:
150134
Enabled: false
151135

152-
# Offense count: 1
153-
# Cop supports --auto-correct.
154-
# Configuration parameters: EnforcedStyle, SupportedStyles.
155-
Style/IndentationConsistency:
156-
Exclude:
157-
- 'test/action_controller/serialization_scope_name_test.rb'
158-
159-
# Offense count: 2
160-
# Cop supports --auto-correct.
161-
# Configuration parameters: Width.
162-
Style/IndentationWidth:
163-
Exclude:
164-
- 'lib/active_model/serializable_resource.rb'
165-
- 'lib/active_model/serializer/fieldset.rb'
166-
167136
# Offense count: 1
168137
# Cop supports --auto-correct.
169138
Style/Lambda:
170139
Exclude:
171140
- 'lib/active_model/serializer.rb'
172141

173-
# Offense count: 2
174-
# Cop supports --auto-correct.
175-
Style/MethodCallParentheses:
176-
Exclude:
177-
- 'lib/active_model/serializer/adapter/json.rb'
178-
- 'lib/active_model/serializer/adapter/json_api.rb'
179-
180142
# Offense count: 1
181143
# Cop supports --auto-correct.
182144
# Configuration parameters: EnforcedStyle, SupportedStyles.
@@ -195,45 +157,29 @@ Style/NegatedIf:
195157
Exclude:
196158
- 'lib/action_controller/serialization.rb'
197159

198-
# Offense count: 1
199-
# Configuration parameters: EnforcedStyle, MinBodyLength, SupportedStyles.
200-
Style/Next:
201-
Exclude:
202-
- 'lib/active_model/serializer/adapter/json_api.rb'
203-
204160
# Offense count: 1
205161
# Cop supports --auto-correct.
206162
Style/NumericLiterals:
207163
MinDigits: 7
208164

209-
# Offense count: 2
210-
# Cop supports --auto-correct.
211-
# Configuration parameters: PreferredDelimiters.
212-
Style/PercentLiteralDelimiters:
213-
Exclude:
214-
- 'active_model_serializers.gemspec'
215-
216165
# Offense count: 2
217166
# Cop supports --auto-correct.
218167
Style/PerlBackrefs:
219168
Exclude:
220169
- 'test/fixtures/poro.rb'
221170
- 'test/serializers/associations_test.rb'
222171

223-
# Offense count: 6
172+
# Offense count: 3
224173
# Configuration parameters: NamePrefix, NamePrefixBlacklist.
225174
Style/PredicateName:
226175
Exclude:
227-
- 'lib/active_model/serializer/adapter.rb'
228-
- 'lib/active_model/serializer/adapter/json_api.rb'
229176
- 'lib/active_model/serializer/associations.rb'
230177
- 'test/action_controller/json_api/linked_test.rb'
231178

232-
# Offense count: 7
179+
# Offense count: 5
233180
# Cop supports --auto-correct.
234181
Style/RedundantSelf:
235182
Exclude:
236-
- 'lib/active_model/serializer.rb'
237183
- 'lib/active_model/serializer/associations.rb'
238184
- 'test/fixtures/poro.rb'
239185

@@ -244,13 +190,11 @@ Style/Semicolon:
244190
Exclude:
245191
- 'lib/active_model/serializer/fieldset.rb'
246192

247-
# Offense count: 6
193+
# Offense count: 3
248194
# Cop supports --auto-correct.
249195
# Configuration parameters: EnforcedStyle, SupportedStyles.
250196
Style/SignalException:
251197
Exclude:
252-
- 'lib/active_model/serializer.rb'
253-
- 'lib/active_model/serializer/adapter.rb'
254198
- 'lib/active_model/serializer/fieldset.rb'
255199
- 'lib/active_model/serializer/pass_through_serializer.rb'
256200

@@ -293,7 +237,7 @@ Style/TrailingBlankLines:
293237
- 'test/serializers/fieldset_test.rb'
294238
- 'test/support/stream_capture.rb'
295239

296-
# Offense count: 6
240+
# Offense count: 5
297241
# Cop supports --auto-correct.
298242
# Configuration parameters: EnforcedStyleForMultiline, SupportedStyles.
299243
Style/TrailingComma:

lib/active_model/serializer/adapter/json_api.rb

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -130,11 +130,14 @@ def relationships_for(serializer)
130130
end
131131
end
132132

133-
def included_for(serializer)
134-
included.flat_map do |inc|
135-
association = serializer.associations.find { |assoc| assoc.key == inc.first }
136-
_included_for(association.serializer, inc.second) if association
137-
end.uniq
133+
def included_resources(include_tree)
134+
included = []
135+
136+
serializer.associations(include_tree).each do |association|
137+
add_included_resources_for(association.serializer, include_tree[association.key], included)
138+
end
139+
140+
included
138141
end
139142

140143
def add_included_resources_for(serializer, include_tree, included)

lib/active_model/serializer/include_tree.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ def include_args_to_hash(included)
1616
when Symbol
1717
{ included => {} }
1818
when Hash
19-
included.each_with_object({}) { |(key, value), hash|
19+
included.each_with_object({}) do |(key, value), hash|
2020
hash[key] = include_args_to_hash(value)
21-
}
21+
end
2222
when Array
2323
included.reduce({}) { |a, e| a.merge!(include_args_to_hash(e)) }
2424
when String

0 commit comments

Comments
 (0)