cachetastic 1.3.1 → 1.4.0

data/lib/adapters/cachetastic_adapters_base.rb

@@ -46,6 +46,17 @@ class Cachetastic::Adapters::Base
     end
   end
   
+  def stats
+    cache_name = self.name.to_s.camelize
+    adapter_type = self.class.to_s.gsub('Cachetastic::Adapters::', '')
+    s = "Cache: #{cache_name}\nStore Type: #{adapter_type}\n"
+    if self.servers
+      servers = self.servers.join(',')
+      s += "Servers: #{servers}"
+    end
+    puts s
+  end
+  
   class << self
     # Merges options for the store in the configuration file with the cachetastic_default_options 
     # found in the configuration file, and returns the results.

data/lib/adapters/cachetastic_adapters_drb.rb

@@ -39,4 +39,13 @@ class Cachetastic::Adapters::Drb < Cachetastic::Adapters::Base
     self.drb_store.delete(self.name, key)
   end
   
+  def stats
+    super
+    begin
+      self.drb_store.stats if self.drb_store.respond_to? 'stats'
+    rescue Exception => e
+      puts "Calling stats on the DRb store raised this exception: #{e.message}"
+    end
+  end
+  
 end

data/lib/adapters/cachetastic_adapters_file.rb

@@ -11,25 +11,7 @@
 #      logger_1:
 #        type: file
 #        file: log/file_store_cache.log
-class Cachetastic::Adapters::File < Cachetastic::Adapters::Base
-  
-  attr_reader :directory
-  attr_reader :hashed_keys
-  
-  def valid?
-    File.exists?(self.directory)
-  end
-
-  def setup
-    @directory = File.join(self.store_options["dir"], self.name.to_s)
-    FileUtils.mkdir_p(self.directory, :verbose => self.debug?)
-    @hashed_keys = {}
-  end
-  
-  def expire_all
-    FileUtils.rm_rf(self.directory, :verbose => self.debug?)
-    setup
-  end
+class Cachetastic::Adapters::File < Cachetastic::Adapters::FileBase
   
   def get(key)
     full_path = full_path_from_dir(get_key_directoy(key, false))
@@ -56,37 +38,12 @@ class Cachetastic::Adapters::File < Cachetastic::Adapters::Base
     end
   end
   
-  def delete(key, delay = 0)
-    if delay <= 0
-      FileUtils.rm_rf(get_key_directoy(key), :verbose => self.debug?)
-    else
-      so = self.get(key)
-      if so
-        self.set(so.key, so.value, delay)
-      end
-    end
+  protected
+  def store_file_name
+    return STORE_FILE_NAME
   end
   
   private
-  def get_key_directoy(key, mkdir = true)
-    hkey = self.hashed_keys[key.to_sym]
-    if hkey.nil?
-      path = File.join(self.directory, Cachetastic::Helpers::FileUtils.directory_from_key(key))
-      self.hashed_keys[key.to_sym] = path
-      hkey = path
-    end
-    FileUtils.mkdir_p(hkey, :verbose => self.debug?) if mkdir
-    hkey
-  end
-  
-  def full_path_from_key(key)
-    full_path_from_dir(get_key_directoy(key))
-  end
-  
-  def full_path_from_dir(dir)
-    File.join(dir, STORE_FILE_NAME)
-  end
-  
   STORE_FILE_NAME = "cache.yml"
   
 end

data/lib/adapters/cachetastic_adapters_file_base.rb

