Skip to content

fix resource identifier objects #637

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

Open
acid wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix resource identifier objects #637

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1050082
fix resource identifier objects
acid Feb 26, 2016
7ce6c3e
set meta only if present, introduce helper method
acid Apr 20, 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
19 changes: 9 additions & 10 deletions lib/jsonapi/request_parser.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,21 +381,20 @@ def verify_type(type)

def parse_to_one_links_object(raw)
if raw.nil?
return {
type: nil,
id: nil
}
return link_object_hash(nil, nil)
end

if !(raw.is_a?(Hash) || raw.is_a?(ActionController::Parameters)) ||
raw.keys.length != 2 || !(raw.key?('type') && raw.key?('id'))
if !(raw.is_a?(Hash) || raw.is_a?(ActionController::Parameters)) || (raw.length != 2 && !raw.key?('meta')) || !(raw.key?('type') && raw.key?('id'))
fail JSONAPI::Exceptions::InvalidLinksObject.new
end

{
type: unformat_key(raw['type']).to_s,
id: raw['id']
}
link_object_hash(unformat_key(raw['type']).to_s, raw['id'], raw['meta'])
end

def link_object_hash(type, id, meta=nil)
link_object = {type: type, id: id}
link_object[:meta] = meta unless meta.nil?
link_object
end

def parse_to_many_links_object(raw)
Expand Down