will_cache 0.0.2 → 0.0.3

data/README.md

@@ -8,9 +8,9 @@ WillCache provides simple API for caching ActiveRecord objects that uses ActiveS
 
     >> User.last.cached(:profile)
       User Load (0.000581) (1 Row)   SELECT * FROM `users` ORDER BY users.id DESC LIMIT 1
-      Cache miss: users:65:profile
+      Cache miss: User:65:profile
       Profile Load (0.000454) (1 Row)   SELECT * FROM `profiles` WHERE (`profiles`.user_id = 65) LIMIT 1
-      Cache write (will save 1.64ms): users:65:profile
+      Cache write (will save 1.64ms): User:65:profile
     => #<Profile id: 65, first_name: nil, last_name: nil, ...>
 
 Example shows [inline log in Rails console](http://rors.org/2011/07/17/inline-logging-in-rails-console.html). 

data/lib/will_cache/cacheable.rb

@@ -1,20 +1,42 @@
 module WillCache
   module Cacheable
+
+    def cache
+      Rails.cache
+    end
+
     def expire_cache(method_name = nil, args = {})
       with = args[:with]
-      Rails.cache.delete(method_cache_key(method_name, with))
+      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 cache.exist?(key)
+        cache.read(key)
+      else
+        cache.write(key, do_send(method_name, with))
+      end
     end
+    alias :caches :cached
 
     def fetch_cache(method_name, args = {})
       with = args[:with]
-      Rails.cache.read(method_cache_key(method_name, with))
+      cache.read(method_cache_key(method_name, with))
+    end
+
+    def write_cache(key, value, ttl = nil)
+      cache.write(key, value, :expires_in => ttl)
+    end
+
+    def read_cache(key)
+      cache.read(key)
     end
 
     def do_send(method_name, with)
@@ -34,7 +56,7 @@ module WillCache
       if with.blank?
         base
       else
-        "#{base}(#{with.inspect})"
+        "#{base}:#{with})"
       end
     end
   end

data/lib/will_cache.rb

@@ -7,6 +7,7 @@ module WillCache
 
   module ClassMethods
     include Cacheable
+
     def acts_as_cached
       send :include, InstanceMethods
     end

data/test/functional/will_cache_test.rb

@@ -30,23 +30,34 @@ 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
 
   def test_expire_cache
     mock(Rails.cache).delete("User:1:articles")
-    @user.expire_cache(:articles)
+    assert @user.expire_cache(:articles)
   end
 
   def test_expire_cache2
     mock(Rails.cache).delete("User:1:random:2")
-    @user.expire_cache('random:2')
+    assert @user.expire_cache('random:2')
   end
 
   def test_fetch_cache

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: will_cache
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Dejan Simic
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-18 00:00:00 +02:00
+date: 2011-07-19 00:00:00 +02:00
 default_executable: 
 dependencies: []