diff --git a/lib/active_model_serializers/adapter/attributes.rb b/lib/active_model_serializers/adapter/attributes.rb index 6c903afe..3b6acab6 100644 --- a/lib/active_model_serializers/adapter/attributes.rb +++ b/lib/active_model_serializers/adapter/attributes.rb @@ -32,7 +32,16 @@ module ActiveModelSerializers end def serializable_hash_for_single_resource(options) - resource = resource_object_for(options) + resource = + if serializer.class.cache_enabled? + cached_attributes = instance_options[:cached_attributes] || {} + key = serializer.cache_key(self) + cached_attributes.fetch(key) do + serializer.cached_fields(options[:fields], self) + end + else + serializer.cached_fields(options[:fields], self) + end relationships = resource_relationships(options) resource.merge(relationships) end @@ -60,18 +69,6 @@ module ActiveModelSerializers relationship_value end - - def resource_object_for(options) - if serializer.class.cache_enabled? - cached_attributes = instance_options[:cached_attributes] || {} - key = serializer.cache_key(self) - cached_attributes.fetch(key) do - serializer.cached_fields(options[:fields], self) - end - else - serializer.cached_fields(options[:fields], self) - end - end end end end