model-cache 0.2.2 → 0.2.4

data/lib/model-cache.rb

@@ -1 +1,99 @@
-require File.dirname(__FILE__) + '/../init.rb'
+module ModelCache  
+	
+	DEFAULT_TIME = 12.hours unless const_defined?(:DEFAULT_TIME)
+	NIL_OBJECT = :__i_have_no_idea_how_to_do_this_without_an_ugly_symbol unless const_defined?(:NIL_OBJECT)
+	
+	def self.included(klass)
+	  klass.extend ClassMethods
+  end
+	
+	def cache(key, time = DEFAULT_TIME, &block)
+	  ModelCache::cache([self.cache_key, key], time, &block)
+  end
+  	
+	def self.cache(ckey, time = DEFAULT_TIME, &block)
+	  cache_hit = false
+    if CACHE.class.name == 'Memcached'
+      begin
+        result = CACHE.get(ckey.hash.to_s)
+        cache_hit = true
+      rescue Memcached::NotFound => e
+      end
+    elsif CACHE.class.name == 'MemCache'
+      result = CACHE.get(ckey.hash.to_s)
+      if result
+        cache_hit = true
+      end
+      if result == NIL_OBJECT
+        result = nil
+      end
+    else
+      raise "CACHE object not configured #{CACHE.inspect}!"
+    end
+    unless cache_hit
+      result = block.call
+      if CACHE.class.name == 'MemCache'
+        if result
+          CACHE.set(ckey.hash.to_s, result, time)
+        else
+          CACHE.set(ckey.hash.to_s, NIL_OBJECT, time)
+        end
+      elsif CACHE.class.name == 'Memcached'
+        CACHE.set(ckey.hash.to_s, result, time)
+      else
+        raise "CACHE object not configured #{CACHE.inspect}!"
+      end
+      result
+    end
+    result
+  end
+	
+	
+	module ClassMethods
+  	def cache_method(*args)
+  	  opts = args.extract_options!
+  		args.each do |sym|
+  		  cache_method_for_time(sym, (opts[:time] || DEFAULT_TIME))
+  		end
+  	end
+
+  	def cache_method_for_time(sym, time)
+  		alias_method :"__noncached_#{sym}", sym
+  		define_method sym do |*args|
+  			ckey = [self.cache_key, sym, *args]
+  			ModelCache.cache(ckey, time) do
+          self.send(:"__noncached_#{sym}", *args)
+  			end
+  		end    
+  		define_method :"__is_cached_#{sym}?" do |*args|
+  			ckey = [self.cache_key, sym, *args]
+        if CACHE.class.name == 'Memcached'
+          begin
+            result = CACHE.get(ckey.hash.to_s)
+            cache_hit = true
+          rescue Memcached::NotFound => e
+          end
+        elsif CACHE.class.name == 'MemCache'
+          result = CACHE.get(ckey.hash.to_s)
+          if result
+            cache_hit = true
+          end
+          if result == NIL_OBJECT
+            result = nil
+          end
+        else
+          raise "CACHE object not configured #{CACHE.inspect}!"
+        end
+        cache_hit
+  		end
+  		define_method :"__flush_#{sym}" do |*args|
+  			ckey = [self.cache_key, sym, *args]
+  			CACHE.delete(ckey)
+  		end
+  	end
+	end
+	
+end
+
+# include the library
+ActiveRecord::Base.send(:include, ModelCache)

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: model-cache
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Frantisek Havluj
@@ -9,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-03 00:00:00 +01:00
+date: 2010-06-11 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -23,7 +28,6 @@ extra_rdoc_files: []
 
 files: 
 - lib/model-cache.rb
-- lib/model_cache.rb
 - init.rb
 - README.textile
 - MIT-LICENSE
@@ -41,18 +45,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Rails plugin for caching in models.

data/lib/model_cache.rb

@@ -1,83 +0,0 @@
-module ModelCache  
-	
-	DEFAULT_TIME = 12.hours unless const_defined?(:DEFAULT_TIME)
-	NIL_OBJECT = :__i_have_no_idea_how_to_do_this_without_an_ugly_symbol unless const_defined?(:NIL_OBJECT)
-	
-	def self.included(klass)
-	  klass.extend ClassMethods
-  end
-	
-	def cache(key, time = DEFAULT_TIME, &block)
-	  ModelCache::cache([self.cache_key, key], time, &block)
-  end
-  	
-	def self.cache(ckey, time = DEFAULT_TIME, &block)
-	  cache_hit = false
-    if Rails.configuration.action_controller.perform_caching 
-      if CACHE.class.name == 'Memcached'
-        begin
-          result = CACHE.get(ckey.hash.to_s)
-          cache_hit = true
-        rescue Memcached::NotFound => e
-        end
-      elsif CACHE.class.name == 'MemCache'
-        result = CACHE.get(ckey.hash.to_s)
-        if result
-          cache_hit = true
-        end
-        if result == NIL_OBJECT
-          result = nil
-        end
-      else
-        raise "CACHE object not configured #{CACHE.inspect}!"
-      end
-    end
-    unless cache_hit
-      result = block.call
-      if Rails.configuration.action_controller.perform_caching 
-        if CACHE.class.name == 'MemCache'
-          if result
-            CACHE.set(ckey.hash.to_s, result, time)
-          else
-            CACHE.set(ckey.hash.to_s, NIL_OBJECT, time)
-          end
-        elsif CACHE.class.name == 'Memcached'
-          CACHE.set(ckey.hash.to_s, result, time)
-        else
-          raise "CACHE object not configured #{CACHE.inspect}!"
-        end
-      end
-      result
-    end
-    result
-  end
-	
-	
-	module ClassMethods
-  	def cache_method(*args)
-  	  opts = args.extract_options!
-  		args.each do |sym|
-  		  cache_method_for_time(sym, (opts[:time] || DEFAULT_TIME))
-  		end
-  	end
-
-  	def cache_method_for_time(sym, time)
-  		alias_method :"__noncached_#{sym}", sym
-  		define_method sym do |*args|
-  			ckey = [self.cache_key, sym, *args]
-  			ModelCache.cache(ckey, time) do
-          self.send(:"__noncached_#{sym}", *args)
-  			end
-  		end    
-  		define_method :"__is_cached_#{sym}?" do |*args|
-  			ckey = [self.cache_key, sym, *args]
-  			!!( Rails.configuration.action_controller.perform_caching && CACHE.get(ckey) )
-  		end
-  		define_method :"__flush_#{sym}" do |*args|
-  			ckey = [self.cache_key, sym, *args]
-  			CACHE.delete(ckey)
-  		end
-  	end
-	end
-	
-end