File tree Expand file tree Collapse file tree 1 file changed +10
-13
lines changed
lib/active_model_serializers/adapter Expand file tree Collapse file tree 1 file changed +10
-13
lines changed Original file line number Diff line number Diff line change @@ -32,7 +32,16 @@ def serializable_hash_for_collection(options)
32
32
end
33
33
34
34
def serializable_hash_for_single_resource ( options )
35
- resource = resource_object_for ( options )
35
+ resource =
36
+ if serializer . class . cache_enabled?
37
+ cached_attributes = instance_options [ :cached_attributes ] || { }
38
+ key = serializer . cache_key ( self )
39
+ cached_attributes . fetch ( key ) do
40
+ serializer . cached_fields ( options [ :fields ] , self )
41
+ end
42
+ else
43
+ serializer . cached_fields ( options [ :fields ] , self )
44
+ end
36
45
relationships = resource_relationships ( options )
37
46
resource . merge ( relationships )
38
47
end
@@ -60,18 +69,6 @@ def relationship_value_for(association, options)
60
69
61
70
relationship_value
62
71
end
63
-
64
- def resource_object_for ( options )
65
- if serializer . class . cache_enabled?
66
- cached_attributes = instance_options [ :cached_attributes ] || { }
67
- key = serializer . cache_key ( self )
68
- cached_attributes . fetch ( key ) do
69
- serializer . cached_fields ( options [ :fields ] , self )
70
- end
71
- else
72
- serializer . cached_fields ( options [ :fields ] , self )
73
- end
74
- end
75
72
end
76
73
end
77
74
end
You can’t perform that action at this time.
0 commit comments