Skip to content

Commit 34b1fc5

Browse files
olleolleollelgebhardt
authored andcommitted
Rename local variable include (#944)
* Rename local variable include - this avoids collision with a keyword, which can be confusing * Local rename renamed variable * parse_include_directives: Protect against falsy values
1 parent de7711d commit 34b1fc5

1 file changed

Lines changed: 6 additions & 7 deletions

File tree

lib/jsonapi/request_parser.rb

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -210,23 +210,22 @@ def check_include(resource_klass, include_parts)
210210
end
211211
end
212212

213-
def parse_include_directives(include)
214-
return if include.nil?
213+
def parse_include_directives(raw_include)
214+
return unless raw_include
215215

216216
unless JSONAPI.configuration.allow_include
217217
fail JSONAPI::Exceptions::ParametersNotAllowed.new([:include])
218218
end
219219

220-
included_resources = CSV.parse_line(include)
220+
included_resources = CSV.parse_line(raw_include)
221221
return if included_resources.nil?
222222

223-
include = []
224-
included_resources.each do |included_resource|
223+
result = included_resources.map do |included_resource|
225224
check_include(@resource_klass, included_resource.partition('.'))
226-
include.push(unformat_key(included_resource).to_s)
225+
unformat_key(included_resource).to_s
227226
end
228227

229-
@include_directives = JSONAPI::IncludeDirectives.new(@resource_klass, include)
228+
@include_directives = JSONAPI::IncludeDirectives.new(@resource_klass, result)
230229
end
231230

232231
def parse_filters(filters)

0 commit comments

Comments
 (0)