cache 0.2.7 → 0.3.0

data/lib/cache/active_support_cache_dalli_store.rb

@@ -0,0 +1,14 @@
+require 'cache/active_support_cache_store'
+module Cache::ActiveSupportCacheDalliStore
+  def self.extended(base)
+    base.extend Cache::ActiveSupportCacheStore
+  end
+
+  def after_fork
+    @metal.reset
+  end
+
+  def _stats
+    @metal.stats
+  end
+end

data/lib/cache/active_support_cache_memory_store.rb

@@ -0,0 +1,10 @@
+require 'cache/active_support_cache_store'
+module Cache::ActiveSupportCacheMemoryStore
+  def self.extended(base)
+    base.extend Cache::ActiveSupportCacheStore
+  end
+
+  def _stats
+    {}
+  end
+end

data/lib/cache/active_support_cache_store.rb

@@ -0,0 +1,37 @@
+module Cache::ActiveSupportCacheStore
+  # native
+  def fetch(k, ttl = nil, &blk)
+    handle_fork
+    @metal.fetch k, { :expires_in => extract_ttl(ttl) }, &blk
+  end
+  # --
+
+  def _get(k)
+    @metal.read k
+  end
+
+  def _get_multi(ks)
+    @metal.read_multi *ks
+  end
+
+  def _set(k, v, ttl)
+    if ttl == 0
+      @metal.write k, v # never expire
+    else
+      @metal.write k, v, :expires_in => ttl
+    end
+  end
+
+  def _delete(k)
+    @metal.delete k
+  end
+
+  def _flush
+    @metal.clear
+  end
+
+  def _exist?(k)
+    @metal.exist? k
+    # !get(k).nil?
+  end
+end

data/lib/cache/config.rb

@@ -11,30 +11,6 @@ class Cache
       @parent = parent
     end
     
-    # The cache client to use.
-    #
-    # Note that you normally just set this when you initialize a Cache object.
-    #
-    # Example:
-    #     cache.config.client = Memcached.new '127.0.0.1:11211'
-    def client=(client) #:nodoc:
-      @client = client.is_a?(::Cache) ? client.config.client : client
-    end
-
-    def client #:nodoc:
-      if @client.nil?
-        self.client = if defined?(::Rails) and ::Rails.respond_to?(:cache) and rails_cache = ::Rails.cache and not rails_cache.is_a?(::Cache)
-          rails_cache
-        else
-          require 'active_support/cache'
-          require 'active_support/cache/memory_store'
-          ::ActiveSupport::Cache::MemoryStore.new
-        end
-      else
-        @client
-      end
-    end
-    
     # TTL for method caches. Defaults to 60 seconds.
     #
     # Example:
@@ -46,13 +22,5 @@ class Cache
     def default_ttl #:nodoc:
       @default_ttl || 60
     end
-    
-    def logger #:nodoc:
-      @logger
-    end
-    
-    def logger=(logger) #:nodoc:
-      @logger = logger
-    end
   end
 end

data/lib/cache/dalli_client.rb

@@ -0,0 +1,46 @@
+module Cache::DalliClient
+  def after_fork
+    @metal.close
+  end
+
+  def _get(k)
+    @metal.get k
+  end
+
+  def _get_multi(ks)
+    @metal.get_multi ks
+  end
+
+  def _set(k, v, ttl)
+    @metal.set k, v, ttl
+  end
+
+  def _delete(k)
+    @metal.delete k
+  end
+
+  def _flush
+    @metal.flush
+  end
+
+  # sux
+  def _exist?(k)
+    !@metal.get(k).nil?
+  end
+
+  def _stats
+    @metal.stats
+  end
+
+  # native
+  def fetch(k, ttl = nil, &blk)
+    handle_fork
+    @metal.fetch k, extract_ttl(ttl), &blk
+  end
+
+  def cas(k, ttl = nil, &blk)
+    handle_fork
+    @metal.cas k, extract_ttl(ttl), &blk
+  end
+  # --
+end

