Skip to content

Commit eb86663

Browse files
committed
Remove unnecessary Adapter::Base#resource_object_for
1 parent fcfbc0d commit eb86663

File tree

1 file changed

+10
-13
lines changed

1 file changed

+10
-13
lines changed

lib/active_model_serializers/adapter/attributes.rb

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,16 @@ def serializable_hash_for_collection(options)
3232
end
3333

3434
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
3645
relationships = resource_relationships(options)
3746
resource.merge(relationships)
3847
end
@@ -60,18 +69,6 @@ def relationship_value_for(association, options)
6069

6170
relationship_value
6271
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
7572
end
7673
end
7774
end

0 commit comments

Comments
 (0)