From f86a8926f56357a37b8e24e12d3a129b5b5a0322 Mon Sep 17 00:00:00 2001 From: Kyle Reeves Date: Mon, 2 Jul 2018 15:43:08 -0500 Subject: [PATCH] make include_relationship? a public method and use it in get_included_records method --- lib/fast_jsonapi/relationship.rb | 4 ++-- lib/fast_jsonapi/serialization_core.rb | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/fast_jsonapi/relationship.rb b/lib/fast_jsonapi/relationship.rb index b3a2d2b..15b381c 100644 --- a/lib/fast_jsonapi/relationship.rb +++ b/lib/fast_jsonapi/relationship.rb @@ -42,8 +42,6 @@ module FastJsonapi record.send(object_method_name) end - private - def include_relationship?(record, serialization_params) if conditional_proc.present? conditional_proc.call(record, serialization_params) @@ -52,6 +50,8 @@ module FastJsonapi end end + private + def ids_hash_from_record_and_relationship(record, params = {}) return ids_hash( fetch_id(record, params) diff --git a/lib/fast_jsonapi/serialization_core.rb b/lib/fast_jsonapi/serialization_core.rb index 9ee8f8e..0b1181e 100644 --- a/lib/fast_jsonapi/serialization_core.rb +++ b/lib/fast_jsonapi/serialization_core.rb @@ -112,8 +112,7 @@ module FastJsonapi items.each do |item| next unless relationships_to_serialize && relationships_to_serialize[item] relationship_item = relationships_to_serialize[item] - conditional_proc = relationship_item.conditional_proc - next if conditional_proc && !conditional_proc.call(record, params) + next unless relationship_item.include_relationship?(record, params) raise NotImplementedError if relationship_item.polymorphic.is_a?(Hash) record_type = relationship_item.record_type serializer = relationship_item.serializer.to_s.constantize