Skip to content

Fix nested namespaces parsing and resource resolving #1028

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 1 commit into from
May 5, 2017
Merged

Fix nested namespaces parsing and resource resolving #1028

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion lib/jsonapi/request_parser.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,7 @@ def parse_to_one_relationship(resource_klass, link_value, relationship)

unless links_object[:id].nil?
resource = resource_klass || Resource
relationship_resource = resource.resource_klass_for(unformat_key(links_object[:type]).to_s)
relationship_resource = resource.resource_klass_for(unformat_key(relationship.options[:class_name] || links_object[:type]).to_s)
relationship_id = relationship_resource.verify_key(links_object[:id], @context)
if relationship.polymorphic?
{ id: relationship_id, type: unformat_key(links_object[:type].to_s) }
Expand Down
2 changes: 1 addition & 1 deletion lib/jsonapi/resource.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,7 @@ def rebuild_relationships(relationships)

def resource_klass_for(type)
type = type.underscore
type_with_module = type.include?('/') ? type : module_path + type
type_with_module = type.start_with?(module_path) ? type : module_path + type

resource_name = _resource_name_from_type(type_with_module)
resource = resource_name.safe_constantize if resource_name
Expand Down
13 changes: 13 additions & 0 deletions test/unit/resource/resource_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,18 @@ module MyModule
class MyNamespacedResource < JSONAPI::Resource
model_name "Person"
has_many :related
has_one :default_profile, class_name: "Nested::Profile"
end

class RelatedResource < JSONAPI::Resource
model_name "Comment"
end

module Nested
class ProfileResource < JSONAPI::Resource
model_name "Nested::Profile"
end
end
end

module MyAPI
Expand Down Expand Up @@ -155,6 +162,12 @@ def test_resource_for_namespaced_resource
assert_equal(MyModule::MyNamespacedResource.resource_klass_for('related'), MyModule::RelatedResource)
end

def test_resource_for_nested_namespaced_resource
assert_equal(JSONAPI::Resource.resource_klass_for('my_module/nested/profile'), MyModule::Nested::ProfileResource)
assert_equal(MyModule::MyNamespacedResource.resource_klass_for('my_module/nested/profile'), MyModule::Nested::ProfileResource)
assert_equal(MyModule::MyNamespacedResource.resource_klass_for('nested/profile'), MyModule::Nested::ProfileResource)
end

def test_relationship_parent_point_to_correct_resource
assert_equal MyModule::MyNamespacedResource, MyModule::MyNamespacedResource._relationships[:related].parent_resource
end
Expand Down