will_cache 0.0.8 → 0.0.9

data/lib/will_cache/cacheable.rb

@@ -1,5 +1,3 @@
-require File.expand_path("../simple_memoize", __FILE__)
-
 module WillCache
   module Cacheable
 
@@ -7,7 +5,6 @@ module WillCache
       with = args[:with]
       delete_cache(method_cache_key(method_name, with))
     end
-    memoize :expire_cache
     alias :clear_cache :expire_cache
     
     def cached(method_name, args = {})
@@ -22,36 +19,35 @@ module WillCache
         write_cache(key, do_send(method_name, with))
       end
     end
-    memoize :cached
     alias :caches :cached
 
+    def refresh_cache(method_name = nil, args = {})
+      expire_cache(method_name, args)
+      cached(method_name, args)
+    end
+
     def fetch_cache(method_name, args = {})
       with = args[:with]
       read_cache(method_cache_key(method_name, with))
     end
-    memoize :fetch_cache
 
     def write_cache(key, value)
       Rails.cache.write(key, value)
       value
     end
-    memoize :write_cache
 
     def read_cache(key)
       Rails.cache.read(key)
     end
-    memoize :read_cache
 
     def delete_cache(key)
       Rails.cache.delete(key)
       true
     end
-    memoize :delete_cache
 
     def cache_exist?(key)
       Rails.cache.exist?(key)
     end
-    memoize :cache_exist?
 
     def method_cache_key(method_name, with)
       if self.is_a?(ActiveRecord::Base)
@@ -65,7 +61,6 @@ module WillCache
         "#{base}:#{with.inspect}"
       end
     end
-    memoize :method_cache_key
 
     def do_send(method_name, with)
       if with.blank?

data/test/functional/will_cache_test.rb

@@ -1,6 +1,6 @@
 require File.expand_path('../../test_helper', __FILE__)
 require 'active_support/cache'
-
+require 'FileUtils'
 class Rails
   def self.cache
     @@cache
@@ -37,7 +37,8 @@ class WillCacheTest < Test::Unit::TestCase
     
     @user = User.create!
     @user.articles << Article.new(:body => 'hey')
-    Rails.cache = ActiveSupport::Cache::FileStore.new('tmp')
+    FileUtils.rm_rf('tmp/cache')
+    Rails.cache = ActiveSupport::Cache::FileStore.new('tmp/cache')
   end
 
   def test_cached_on_class_method
@@ -80,6 +81,15 @@ class WillCacheTest < Test::Unit::TestCase
     @user.fetch_cache(:articles)
   end
 
+  def test_refresh_cache
+    assert_equal 1, User.cached(:count)
+    assert_equal 1, User.fetch_cache(:count)
+    User.create!
+    assert_equal 1, User.fetch_cache(:count)
+    assert_equal 2, User.refresh_cache(:count)
+    assert_equal 2, User.fetch_cache(:count)
+  end
+
   def test_expire_cache_after_update
     mock(Rails.cache).delete("User:#{@user.id}")
     @user.name = 'dejan'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: will_cache
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 0
-  - 8
-  version: 0.0.8
+  - 9
+  version: 0.0.9
 platform: ruby
 authors: 
 - Dejan Simic
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-28 00:00:00 +01:00
+date: 2011-12-06 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -30,11 +30,9 @@ extra_rdoc_files: []
 files: 
 - Rakefile
 - lib/will_cache/cacheable.rb
-- lib/will_cache/simple_memoize.rb
 - lib/will_cache.rb
 - test/fixtures/database.yml
 - test/fixtures/schema.rb
-- test/functional/tmp/68B/030/User%3Asum%3A%5B2%2C+3%5D
 - test/functional/will_cache_test.rb
 - test/test_helper.rb
 - README.md

data/lib/will_cache/simple_memoize.rb

@@ -1,44 +0,0 @@
-# https://github.com/bradediger/simple_memoize/blob/6cca4b99579566957ef5c045a3b0c21b6455cf59/lib/simple_memoize.rb
-module SimpleMemoize
-  VERSION = '1.1.0'
-
-  module Module
-    def memoize(*method_names)
-      method_names.each do |method_name|
-        method_name = method_name.to_s
-        stripped_method_name = method_name.sub(/([!?])$/, '')
-
-        punctuation = $1
-        wordy_punctuation = (punctuation == '!' ? '_bang' : '_huh') if punctuation
-        ivar_name = "@#{stripped_method_name}#{wordy_punctuation}"
-
-        memoized_method_name = "#{stripped_method_name}_with_memo#{punctuation}"
-        regular_method_name  = "#{stripped_method_name}_without_memo#{punctuation}"
-
-        unless (instance_methods + private_instance_methods).include?(method_name)
-          raise NoMethodError, "The Method '#{method_name}' cannot be memoized because it doesn't exist in #{self}"
-        end
-        return if self.method_defined?(memoized_method_name)
-    
-        self.class_eval "
-          def #{memoized_method_name}(*args)
-            if defined?(#{ivar_name}) && #{ivar_name}.include?(args)
-              #{ivar_name}[args]
-            else
-              #{ivar_name} ||= Hash.new
-              #{ivar_name}[args] = #{regular_method_name}(*args)
-            end
-          end
-
-          alias_method :#{regular_method_name}, :#{method_name}
-          alias_method :#{method_name}, :#{memoized_method_name}
-
-          protected :#{method_name} if protected_instance_methods.include?('#{regular_method_name}')
-          private   :#{method_name} if private_instance_methods.include?('#{regular_method_name}')
-        "
-      end
-    end
-  end
-end
-
-Module.send :include, SimpleMemoize::Module