model-cache 0.1.7 → 0.2.0

data/lib/model_cache.rb

@@ -10,30 +10,44 @@ module ModelCache
 	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 
-      result = CACHE.get(ckey) rescue nil
-      if result
-        cache_hit = true
-      end
-      if result == NIL_OBJECT
-        nil
+      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
+          nil
+        else
+          result
+        end
       else
-        result
+        raise "CACHE object not configured #{CACHE.inspect}!"
       end
     end
     unless cache_hit
       result = block.call
-      if Rails.configuration.action_controller.perform_caching
-        begin
+      if Rails.configuration.action_controller.perform_caching 
+        if CACHE.class.name == 'MemCache'
           if result
-            CACHE.set(ckey, result, time)
+            CACHE.set(ckey.hash.to_s, result, time)
           else
-            CACHE.set(ckey, NIL_OBJECT, time)
+            CACHE.set(ckey.hash.to_s, NIL_OBJECT, time)
           end
-        end rescue nil
+        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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: model-cache
 version: !ruby/object:Gem::Version 
-  version: 0.1.7
+  version: 0.2.0
 platform: ruby
 authors: 
 - Frantisek Havluj
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-19 00:00:00 +01:00
+date: 2010-01-22 00:00:00 +01:00
 default_executable: 
 dependencies: []