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

Remove unnecessary Adapter::Base#cache_attributes

Browse Source
This commit is contained in:
Benjamin Fleischer 2016-04-14 21:47:30 -05:00
parent b8af2892f7
commit ee518e1856
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/active_model_serializers/adapter/attributes.rb
View File

@ -3,7 +3,6 @@ module ActiveModelSerializers
class Attributes < Base
def initialize(serializer, options = {})
super
@cached_attributes = options[:cache_attributes] || {}
@include_directive =
if options[:include_directive]
options[:include_directive]
@ -27,7 +26,7 @@ module ActiveModelSerializers
private
def serializable_hash_for_collection(options)
cache_attributes
instance_options[:cached_attributes] ||= ActiveModel::Serializer.cache_read_multi(serializer, self, @include_directive)
opts = instance_options.merge(include_directive: @include_directive)
serializer.map { |s| Attributes.new(s, opts).serializable_hash(options) }
end
@ -62,16 +61,11 @@ module ActiveModelSerializers
relationship_value
end
# Set @cached_attributes
def cache_attributes
return if @cached_attributes.present?
@cached_attributes = ActiveModel::Serializer.cache_read_multi(serializer, self, @include_directive)
end
def resource_object_for(options)
if serializer.class.cache_enabled?
@cached_attributes.fetch(serializer.cache_key(self)) do
cached_attributes = instance_options[:cached_attributes] || {}
key = serializer.cache_key(self)
cached_attributes.fetch(key) do
serializer.cached_fields(options[:fields], self)
end
else

4
test/cache_test.rb
View File

@ -303,8 +303,8 @@ module ActiveModelSerializers
render_object_with_cache(@comment)
attributes = Adapter::Attributes.new(serializer)
attributes.send(:cache_attributes)
cached_attributes = attributes.instance_variable_get(:@cached_attributes)
include_directive = ActiveModelSerializers.default_include_directive
cached_attributes = ActiveModel::Serializer.cache_read_multi(serializer, attributes, include_directive)
assert_equal cached_attributes["#{@comment.cache_key}/#{attributes.cached_name}"], Comment.new(id: 1, body: 'ZOMG A COMMENT').attributes
assert_equal cached_attributes["#{@comment.post.cache_key}/#{attributes.cached_name}"], Post.new(id: 'post', title: 'New Post', body: 'Body').attributes