diff --git a/lib/active_model/serializer/caching.rb b/lib/active_model/serializer/caching.rb index 850c346b..6444f9d9 100644 --- a/lib/active_model/serializer/caching.rb +++ b/lib/active_model/serializer/caching.rb @@ -206,15 +206,6 @@ module ActiveModel end end - # Get attributes from @cached_attributes - # @return [Hash] cached attributes - # def cached_attributes(fields, adapter_instance) - def cached_fields(fields, adapter_instance) - cache_check(adapter_instance) do - attributes(fields) - end - end - def cache_check(adapter_instance) if self.class.cache_enabled? self.class.cache_store.fetch(cache_key(adapter_instance), self.class._cache_options) do diff --git a/lib/active_model_serializers/adapter/attributes.rb b/lib/active_model_serializers/adapter/attributes.rb index 3b6acab6..ba7caa37 100644 --- a/lib/active_model_serializers/adapter/attributes.rb +++ b/lib/active_model_serializers/adapter/attributes.rb @@ -37,10 +37,14 @@ module ActiveModelSerializers cached_attributes = instance_options[:cached_attributes] || {} key = serializer.cache_key(self) cached_attributes.fetch(key) do - serializer.cached_fields(options[:fields], self) + serializer.cache_check(self) do + serializer.attributes(options[:fields]) + end end else - serializer.cached_fields(options[:fields], self) + serializer.cache_check(self) do + serializer.attributes(options[:fields]) + end end relationships = resource_relationships(options) resource.merge(relationships)