File tree Expand file tree Collapse file tree 2 files changed +6
-11
lines changed
active_model_serializers/adapter Expand file tree Collapse file tree 2 files changed +6
-11
lines changed Original file line number Diff line number Diff line change @@ -206,15 +206,6 @@ def object_cache_key(serializer, adapter_instance)
206
206
end
207
207
end
208
208
209
- # Get attributes from @cached_attributes
210
- # @return [Hash] cached attributes
211
- # def cached_attributes(fields, adapter_instance)
212
- def cached_fields ( fields , adapter_instance )
213
- cache_check ( adapter_instance ) do
214
- attributes ( fields )
215
- end
216
- end
217
-
218
209
def cache_check ( adapter_instance )
219
210
if self . class . cache_enabled?
220
211
self . class . cache_store . fetch ( cache_key ( adapter_instance ) , self . class . _cache_options ) do
Original file line number Diff line number Diff line change @@ -37,10 +37,14 @@ def serializable_hash_for_single_resource(options)
37
37
cached_attributes = instance_options [ :cached_attributes ] || { }
38
38
key = serializer . cache_key ( self )
39
39
cached_attributes . fetch ( key ) do
40
- serializer . cached_fields ( options [ :fields ] , self )
40
+ serializer . cache_check ( self ) do
41
+ serializer . attributes ( options [ :fields ] )
42
+ end
41
43
end
42
44
else
43
- serializer . cached_fields ( options [ :fields ] , self )
45
+ serializer . cache_check ( self ) do
46
+ serializer . attributes ( options [ :fields ] )
47
+ end
44
48
end
45
49
relationships = resource_relationships ( options )
46
50
resource . merge ( relationships )
You can’t perform that action at this time.
0 commit comments