will_cache 0.0.6 → 0.0.7

data/lib/will_cache/cacheable.rb

@@ -1,3 +1,5 @@
+require File.expand_path("../simple_memoize", __FILE__)
+
 module WillCache
   module Cacheable
 
@@ -5,6 +7,7 @@ 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 = {})
@@ -19,38 +22,36 @@ module WillCache
         write_cache(key, do_send(method_name, with))
       end
     end
+    memoize :cached
     alias :caches :cached
 
     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
-
-    def do_send(method_name, with)
-      if with.blank?
-        send(method_name)
-      else
-        send(method_name, with)
-      end
-    end
+    memoize :cache_exist?
 
     def method_cache_key(method_name, with)
       if self.is_a?(ActiveRecord::Base)
@@ -64,6 +65,16 @@ module WillCache
         "#{base}:#{with}"
       end
     end
+    memoize :method_cache_key
+
+    def do_send(method_name, with)
+      if with.blank?
+        send(method_name)
+      else
+        send(method_name, with)
+      end
+    end
+
   end
 end
 

data/lib/will_cache/simple_memoize.rb

@@ -0,0 +1,44 @@
+# 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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: will_cache
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Dejan Simic
@@ -30,6 +30,7 @@ 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