From 3a092c9b4b4e4c2ed9e568631689e53eac663c0c Mon Sep 17 00:00:00 2001 From: Brian McManus Date: Thu, 28 Jan 2016 13:47:17 -0800 Subject: [PATCH] Fixed fragment_cached? method to check if caching I noticed that fragment caching does not actually check if caching is enabled as it seemingly should. The way CachedSerializer#fragment_cached? worked previously would return true even in an environment where caching was disabled as defined by `ActiveModelSerializers.config.perform_caching`. Added check for `_cache` like in the `cached?` method before checking whether `_cache_only` or `_cache_except` is set. There were no existing tests for any of these methods but it's a pretty trivial change. --- lib/active_model/serializer/adapter/cached_serializer.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/active_model/serializer/adapter/cached_serializer.rb b/lib/active_model/serializer/adapter/cached_serializer.rb index 35b10168..076c057e 100644 --- a/lib/active_model/serializer/adapter/cached_serializer.rb +++ b/lib/active_model/serializer/adapter/cached_serializer.rb @@ -24,7 +24,7 @@ module ActiveModel end def fragment_cached? - @klass._cache_only && !@klass._cache_except || !@klass._cache_only && @klass._cache_except + @klass._cache && (@klass._cache_only && !@klass._cache_except || !@klass._cache_only && @klass._cache_except) end def cache_key