sharpetronics/jsonapi-serializer
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

make include_relationship? a public method and use it in get_included_records method

Browse Source
This commit is contained in:
Kyle Reeves 2018-07-02 15:43:08 -05:00 committed by Shishir Kakaraddi
parent 30596c4488
commit f86a8926f5
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/fast_jsonapi/relationship.rb
View File

@ -42,8 +42,6 @@ module FastJsonapi
record.send(object_method_name) record.send(object_method_name)
end end
private
def include_relationship?(record, serialization_params) def include_relationship?(record, serialization_params)
if conditional_proc.present? if conditional_proc.present?
conditional_proc.call(record, serialization_params) conditional_proc.call(record, serialization_params)
@ -52,6 +50,8 @@ module FastJsonapi
end end
end end
private
def ids_hash_from_record_and_relationship(record, params = {}) def ids_hash_from_record_and_relationship(record, params = {})
return ids_hash( return ids_hash(
fetch_id(record, params) fetch_id(record, params)

3
lib/fast_jsonapi/serialization_core.rb
View File

@ -112,8 +112,7 @@ module FastJsonapi
items.each do |item| items.each do |item|
next unless relationships_to_serialize && relationships_to_serialize[item] next unless relationships_to_serialize && relationships_to_serialize[item]
relationship_item = relationships_to_serialize[item] relationship_item = relationships_to_serialize[item]
conditional_proc = relationship_item.conditional_proc next unless relationship_item.include_relationship?(record, params)
next if conditional_proc && !conditional_proc.call(record, params)
raise NotImplementedError if relationship_item.polymorphic.is_a?(Hash) raise NotImplementedError if relationship_item.polymorphic.is_a?(Hash)
record_type = relationship_item.record_type record_type = relationship_item.record_type
serializer = relationship_item.serializer.to_s.constantize serializer = relationship_item.serializer.to_s.constantize