Merge pull request #1764 from bf4/serializer_cleanup_2

Remove unnecessary Adapter::Base#cache_attributes

Author: bf4

lib/active_model_serializers/adapter/attributes.rb

@@ -3,7 +3,6 @@ module Adapter
     class Attributes < Base
       def initialize(serializer, options = {})
         super
-        @cached_attributes = options[:cache_attributes] || {}
         @include_directive =
           if options[:include_directive]
             options[:include_directive]
@@ -27,7 +26,7 @@ def serializable_hash(options = nil)
       private
 
       def serializable_hash_for_collection(options)
-        cache_attributes
+        instance_options[:cached_attributes] ||= ActiveModel::Serializer.cache_read_multi(serializer, self, @include_directive)
         opts = instance_options.merge(include_directive: @include_directive)
         serializer.map { |s| Attributes.new(s, opts).serializable_hash(options) }
       end
@@ -62,16 +61,11 @@ def relationship_value_for(association, options)
         relationship_value
       end
 
-      # Set @cached_attributes
-      def cache_attributes
-        return if @cached_attributes.present?
-
-        @cached_attributes = ActiveModel::Serializer.cache_read_multi(serializer, self, @include_directive)
-      end
-
       def resource_object_for(options)
         if serializer.class.cache_enabled?
-          @cached_attributes.fetch(serializer.cache_key(self)) do
+          cached_attributes = instance_options[:cached_attributes] || {}
+          key = serializer.cache_key(self)
+          cached_attributes.fetch(key) do
             serializer.cached_fields(options[:fields], self)
           end
         else

test/cache_test.rb

@@ -303,8 +303,8 @@ def test_cached_attributes
         render_object_with_cache(@comment)
 
         attributes = Adapter::Attributes.new(serializer)
-        attributes.send(:cache_attributes)
-        cached_attributes = attributes.instance_variable_get(:@cached_attributes)
+        include_directive = ActiveModelSerializers.default_include_directive
+        cached_attributes = ActiveModel::Serializer.cache_read_multi(serializer, attributes, include_directive)
 
         assert_equal cached_attributes["#{@comment.cache_key}/#{attributes.cached_name}"], Comment.new(id: 1, body: 'ZOMG A COMMENT').attributes
         assert_equal cached_attributes["#{@comment.post.cache_key}/#{attributes.cached_name}"], Post.new(id: 'post', title: 'New Post', body: 'Body').attributes