markbates-cachetastic-three 2.9.9.20090525090948 → 2.9.9.20090605145500

data/lib/cachetastic/adapters/base.rb

@@ -73,23 +73,6 @@ module Cachetastic
       end
       
       private
-      # If the expiry time is set to 60 minutes and the expiry_swing time is set to
-      # 15 minutes, this method will return a number between 45 minutes and 75 minutes.
-      def calculate_expiry_time(expiry_time) # :doc:
-        expiry_time = self.default_expiry if expiry_time.nil?
-        exp_swing = self.expiry_swing
-        if exp_swing && exp_swing != 0
-          swing = rand(exp_swing.to_i)
-          case rand(2)
-          when 0
-            expiry_time = (expiry_time.to_i + swing)
-          when 1
-            expiry_time = (expiry_time.to_i - swing)
-          end
-        end
-        expiry_time
-      end
-      
       def define_accessor(key)
         instance_eval(%{
           def #{key}

data/lib/cachetastic/adapters/file.rb

@@ -17,8 +17,8 @@ module Cachetastic
         return val
       end # get
       
-      def set(key, value, expiry_time = nil)
-        so = Cachetastic::Cache::StoreObject.new(key, value, calculate_expiry_time(expiry_time).from_now)
+      def set(key, value, expiry_time = configatron.cachetastic.defaults.default_expiry)
+        so = Cachetastic::Cache::StoreObject.new(key, value, expiry_time.from_now)
         path = file_path(key)
         ::File.open(path, 'w') {|f| f.write marshal(so)}
         value

data/lib/cachetastic/adapters/local_memory.rb

@@ -11,8 +11,8 @@ module Cachetastic
         @_store[key]
       end # get
       
-      def set(key, value, expiry_time = nil)
-        so = Cachetastic::Cache::StoreObject.new(key, value, calculate_expiry_time(expiry_time).from_now)
+      def set(key, value, expiry_time = configatron.cachetastic.defaults.default_expiry)
+        so = Cachetastic::Cache::StoreObject.new(key, value, expiry_time.from_now)
         @_store[key] = marshal(so)
         value
       end # set

data/lib/cachetastic/adapters/memcached.rb

@@ -22,8 +22,8 @@ module Cachetastic
         connection.get(transform_key(key), false)
       end # get
       
-      def set(key, value, expiry_time = 0)
-        connection.set(transform_key(key), marshal(value), calculate_expiry_time(expiry_time), false)
+      def set(key, value, expiry_time = configatron.cachetastic.defaults.default_expiry)
+        connection.set(transform_key(key), marshal(value), expiry_time, false)
       end # set
       
       def delete(key)
@@ -84,10 +84,4 @@ module Cachetastic
       
     end # Memcached
   end # Adapters
-end # Cachetastic
-
-#      c_threshold: 10_000
-#      compression: true
-#      debug: false
-#      readonly: false
-#      urlencode: false
+end # Cachetastic

data/lib/cachetastic/cache.rb

@@ -12,7 +12,7 @@ module Cachetastic
       
       def set(key, value, expiry_time = nil)
         do_with_logging(:set, key) do
-          self.adapter.set(key, value, expiry_time)
+          self.adapter.set(key, value, calculate_expiry_time(expiry_time))
         end
       end # set
       
@@ -53,6 +53,23 @@ module Cachetastic
       end
       
       private
+      # If the expiry time is set to 60 minutes and the expiry_swing time is set to
+      # 15 minutes, this method will return a number between 45 minutes and 75 minutes.
+      def calculate_expiry_time(expiry_time) # :doc:
+        expiry_time = self.adapter.default_expiry if expiry_time.nil?
+        exp_swing = self.adapter.expiry_swing
+        if exp_swing && exp_swing != 0
+          swing = rand(exp_swing.to_i)
+          case rand(2)
+          when 0
+            expiry_time = (expiry_time.to_i + swing)
+          when 1
+            expiry_time = (expiry_time.to_i - swing)
+          end
+        end
+        expiry_time
+      end
+      
       def handle_store_object(key, val, &block)
         if val.is_a?(Cachetastic::Cache::StoreObject)
           if val.expired?

data/lib/cachetastic/cacheable.rb

@@ -87,7 +87,7 @@ module Cachetastic
       #   Person.cacher("say_hi") {"Hi There"} # => "Hi There"
       #   Person.get_from_cache("say_hi") # => "Hi There"
       #   Cachetastic::Cacheable::PersonCache.get("say_hi") # => "Hi There"
-      def cacher(key, expiry = 0)
+      def cacher(key, expiry = nil)
         cache_class.get(key) do
           if block_given?
             res = yield
@@ -118,6 +118,7 @@ module Cachetastic
       def expire_all
         cache_class.expire_all
       end
+      
     end
     
     # --------------------------

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: markbates-cachetastic-three
 version: !ruby/object:Gem::Version 
-  version: 2.9.9.20090525090948
+  version: 2.9.9.20090605145500
 platform: ruby
 authors: 
 - Mark Bates
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-25 00:00:00 -07:00
+date: 2009-06-05 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency