Skip to content

Rename local variable include #944

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lgebhardt merged 3 commits into from
Dec 23, 2016
Merged

Rename local variable include #944

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
864d4e4
Rename local variable include
olleolleolle Dec 23, 2016
3d203fd
Local rename renamed variable
olleolleolle Dec 23, 2016
2fbb8e1
parse_include_directives: Protect against falsy values
olleolleolle Dec 23, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions lib/jsonapi/request_parser.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,23 +210,22 @@ def check_include(resource_klass, include_parts)
end
end

def parse_include_directives(include)
return if include.nil?
def parse_include_directives(raw_include)
return unless raw_include

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

included_resources = CSV.parse_line(include)
included_resources = CSV.parse_line(raw_include)
return if included_resources.nil?

include = []
included_resources.each do |included_resource|
result = included_resources.map do |included_resource|
check_include(@resource_klass, included_resource.partition('.'))
include.push(unformat_key(included_resource).to_s)
unformat_key(included_resource).to_s
end

@include_directives = JSONAPI::IncludeDirectives.new(@resource_klass, include)
@include_directives = JSONAPI::IncludeDirectives.new(@resource_klass, result)
end

def parse_filters(filters)
Expand Down