ditkrg/active_model_serializers
4
0
Fork 0
mirror of https://github.com/ditkrg/active_model_serializers.git synced 2026-01-22 22:06:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1763 from bf4/serializer_cleanup_1

Browse Source 
Remove unnecessary Adapter::Base#cache_check
This commit is contained in:
Benjamin Fleischer 2016-06-01 00:37:23 -05:00
commit 3f38a60d89
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/active_model_serializers/adapter/base.rb
View File

@ -33,12 +33,6 @@ module ActiveModelSerializers
non_cached_hash.merge cached_hash
end
def cache_check(serializer)
serializer.cache_check(self) do
yield
end
end
private
# see https://github.com/rails-api/active_model_serializers/pull/965

2
lib/active_model_serializers/adapter/json_api.rb
View File

@ -290,7 +290,7 @@ module ActiveModelSerializers
# {http://jsonapi.org/format/#document-resource-objects Document Resource Objects}
def resource_object_for(serializer)
resource_object = cache_check(serializer) do
resource_object = serializer.cache_check(self) do
resource_object = ResourceIdentifier.new(serializer, instance_options).as_json
requested_fields = fieldset && fieldset.fields_for(resource_object[:type])