data/lib/cache/mem_cache.rb

@@ -0,0 +1,41 @@
+module Cache::MemCache
+  def after_fork
+    @metal.reset
+  end
+
+  def _get(k)
+    @metal.get k
+  end
+
+  def _get_multi(ks)
+    @metal.get_multi ks
+  end
+
+  def _set(k, v, ttl)
+    @metal.set k, v, ttl
+  end
+
+  def _delete(k)
+    @metal.delete k
+  end
+
+  def _flush
+    @metal.flush_all
+  end
+
+  # sux
+  def _exist?(k)
+    !@metal.get(k).nil?
+  end
+
+  def _stats
+    @metal.stats
+  end
+
+  # native
+  def fetch(k, ttl = nil, &blk)
+    handle_fork
+    @metal.fetch k, extract_ttl(ttl), &blk
+  end
+  # --
+end

data/lib/cache/memcached.rb

@@ -0,0 +1,47 @@
+module Cache::Memcached
+  def thread_metal
+    ::Thread.current["#{@pid}/#{self.class.name}/#{object_id}/thread_metal"] ||= @metal.clone
+  end
+
+  def _get(k)
+    thread_metal.get k
+  rescue ::Memcached::NotFound
+    # oh well
+  end
+
+  def _get_multi(ks)
+    thread_metal.get ks
+  end
+
+  def _set(k, v, ttl)
+    thread_metal.set k, v, ttl
+  end
+
+  def _delete(k)
+    thread_metal.delete k
+  rescue ::Memcached::NotFound
+  end
+
+  def _flush
+    thread_metal.flush
+  end
+
+  def _exist?(k)
+    thread_metal.get k
+    true
+  rescue ::Memcached::NotFound
+    false
+  end
+
+  def _stats
+    thread_metal.stats
+  end
+
+  # native
+  def cas(k, ttl = nil, &blk)
+    handle_fork
+    thread_metal.cas k, extract_ttl(ttl), &blk
+  rescue ::Memcached::NotFound
+  end
+  # --
+end

data/lib/cache/memcached_rails.rb

@@ -0,0 +1,33 @@
+require 'cache/memcached'
+module Cache::MemcachedRails
+  def self.extended(base)
+    base.extend Cache::Memcached
+    base.extend Override
+  end
+
+  module Override
+    def _exist?(k)
+      thread_metal.exist? k
+      # !get(k).nil?
+    end
+
+    def _get(k)
+      thread_metal.get k
+    end
+
+    def _get_multi(ks)
+      thread_metal.get_multi ks
+    end
+
+    def _delete(k)
+      thread_metal.delete k
+    end
+
+    # native
+    def cas(k, ttl = nil, &blk)
+      handle_fork
+      thread_metal.cas k, extract_ttl(ttl), &blk
+    end
+    # --
+  end
+end

data/lib/cache/redis.rb

@@ -0,0 +1,38 @@
+module Cache::Redis
+  def _get(k)
+    if cached_v = @metal.get(k) and cached_v.is_a?(::String)
+      ::Marshal.load cached_v
+    end
+  end
+
+  def _get_multi(ks)
+    ks.inject({}) do |memo, k|
+      memo[k] = @metal.get(k) if @metal.exist?(k)
+      memo
+    end
+  end
+
+  def _set(k, v, ttl)
+    if ttl == 0
+      @metal.set k, ::Marshal.dump(v)
+    else
+      @metal.setex k, ttl, ::Marshal.dump(v)
+    end
+  end
+
+  def _delete(k)
+    @metal.del k
+  end
+
+  def _flush
+    @metal.flush
+  end
+
+  def _exist?(k)
+    @metal.exists k
+  end
+
+  def _stats
+    @metal.stats
+  end
+end

data/lib/cache/redis_namespace.rb

@@ -0,0 +1,6 @@
+require 'cache/redis_namespace'
+module Cache::RedisNamespace
+  def self.extended(base)
+    base.extend Cache::Redis
+  end
+end

