will_cache 0.0.4 → 0.0.5

data/lib/will_cache/cacheable.rb

@@ -1,36 +1,38 @@
 module WillCache
   module Cacheable
 
-    def cache
-      Rails.cache
-    end
-
     def expire_cache(method_name = nil, args = {})
       with = args[:with]
-      cache.delete(method_cache_key(method_name, with))
+      Rails.cache.delete(method_cache_key(method_name, with))
       true
     end
     alias :clear_cache :expire_cache
     
     def cached(method_name, args = {})
       with = args[:with]
-      Rails.cache.fetch(method_cache_key(method_name, with)) {
-        do_send(method_name, with)
-      }
+
+      # Rails.fetch is broken
+      # http://developingsimplicity.com/posts/rails-cache-fetch
+      key = method_cache_key(method_name, with)
+      if Rails.cache.exist?(key)
+        Rails.cache.read(key)
+      else
+        Rails.cache.write(key, do_send(method_name, with))
+      end
     end
     alias :caches :cached
 
     def fetch_cache(method_name, args = {})
       with = args[:with]
-      cache.read(method_cache_key(method_name, with))
+      Rails.cache.read(method_cache_key(method_name, with))
     end
 
     def write_cache(key, value, ttl = nil)
-      cache.write(key, value, :expires_in => ttl)
+      Rails.cache.write(key, value, :expires_in => ttl)
     end
 
     def read_cache(key)
-      cache.read(key)
+      Rails.cache.read(key)
     end
 
     def do_send(method_name, with)

data/test/functional/will_cache_test.rb

@@ -30,12 +30,23 @@ class WillCacheTest < Test::Unit::TestCase
   end
 
   def test_cached_on_class_method
-    mock(Rails.cache).fetch("User:count") { 1 }
+    key = "User:count"
+    mock(Rails.cache).exist?(key) { false }
+    mock(Rails.cache).write(key, 1) { 1 }
     assert_equal 1, User.cached(:count)
   end
 
   def test_cached_on_instance_method
-    mock(Rails.cache).fetch("User:1:articles") { @user.articles }
+    key = "User:1:articles"
+    mock(Rails.cache).exist?(key) { false }
+    mock(Rails.cache).write(key, @user.articles) { @user.articles }
+    assert_equal @user.articles, @user.cached(:articles)
+  end
+
+  def test_cached_on_instance_method_on_hit
+    key = "User:1:articles"
+    mock(Rails.cache).exist?(key) { true }
+    mock(Rails.cache).read(key) { @user.articles }
     assert_equal @user.articles, @user.cached(:articles)
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: will_cache
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Dejan Simic