From e3888f0a40c1764466851fe6a0a5475b1c01dbea Mon Sep 17 00:00:00 2001
From: twinturbo <me@broadcastingadam.com>
Date: Sat, 14 Jul 2012 14:19:08 +0200
Subject: [PATCH] Clean up interface inconistency

---
 lib/active_model/serializer.rb |  4 ++--
 test/caching_test.rb           | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/active_model/serializer.rb b/lib/active_model/serializer.rb
index 3b71b758..72228b19 100644
--- a/lib/active_model/serializer.rb
+++ b/lib/active_model/serializer.rb
@@ -74,7 +74,7 @@ module ActiveModel
 
     class << self
       # set peform caching like root
-      def cache(value = true)
+      def cached(value = true)
         self.perform_caching = value
       end
 
@@ -441,7 +441,7 @@ module ActiveModel
     end
 
     def perform_caching?
-      perform_caching && cache && try(:cache_key)
+      perform_caching && cache && respond_to?(:cache_key)
     end
 
     def expand_cache_key(*args)
diff --git a/test/caching_test.rb b/test/caching_test.rb
index f3a02144..53327985 100644
--- a/test/caching_test.rb
+++ b/test/caching_test.rb
@@ -38,12 +38,12 @@ class CachingTest < ActiveModel::TestCase
   def test_serializers_have_a_cache_store
     ActiveModel::Serializer.cache = NullStore.new
 
-    assert ActiveModel::Serializer.cache
+    assert_kind_of NullStore, ActiveModel::Serializer.cache
   end
 
   def test_serializers_can_enable_caching
     serializer = Class.new(ActiveModel::Serializer) do
-      cache true
+      cached true
     end
 
     assert serializer.perform_caching
@@ -51,7 +51,7 @@ class CachingTest < ActiveModel::TestCase
 
   def test_serializers_cache_serializable_hash
     serializer = Class.new(ActiveModel::Serializer) do
-      cache true
+      cached true
       attributes :name, :skills
 
       def self.to_s
@@ -76,7 +76,7 @@ class CachingTest < ActiveModel::TestCase
 
   def test_serializers_cache_to_json
     serializer = Class.new(ActiveModel::Serializer) do
-      cache true
+      cached true
       attributes :name, :skills
 
       def self.to_s
@@ -101,7 +101,7 @@ class CachingTest < ActiveModel::TestCase
 
   def test_can_use_defined_cache_key
     serializer = Class.new(ActiveModel::Serializer) do
-      cache true
+      cached true
       attributes :name, :skills
 
       def self.to_s