@@ -0,0 +1,86 @@
+require 'digest/md5'
+require 'base64'
+class Cachetastic::Adapters::FileBase < Cachetastic::Adapters::Base
+  
+  attr_reader :directory
+  attr_reader :hashed_keys
+  
+  def setup
+    @directory = File.join(self.store_options["dir"], self.name.to_s)
+    FileUtils.mkdir_p(self.directory, :verbose => self.debug?)
+    @hashed_keys = {}
+  end
+  
+  def valid?
+    File.exists?(self.directory)
+  end
+  
+  def stats
+    super
+    num_files = num_directories = file_size = 0
+    everything = Dir.glob("#{self.directory}/**/*")
+    everything.reject{|x| x =~ /^\./}.each do |entry|
+      if ::File.directory?(entry)
+        num_directories +=  1
+      else
+        file_size += ::File.size(entry)
+        num_files += 1
+      end
+    end
+    puts "Number of Files: #{num_files}\nNumber of Directories: #{num_directories}\nTotal Size on Disk: #{file_size/1024.to_f} KB\n\n"
+  end
+  
+  def delete(key, delay = 0)
+    if delay <= 0
+      FileUtils.rm_rf(get_key_directoy(key), :verbose => self.debug?)
+    else
+      so = self.get(key)
+      if so
+        self.set(so.key, so.value, delay)
+      end
+    end
+  end
+  
+  def expire_all
+    FileUtils.rm_rf(self.directory, :verbose => self.debug?)
+    setup
+  end
+  
+  protected
+  def store_file_name
+    return "cachetastic.data"
+  end
+  
+  private
+  def directory_from_key(key)
+    hkey = Base64.encode64(Digest::MD5.digest(key))
+    hkey.gsub!("==\n", "")
+    i = 0
+    path = ""
+    until i >= hkey.length do
+      path = File.join(path, hkey[i..i+2])
+      i += 3
+    end
+    path
+  end
+  
+  def full_path_from_key(key)
+    full_path_from_dir(get_key_directoy(key))
+  end
+  
+  def full_path_from_dir(dir)
+    File.join(dir, store_file_name)
+  end
+  
+  def get_key_directoy(key, mkdir = true)
+    hkey = self.hashed_keys[key.to_sym]
+    if hkey.nil?
+      path = File.join(self.directory, directory_from_key(key))
+      self.hashed_keys[key.to_sym] = path
+      hkey = path
+    end
+    FileUtils.mkdir_p(hkey, :verbose => self.debug?) if mkdir
+    hkey
+  end
+  
+end

data/lib/adapters/cachetastic_adapters_html_file.rb

@@ -18,25 +18,7 @@
 #        type: file
 #        file: log/file_store_cache.log
 require 'time'
-class Cachetastic::Adapters::HtmlFile < Cachetastic::Adapters::Base
-  
-  attr_reader :directory
-  attr_reader :hashed_keys
-  
-  def valid?
-    File.exists?(self.directory)
-  end
-
-  def setup
-    @directory = File.join(self.store_options["dir"], self.name.to_s)
-    FileUtils.mkdir_p(self.directory, :verbose => self.debug?)
-    @hashed_keys = {}
-  end
-  
-  def expire_all
-    FileUtils.rm_rf(self.directory, :verbose => self.debug?)
-    setup
-  end
+class Cachetastic::Adapters::HtmlFile < Cachetastic::Adapters::FileBase
   
   def get(key)
     full_path = full_path_from_dir(get_key_directoy(key, false))
@@ -59,37 +41,12 @@ class Cachetastic::Adapters::HtmlFile < Cachetastic::Adapters::Base
     end
   end
   
-  def delete(key, delay = 0)
-    if delay <= 0
-      FileUtils.rm_rf(get_key_directoy(key), :verbose => self.debug?)
-    else
-      so = self.get(key)
-      if so
-        self.set(so.key, so.value, delay)
-      end
-    end
+  protected
+  def store_file_name
+    return STORE_FILE_NAME
   end
   
   private
-  def get_key_directoy(key, mkdir = true)
-    hkey = self.hashed_keys[key.to_sym]
-    if hkey.nil?
-      path = File.join(self.directory, Cachetastic::Helpers::FileUtils.directory_from_key(key))
-      self.hashed_keys[key.to_sym] = path
-      hkey = path
-    end
-    FileUtils.mkdir_p(hkey, :verbose => self.debug?) if mkdir
-    hkey
-  end
-  
-  def full_path_from_key(key)
-    full_path_from_dir(get_key_directoy(key))
-  end
-  
-  def full_path_from_dir(dir)
-    File.join(dir, STORE_FILE_NAME)
-  end
-  
   def html_to_store_object(html)
     key = html.match(/<!-- cachetastic: key: (.*) -->/).captures.first
     expires_at = html.match(/<!-- cachetastic: expires_at: (.*) -->/).captures.first

data/lib/adapters/cachetastic_adapters_local_memory.rb

@@ -44,6 +44,25 @@ class Cachetastic::Adapters::LocalMemory < Cachetastic::Adapters::Base
       end
     end
   end
