Simplify Serializer#cached_attributes to take a fields argument

Author: bf4

lib/active_model/serializer/caching.rb

@@ -208,17 +208,17 @@ def object_cache_key(serializer, adapter_instance)
         end
       end
 
-      def cached_attributes(options, cached_attributes, adapter_instance)
+      def cached_attributes(fields, cached_attributes, adapter_instance)
         if self.class.cache_enabled?
           key = cache_key(adapter_instance)
           cached_attributes.fetch(key) do
             cache_check(adapter_instance) do
-              attributes(options[:fields])
+              attributes(fields)
             end
           end
         else
           cache_check(adapter_instance) do
-            attributes(options[:fields])
+            attributes(fields)
           end
         end
       end

lib/active_model_serializers/adapter/attributes.rb

@@ -33,7 +33,7 @@ def serializable_hash_for_collection(options)
 
       def serializable_hash_for_single_resource(options)
         cached_attributes = instance_options[:cached_attributes] || {}
-        resource = serializer.cached_attributes(options, cached_attributes, self)
+        resource = serializer.cached_attributes(options[:fields], cached_attributes, self)
         relationships = resource_relationships(options)
         resource.merge(relationships)
       end