will_cache 0.0.3 → 0.0.4

data/lib/will_cache/cacheable.rb

@@ -14,15 +14,9 @@ module WillCache
     
     def cached(method_name, args = {})
       with = args[:with]
-
-      # Rails.fetch is broken
-      # http://developingsimplicity.com/posts/rails-cache-fetch
-      key = method_cache_key(method_name, with)
-      if cache.exist?(key)
-        cache.read(key)
-      else
-        cache.write(key, do_send(method_name, with))
-      end
+      Rails.cache.fetch(method_cache_key(method_name, with)) {
+        do_send(method_name, with)
+      }
     end
     alias :caches :cached
 
@@ -56,7 +50,7 @@ module WillCache
       if with.blank?
         base
       else
-        "#{base}:#{with})"
+        "#{base}:#{with}"
       end
     end
   end

data/test/functional/will_cache_test.rb

@@ -30,23 +30,12 @@ class WillCacheTest < Test::Unit::TestCase
   end
 
   def test_cached_on_class_method
-    key = "User:count"
-    mock(Rails.cache).exist?(key) { false }
-    mock(Rails.cache).write(key, 1) { 1 }
+    mock(Rails.cache).fetch("User:count") { 1 }
     assert_equal 1, User.cached(:count)
   end
 
   def test_cached_on_instance_method
-    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 }
+    mock(Rails.cache).fetch("User:1:articles") { @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: 25
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Dejan Simic