+  
+  def stats
+    super
+    num_keys = self.local_store.size
+    s = "Number of Entries: #{num_keys}\n"
+    if num_keys > 0
+      expiries = []
+      keys = []
+      self.local_store.each do |key,value|
+        keys << key
+        expiries << value.expires_at
+      end
+      expiries.sort! {|x, y| x <=> y}
+      oldest_expiry = expiries.first
+      newest_expiry = expiries.last
+      s += "Oldest Entry: #{oldest_expiry}\nNewest Entry: #{newest_expiry}\nKeys: #{keys.inspect}\n"
+    end
+    puts s + "\n"
+  end
 
   
 end

data/lib/adapters/cachetastic_adapters_memcache.rb

@@ -55,6 +55,32 @@ class Cachetastic::Adapters::Memcache < Cachetastic::Adapters::Base
     end
   end
   
+  def stats
+    super
+    begin
+      puts "Memcache stats for all caches:"
+      memc = self.conn
+      puts Kernel.pp_to_s(memc.stats)
+      paths = `sh -c 'echo $PATH'`
+      paths = paths.split(':')
+      memcached_tool_found = false
+      paths.each do |path|
+        cmd_path = File.expand_path(File.join(path,'memcached_tool'))
+        if File.exists?(cmd_path)
+           memcached_tool_found = true
+          break
+        end
+      end
+      if memcached_tool_found
+        app_config.memcache_servers.each do |server|
+          puts `memcached_tool #{server}`
+        end
+      end
+    rescue
+    end
+    puts ""
+  end
+  
   protected
   attr_accessor :conn
   attr_accessor :version

data/lib/cachetastic.rb

@@ -30,11 +30,11 @@ require 'caches/cachetastic_caches_page_cache'
 require 'caches/cachetastic_caches_rails_session_cache'
 require 'caches/cachetastic_caches_mack_session_cache'
 require 'errors/cachetastic_errors_unsupported_adapter'
-require 'helpers/cachetastic_helpers_file_utils'
 require 'adapters/cachetastic_adapters_base'
 require 'adapters/cachetastic_adapters_store_object'
 require 'adapters/cachetastic_adapters_memcache'
 require 'adapters/cachetastic_adapters_local_memory'
+require 'adapters/cachetastic_adapters_file_base'
 require 'adapters/cachetastic_adapters_file'
 require 'adapters/cachetastic_adapters_html_file'
 require 'adapters/cachetastic_adapters_drb'

data/lib/tasks/rubyforge_config.yml

@@ -2,4 +2,4 @@
 gem_name: cachetastic
 package: cachetastic
 project: magrathea
-version: 1.3.1
+version: 1.4.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cachetastic
 version: !ruby/object:Gem::Version 
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors: 
 - markbates
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-02-29 00:00:00 -05:00
+date: 2008-03-12 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -27,6 +27,7 @@ files:
 - lib/adapters/cachetastic_adapters_base.rb
 - lib/adapters/cachetastic_adapters_drb.rb
 - lib/adapters/cachetastic_adapters_file.rb
+- lib/adapters/cachetastic_adapters_file_base.rb
 - lib/adapters/cachetastic_adapters_html_file.rb
 - lib/adapters/cachetastic_adapters_local_memory.rb
 - lib/adapters/cachetastic_adapters_memcache.rb
@@ -40,7 +41,6 @@ files:
 - lib/cachetastic_logger.rb
 - lib/errors/cachetastic_errors_unsupported_adapter.rb
 - lib/helpers/cachetastic_helpers_active_record.rb
-- lib/helpers/cachetastic_helpers_file_utils.rb
 - lib/rails_extensions/cachetastic_active_record_base.rb
 - lib/rails_extensions/cgi_session_cachetastic_store.rb
 - lib/tasks/rubyforge_config.yml

data/lib/helpers/cachetastic_helpers_file_utils.rb

@@ -1,22 +0,0 @@
-require 'digest/md5'
-require 'base64'
-
-module Cachetastic
-  module Helpers
-    module FileUtils
-      
-      def self.directory_from_key(key)
-        hkey = Base64.encode64(Digest::MD5.digest(key))
-        hkey.gsub!("==\n", "")
-        i = 0
-        path = ""
-        until i >= hkey.length do
-          path = File.join(path, hkey[i..i+2])
-          i += 3
-        end
-        path
-      end
-      
-    end # FileUtils
-  end # Helpers
-end # Cachetastic