cachetastic 1.0.5 → 1.0.6

data/lib/cachetastic_connection.rb

@@ -10,10 +10,13 @@ class Cachetastic::Connection
   def get(name)
     name = name.to_sym
     conn = self.connections[name]
+    # puts "connection: #{conn}"
+    # puts "connection.valid? #{conn.valid?}" if conn
     return conn if conn && conn.valid?
+    # puts "we need to set up a new connection for: #{name}"
     store = Cachetastic::Stores::Base.get_options(name)["store"].camelcase
     conn = "Cachetastic::Stores::#{store}".constantize.new(name)
-    self.connections[name] = conn
+    self.connections[name.to_sym] = conn
     return conn
   end
   

data/lib/cachetastic_logger.rb

@@ -5,11 +5,8 @@ class Cachetastic::Logger
   
   def initialize(options, cache_name)
     self.options = options
-    # puts "self.options = #{self.options.inspect}"
     self.cache_name = cache_name
     self.options.each_pair do |n, opts|
-      # puts "opts: #{opts.inspect}"
-      # puts "asdfasfsadfaf opts[\"level\"] = #{opts["level"]}"
       opts["level"] = (opts["level"] ||= "info").to_sym
     end
   end
@@ -18,7 +15,6 @@ class Cachetastic::Logger
   
   LOG_LEVELS.each do |level|
     define_method(level) do |*args|
-      # puts "logging for: #{level}"
       lm = "[CACHE] [#{level.to_s.upcase}]\t#{Time.now.strftime("%m/%d/%y %H:%m:%S")}"
       exs = []
       args.each do |arg|
@@ -32,10 +28,6 @@ class Cachetastic::Logger
         lm << "\n#{ex.message}\n" << ex.backtrace.join("\n")
       end
       self.options.each_pair do |n, opts|
-        # puts "opts[\"level\"]: #{opts["level"]}"
-        # # if level == opts["level"]
-        # puts "LOG_LEVELS.index(opts[\"level\"]): #{LOG_LEVELS.index(opts["level"])} (#{opts["level"]})"
-        # puts "LOG_LEVELS.index(level): #{LOG_LEVELS.index(level)} (#{level})"
         if LOG_LEVELS.index(opts["level"]) >= LOG_LEVELS.index(level)
           case opts["type"]
           when "file"

data/lib/stores/cachetastic_stores_local_memory.rb

@@ -48,7 +48,6 @@ class Cachetastic::Stores::LocalMemory < Cachetastic::Stores::Base
     attr_accessor :expires_at
     
     def initialize(key, value, expiry)
-      # puts "expiry: #{expiry}"
       self.key = key
       self.value = value
       begin

data/lib/stores/cachetastic_stores_memcache.rb

@@ -32,8 +32,10 @@ class Cachetastic::Stores::Memcache < Cachetastic::Stores::Base
   
   def valid?
     begin
-      return (self.active? && self.version == self.get_version(self.name))
+      return (self.conn.active? && self.version == self.get_version(self.name))
     rescue Exception => e
+      puts e.message
+      puts e.backtrace.join("\n")
       return false
     end
   end
@@ -64,4 +66,93 @@ class Cachetastic::Stores::Memcache < Cachetastic::Stores::Base
     v
   end
   
-end
+end
+
+
+# class Cachetastic::Stores::Memcache < Cachetastic::Stores::Base
+#   
+#   def setup
+#     self.conn
+#     self.version = self.get_version(self.name)
+#   end
+#   
+#   def set(key, value, expiry = 0)
+#     self.conn.set(key, value, expiry)
+#   end
+#   
+#   def delete(key, delay = 0)
+#     self.conn.delete(key, delay)
+#   end
+#   
+#   def get(key)
+#     self.conn.get(key)
+#   end
+#   
+#   def expire_all
+#     self.increment_version(self.name)
+#   end
+#   
+#   def inspect
+#     self.conn.inspect + " <version: #{self.version}> #{self.conn.stats.inspect}"
+#   end
+#   
+#   def namespace
+#     v = self.get_version(self.name)
+#     return "#{name}.#{v}"
+#   end
+#   
+#   def valid?
+#     begin
+#       return (self.conn.active? && (self.version == self.get_version(self.name)))
+#     rescue Exception => e
+#       puts e.message
+#       puts e.backtrace.join("\n")
+#       return false
+#     end
+#   end
+#   
+#   protected
+#   attr_accessor :version
+#   
+#   def conn
+#     begin
+#       if @conn.nil? || !@conn.active?
+#         @conn = MemCache.new(self.servers, self.store_options.merge({:namespace => self.namespace}))
+#       end
+#       return @conn
+#     rescue Exception => e
+#       @conn.reset
+#       retry
+#     end
+#   end
+#   
+#   def connect_to_ns_versions
+#     begin
+#       ns_versions = MemCache.new(self.servers, self.store_options.merge({:namespace => :namespace_versions}))
+#       yield ns_versions if block_given?
+#     rescue Exception => e
+#       retry
+#     end
+#   end
+#   
+#   def increment_version(name)
+#     name = name.to_s
+#     v = get_version(name)
+#     connect_to_ns_versions do |ns_versions|
+#       ns_versions.set(name, v + 1)
+#     end
+#   end
+# 
+#   def get_version(name)
+#     name = name.to_s
+#     connect_to_ns_versions do |ns_versions|
+#       v = ns_versions.get(name)
+#       if v.nil?
+#         ns_versions.set(name, 1)
+#         v = 1
+#       end
+#       v
+#     end
+#   end
+#   
+# end

data/lib/tasks/rubyforge_config.yml

@@ -2,4 +2,4 @@
 gem_name: cachetastic
 package: cachetastic
 project: magrathea
-version: 1.0.5
+version: 1.0.6

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: cachetastic
 version: !ruby/object:Gem::Version 
-  version: 1.0.5
+  version: 1.0.6
 date: 2007-12-28 00:00:00 -05:00
 summary: cachetastic
 require_paths: