Skip to content

Commit 3f38a60

Browse files
committed
Merge pull request #1763 from bf4/serializer_cleanup_1
Remove unnecessary Adapter::Base#cache_check
2 parents b8af289 + 0cc87fd commit 3f38a60

File tree

2 files changed

+1
-7
lines changed

2 files changed

+1
-7
lines changed

lib/active_model_serializers/adapter/base.rb

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,6 @@ def fragment_cache(cached_hash, non_cached_hash)
3333
non_cached_hash.merge cached_hash
3434
end
3535

36-
def cache_check(serializer)
37-
serializer.cache_check(self) do
38-
yield
39-
end
40-
end
41-
4236
private
4337

4438
# see https://github.com/rails-api/active_model_serializers/pull/965

lib/active_model_serializers/adapter/json_api.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ def attributes_for(serializer, fields)
290290

291291
# {http://jsonapi.org/format/#document-resource-objects Document Resource Objects}
292292
def resource_object_for(serializer)
293-
resource_object = cache_check(serializer) do
293+
resource_object = serializer.cache_check(self) do
294294
resource_object = ResourceIdentifier.new(serializer, instance_options).as_json
295295

296296
requested_fields = fieldset && fieldset.fields_for(resource_object[:type])

0 commit comments

Comments
 (0)