mirror of
https://github.com/ditkrg/active_model_serializers.git
synced 2026-01-25 07:16:49 +00:00
Prefer object.cache_key when available.
This commit is contained in:
@@ -96,26 +96,27 @@ module ActiveModelSerializers
|
||||
assert_equal(nil, @comment_serializer.class._cache_key)
|
||||
end
|
||||
|
||||
|
||||
def test_error_is_raised_if_cache_key_is_not_defined_on_object_or_passed_as_cache_option
|
||||
article = Article.new(title: 'Must Read')
|
||||
assert_raises ActiveModel::Serializer::Adapter::CachedSerializer::UndefinedCacheKey do
|
||||
render_object_with_cache(article)
|
||||
end
|
||||
end
|
||||
|
||||
def test_cache_key_interpolation_with_updated_at_when_cache_key_is_not_defined_on_object
|
||||
uncached_author = UncachedAuthor.new(name: 'Joao M. D. Moura')
|
||||
uncached_author_serializer = AuthorSerializer.new(uncached_author)
|
||||
|
||||
render_object_with_cache(uncached_author)
|
||||
key = cache_key_with_adapter("#{uncached_author_serializer.class._cache_key}/#{uncached_author_serializer.object.id}-#{uncached_author_serializer.object.updated_at.strftime("%Y%m%d%H%M%S%9N")}")
|
||||
assert_equal(uncached_author_serializer.attributes.to_json, ActionController::Base.cache_store.fetch(key).to_json)
|
||||
key = "#{uncached_author_serializer.class._cache_key}/#{uncached_author_serializer.object.id}-#{uncached_author_serializer.object.updated_at.strftime("%Y%m%d%H%M%S%9N")}"
|
||||
assert_equal(uncached_author_serializer.attributes.to_json, cache_store.fetch(key).to_json)
|
||||
end
|
||||
|
||||
def test_default_cache_key_fallback
|
||||
render_object_with_cache(@comment)
|
||||
assert_equal(@comment_serializer.attributes.to_json, ActionController::Base.cache_store.fetch(cache_key_with_adapter(@comment.cache_key)).to_json)
|
||||
key = @comment.cache_key
|
||||
assert_equal(@comment_serializer.attributes.to_json, cache_store.fetch(key).to_json)
|
||||
end
|
||||
|
||||
def test_error_is_raised_if_cache_key_is_not_defined_on_object_or_passed_as_cache_option
|
||||
article = Article.new(title: 'Must Read')
|
||||
e = assert_raises ActiveModelSerializers::CachedSerializer::UndefinedCacheKey do
|
||||
render_object_with_cache(article)
|
||||
end
|
||||
assert_match(/ActiveModelSerializers::CacheTest::Article must define #cache_key, or the 'key:' option must be passed into 'CachedActiveModelSerializers_CacheTest_ArticleSerializer.cache'/, e.message)
|
||||
end
|
||||
|
||||
def test_cache_options_definition
|
||||
@@ -137,8 +138,10 @@ module ActiveModelSerializers
|
||||
Timecop.freeze(Time.current) do
|
||||
render_object_with_cache(@post)
|
||||
|
||||
assert_equal(@post_serializer.attributes, ActionController::Base.cache_store.fetch(cache_key_with_adapter(@post.cache_key)))
|
||||
assert_equal(@comment_serializer.attributes, ActionController::Base.cache_store.fetch(cache_key_with_adapter(@comment.cache_key)))
|
||||
key = @post.cache_key
|
||||
assert_equal(@post_serializer.attributes, cache_store.fetch(key))
|
||||
key = @comment.cache_key
|
||||
assert_equal(@comment_serializer.attributes, cache_store.fetch(key))
|
||||
end
|
||||
end
|
||||
|
||||
@@ -148,9 +151,10 @@ module ActiveModelSerializers
|
||||
render_object_with_cache(@post)
|
||||
|
||||
# Check if it cached the objects separately
|
||||
assert_equal(@post_serializer.attributes, ActionController::Base.cache_store.fetch(cache_key_with_adapter(@post.cache_key)))
|
||||
assert_equal(@comment_serializer.attributes, ActionController::Base.cache_store.fetch(cache_key_with_adapter(@comment.cache_key)))
|
||||
|
||||
key = @post.cache_key
|
||||
assert_equal(@post_serializer.attributes, cache_store.fetch(key))
|
||||
key = @comment.cache_key
|
||||
assert_equal(@comment_serializer.attributes, cache_store.fetch(key))
|
||||
|
||||
# Simulating update on comments relationship with Post
|
||||
new_comment = Comment.new(id: 2567, body: 'ZOMG A NEW COMMENT')
|
||||
@@ -161,8 +165,10 @@ module ActiveModelSerializers
|
||||
render_object_with_cache(@post)
|
||||
|
||||
# Check if the the new comment was cached
|
||||
assert_equal(new_comment_serializer.attributes, ActionController::Base.cache_store.fetch(cache_key_with_adapter(new_comment.cache_key)))
|
||||
assert_equal(@post_serializer.attributes, ActionController::Base.cache_store.fetch(cache_key_with_adapter(@post.cache_key)))
|
||||
key = new_comment.cache_key
|
||||
assert_equal(new_comment_serializer.attributes, cache_store.fetch(key))
|
||||
key = @post.cache_key
|
||||
assert_equal(@post_serializer.attributes, cache_store.fetch(key))
|
||||
end
|
||||
end
|
||||
|
||||
@@ -177,7 +183,7 @@ module ActiveModelSerializers
|
||||
hash = render_object_with_cache(@location)
|
||||
|
||||
assert_equal(hash, expected_result)
|
||||
assert_equal({ place: 'Nowhere' }, ActionController::Base.cache_store.fetch(cache_key_with_adapter(@location.cache_key)))
|
||||
assert_equal({ place: 'Nowhere' }, cache_store.fetch(@location.cache_key))
|
||||
end
|
||||
|
||||
def test_fragment_cache_with_inheritance
|
||||
@@ -188,18 +194,14 @@ module ActiveModelSerializers
|
||||
refute_includes(base.keys, :special_attribute)
|
||||
end
|
||||
|
||||
def test_uses_adapter_in_cache_key
|
||||
render_object_with_cache(@post)
|
||||
assert_equal(@post_serializer.attributes, ActionController::Base.cache_store.fetch("#{@post.cache_key}/#{adapter.class.to_s.demodulize.underscore}"))
|
||||
end
|
||||
|
||||
def test_uses_file_digest_in_cache_key
|
||||
render_object_with_cache(@blog)
|
||||
assert_equal(@blog_serializer.attributes, ActionController::Base.cache_store.fetch("#{cache_key_with_adapter(@blog.cache_key)}/#{@blog.class::FILE_DIGEST}"))
|
||||
key = "#{@blog.cache_key}/#{::Model::FILE_DIGEST}"
|
||||
assert_equal(@blog_serializer.attributes, cache_store.fetch(key))
|
||||
end
|
||||
|
||||
def test_cache_digest_definition
|
||||
assert_equal(FILE_DIGEST, @post_serializer.class._cache_digest)
|
||||
assert_equal(::Model::FILE_DIGEST, @post_serializer.class._cache_digest)
|
||||
end
|
||||
|
||||
def test_object_cache_keys
|
||||
@@ -211,7 +213,7 @@ module ActiveModelSerializers
|
||||
assert_equal actual.size, 3
|
||||
assert actual.any? { |key| key == 'comment/1' }
|
||||
assert actual.any? { |key| key =~ %r{post/post-\d+} }
|
||||
assert actual.any? { |key| key =~ %r{writer/author-\d+} }
|
||||
assert actual.any? { |key| key =~ %r{author/author-\d+} }
|
||||
end
|
||||
|
||||
def test_cached_attributes
|
||||
@@ -228,7 +230,7 @@ module ActiveModelSerializers
|
||||
assert_equal cached_attributes[@comment.post.cache_key], Post.new(id: 'post', title: 'New Post', body: 'Body').attributes
|
||||
|
||||
writer = @comment.post.blog.writer
|
||||
writer_cache_key = "writer/#{writer.id}-#{writer.updated_at.strftime("%Y%m%d%H%M%S%9N")}"
|
||||
writer_cache_key = writer.cache_key
|
||||
|
||||
assert_equal cached_attributes[writer_cache_key], Author.new(id: 'author', name: 'Joao M. D. Moura').attributes
|
||||
end
|
||||
@@ -286,16 +288,7 @@ module ActiveModelSerializers
|
||||
private
|
||||
|
||||
def render_object_with_cache(obj, options = {})
|
||||
@serializable_resource = serializable(obj, options).serializable_hash
|
||||
@serializable_resource.serializable_hash
|
||||
end
|
||||
|
||||
def adapter
|
||||
@serializable_resource.adapter
|
||||
end
|
||||
|
||||
def cache_key_with_adapter(key)
|
||||
"#{key}/#{adapter.name.underscore}"
|
||||
serializable(obj, options).serializable_hash
|
||||
end
|
||||
|
||||
def cache_store
|
||||
|
||||
10
test/fixtures/poro.rb
vendored
10
test/fixtures/poro.rb
vendored
@@ -1,6 +1,8 @@
|
||||
verbose = $VERBOSE
|
||||
$VERBOSE = nil
|
||||
class Model < ActiveModelSerializers::Model
|
||||
FILE_DIGEST = Digest::MD5.hexdigest(File.open(__FILE__).read)
|
||||
|
||||
### Helper methods, not required to be serializable
|
||||
|
||||
# Convenience when not adding @attributes readers and writers
|
||||
@@ -52,13 +54,7 @@ Post = Class.new(Model)
|
||||
Like = Class.new(Model)
|
||||
Author = Class.new(Model)
|
||||
Bio = Class.new(Model)
|
||||
Blog = Class.new(Model) do
|
||||
FILE_DIGEST = Digest::MD5.hexdigest(File.open(__FILE__).read)
|
||||
|
||||
def digest
|
||||
FILE_DIGEST
|
||||
end
|
||||
end
|
||||
Blog = Class.new(Model)
|
||||
Role = Class.new(Model)
|
||||
User = Class.new(Model)
|
||||
Location = Class.new(Model)
|
||||
|
||||
Reference in New Issue
Block a user