data/lib/cache/version.rb

@@ -1,4 +1,4 @@
 class Cache
-  VERSION = "0.2.7"
+  VERSION = "0.3.0"
 end
 

data/test/helper.rb

@@ -6,6 +6,10 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'cache'
 
+if ::Bundler.definition.specs['ruby-debug19'].first or ::Bundler.definition.specs['ruby-debug'].first
+  require 'ruby-debug'
+end
+
 require 'shared_tests'
 
 class Test::Unit::TestCase

data/test/shared_tests.rb

@@ -1,5 +1,3 @@
-require 'logger'
-
 module SharedTests
   def test_get
     assert_equal nil, @cache.get('hello')
@@ -58,22 +56,7 @@ module SharedTests
       @cache.stats
     end
   end
-
-  def test_logger
-    assert_equal nil, @cache.logger
-    l = Logger.new $stderr
-    @cache.logger = l
-    assert_equal l, @cache.logger
-  end
-  
-  def test_reset
-    @cache.set 'hello', 'world'
-    assert @cache.exist?('hello')
-    @cache.reset
-    # still there!
-    assert @cache.exist?('hello')
-  end
-  
+    
   def test_fetch
     assert_equal nil, @cache.fetch('hello')
     assert_equal 'world', @cache.fetch('hello') { 'world' }

data/test/test_dalli_storage.rb

@@ -10,7 +10,7 @@ class TestDalliStorage < Test::Unit::TestCase
   include SharedTests
   
   def get_ring_object_id
-    @cache.config.client.instance_variable_get(:@ring).object_id
+    @cache.metal.instance_variable_get(:@ring).object_id
   end
   
   def test_treats_as_thread_safe

data/test/test_dalli_store_storage.rb

@@ -12,7 +12,7 @@ class TestDalliStoreStorage < Test::Unit::TestCase
   include SharedTests
   
   def get_ring_object_id
-    hidden_dalli_client = @cache.config.client.instance_variable_get :@data
+    hidden_dalli_client = @cache.metal.instance_variable_get :@data
     hidden_dalli_client.instance_variable_get(:@ring).object_id
   end
   

data/test/test_default_storage.rb

@@ -6,27 +6,27 @@ class TestDefaultStorage < Test::Unit::TestCase
   end
   
   def test_query
-    assert @cache.storage.send(:memory_store?)
+    assert_equal ActiveSupport::Cache::MemoryStore, @cache.metal.class
   end
   
   def test_default
     c = Cache.new
-    assert_equal ActiveSupport::Cache::MemoryStore, c.config.client.class
+    assert_equal ActiveSupport::Cache::MemoryStore, c.metal.class
   end
   
   def test_self_reference
     c = Cache.new(Cache.new)
-    assert_equal ActiveSupport::Cache::MemoryStore, c.config.client.class
+    assert_equal ActiveSupport::Cache::MemoryStore, c.metal.class
   end
   
   def test_wrap_with_default
     c = Cache.wrap(Cache.new)
-    assert_equal ActiveSupport::Cache::MemoryStore, c.config.client.class
+    assert_equal ActiveSupport::Cache::MemoryStore, c.metal.class
   end
   
   def test_absurd_wrap
     c = Cache.new(Cache.wrap(Cache.new))
-    assert_equal ActiveSupport::Cache::MemoryStore, c.config.client.class
+    assert_equal ActiveSupport::Cache::MemoryStore, c.metal.class
   end
   
   include SharedTests

data/test/test_memcache_storage.rb

@@ -11,7 +11,7 @@ class TestMemcacheStorage < Test::Unit::TestCase
   include SharedTests
   
   def get_server_status_ids
-    @cache.config.client.instance_variable_get(:@servers).map { |s| s.status.object_id }
+    @cache.metal.instance_variable_get(:@servers).map { |s| s.status.object_id }
   end
   
   def test_treats_as_thread_safe