cache 0.3.2 → 0.3.3

data/CHANGELOG

@@ -1,3 +1,13 @@
+0.3.3 / 2012-04-17
+
+* Enhancements
+
+  * Test on MRI 1.8, MRI 1.9, and JRuby 1.6.7+
+
+* Bug fixes
+
+  * Fix Redis support. Tests were silently failing, made them loud and then fixed 'em.
+
 0.3.2 / 2012-04-11
 
 * Enhancements

data/Gemfile

@@ -7,7 +7,9 @@ gem 'test-unit'
 gem 'redis'
 gem 'redis-namespace'
 gem 'dalli'
-gem 'memcached'
+unless RUBY_PLATFORM == 'java'
+  gem 'memcached'
+end
 gem 'memcache-client'
 gem 'rake'
 gem 'rack' # for ActiveSupport::Cache::FileStore of all things

data/lib/cache.rb

@@ -29,7 +29,7 @@ class Cache
 
   def initialize(metal = nil) #:nodoc:
     @pid = ::Process.pid
-    @config = Config.new self
+    @config = Config.new
     @metal = if metal.is_a?(Cache)
       metal.metal
     elsif metal

data/lib/cache/config.rb

@@ -4,13 +4,6 @@ class Cache
   # Example:
   #     cache.config.default_ttl = 120 # seconds
   class Config
-    
-    attr_reader :parent
-    
-    def initialize(parent) #:nodoc:
-      @parent = parent
-    end
-    
     # TTL for method caches. Defaults to 60 seconds.
     #
     # Example:

data/lib/cache/redis.rb

@@ -1,4 +1,8 @@
 module Cache::Redis
+  def after_fork
+    @metal.quit
+  end
+  
   def _get(k)
     if cached_v = @metal.get(k) and cached_v.is_a?(::String)
       ::Marshal.load cached_v
@@ -7,7 +11,9 @@ module Cache::Redis
 
   def _get_multi(ks)
     ks.inject({}) do |memo, k|
-      memo[k] = @metal.get(k) if @metal.exist?(k)
+      if v = _get(k)
+        memo[k] = v
+      end
       memo
     end
   end
@@ -25,7 +31,7 @@ module Cache::Redis
   end
 
   def _flush
-    @metal.flush
+    @metal.flushdb
   end
 
   def _exist?(k)
@@ -33,6 +39,6 @@ module Cache::Redis
   end
 
   def _stats
-    @metal.stats
+    @metal.info
   end
 end

data/lib/cache/redis_namespace.rb

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

data/lib/cache/version.rb

@@ -1,3 +1,3 @@
 class Cache
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

data/test/test_memcached_binary_storage.rb

@@ -1,11 +1,13 @@
 require 'helper'
 
-require 'memcached'
+unless RUBY_PLATFORM == 'java'
+  require 'memcached'
 
-class TestMemcachedBinaryStorage < Test::Unit::TestCase
-  def raw_client
-    Memcached.new 'localhost:11211', :support_cas => true, :binary => true
+  class TestMemcachedBinaryStorage < Test::Unit::TestCase
+    def raw_client
+      Memcached.new 'localhost:11211', :support_cas => true, :binary => true
+    end
+      
+    include SharedTests
   end
-    
-  include SharedTests
 end

data/test/test_memcached_rails_storage.rb

@@ -1,55 +1,57 @@
 require 'helper'
 
-require 'memcached'
+unless RUBY_PLATFORM == 'java'
+  require 'memcached'
 
-class TestMemcachedRailsStorage < Test::Unit::TestCase
-  def raw_client
-    Memcached::Rails.new 'localhost:11211', :support_cas => true
-  end
-    
-  include SharedTests
-  
-  def get_bare_id
-    @cache.thread_metal.object_id
-  end
-  
-  def test_treats_as_not_thread_safe
-    # make sure bare client is initialized
-    @cache.get 'hi'
-    
-    # get the main thread's bare client
-    main_thread_bare_id = get_bare_id
-    
-    # sanity check that it's not changing every time
-    @cache.get 'hi'
-    assert_equal main_thread_bare_id, get_bare_id
-    
-    # create a new thread and get its bare client
-    new_thread_bare_id = Thread.new { @cache.get 'hi'; get_bare_id }.value
-    
-    # make sure the bare client was reinitialized
-    assert(main_thread_bare_id != new_thread_bare_id)
-  end
-  
-  def test_treats_as_not_fork_safe
-    # make sure bare client is initialized
-    @cache.get 'hi'
-    
-    # get the main process's bare client
-    parent_process_bare_id = get_bare_id
+  class TestMemcachedRailsStorage < Test::Unit::TestCase
+    def raw_client
+      Memcached::Rails.new 'localhost:11211', :support_cas => true
+    end
+      
+    include SharedTests
     
-    # sanity check that it's not changing every time
-    @cache.get 'hi'
-    assert_equal parent_process_bare_id, get_bare_id
+    def get_bare_id
+      @cache.thread_metal.object_id
+    end
     
-    # fork a new process
-    pid = Kernel.fork do
+    def test_treats_as_not_thread_safe
+      # make sure bare client is initialized
+      @cache.get 'hi'
+      
+      # get the main thread's bare client
+      main_thread_bare_id = get_bare_id
+      
+      # sanity check that it's not changing every time
       @cache.get 'hi'
-      raise "Didn't split!" if parent_process_bare_id == get_bare_id
+      assert_equal main_thread_bare_id, get_bare_id
+      
+      # create a new thread and get its bare client
+      new_thread_bare_id = Thread.new { @cache.get 'hi'; get_bare_id }.value
+      
+      # make sure the bare client was reinitialized
+      assert(main_thread_bare_id != new_thread_bare_id)
     end
-    Process.wait pid
     
-    # make sure it didn't raise
-    assert $?.success?
+    def test_treats_as_not_fork_safe
+      # make sure bare client is initialized
+      @cache.get 'hi'
+      
+      # get the main process's bare client
+      parent_process_bare_id = get_bare_id
+      
+      # sanity check that it's not changing every time
+      @cache.get 'hi'
+      assert_equal parent_process_bare_id, get_bare_id
+      
+      # fork a new process
+      pid = Kernel.fork do
+        @cache.get 'hi'
+        raise "Didn't split!" if parent_process_bare_id == get_bare_id
+      end
+      Process.wait pid
+      
+      # make sure it didn't raise
+      assert $?.success?
+    end
   end
 end

data/test/test_memcached_storage.rb

@@ -1,58 +1,60 @@
 require 'helper'
 
-require 'memcached'
+unless RUBY_PLATFORM == 'java'
+  require 'memcached'
 
-class TestMemcachedStorage < Test::Unit::TestCase
-  def raw_client
-    Memcached.new 'localhost:11211', :support_cas => true
-  end
-    
-  include SharedTests
-  
-  def get_bare_id
-    @cache.thread_metal.object_id
-  end
-  
-  def test_treats_as_not_thread_safe
-    # make sure bare client is initialized
-    @cache.get 'hi'
-    
-    # get the main thread's bare client
-    main_thread_bare_id = get_bare_id
-    
-    # sanity check that it's not changing every time
-    @cache.get 'hi'
-    assert_equal main_thread_bare_id, get_bare_id
+  class TestMemcachedStorage < Test::Unit::TestCase
+    def raw_client
+      Memcached.new 'localhost:11211', :support_cas => true
+    end
+      
+    include SharedTests
     
-    # create a new thread and get its bare client
-    new_thread_bare_id = Thread.new { @cache.get 'hi'; get_bare_id }.value
+    def get_bare_id
+      @cache.thread_metal.object_id
+    end
     
-    # make sure the bare client was reinitialized
-    assert(main_thread_bare_id != new_thread_bare_id)
+    def test_treats_as_not_thread_safe
+      # make sure bare client is initialized
+      @cache.get 'hi'
+      
+      # get the main thread's bare client
+      main_thread_bare_id = get_bare_id
+      
+      # sanity check that it's not changing every time
+      @cache.get 'hi'
+      assert_equal main_thread_bare_id, get_bare_id
+      
+      # create a new thread and get its bare client
+      new_thread_bare_id = Thread.new { @cache.get 'hi'; get_bare_id }.value
+      
+      # make sure the bare client was reinitialized
+      assert(main_thread_bare_id != new_thread_bare_id)
 
-    # make sure the main thread's client wasn't messed with
-    assert_equal main_thread_bare_id, get_bare_id
-  end
-  
-  def test_treats_as_not_fork_safe
-    # make sure bare client is initialized
-    @cache.get 'hi'
-    
-    # get the main process's bare client
-    parent_process_bare_id = get_bare_id
-    
-    # sanity check that it's not changing every time
-    @cache.get 'hi'
-    assert_equal parent_process_bare_id, get_bare_id
+      # make sure the main thread's client wasn't messed with
+      assert_equal main_thread_bare_id, get_bare_id
+    end
     
-    # fork a new process
-    pid = Kernel.fork do
+    def test_treats_as_not_fork_safe
+      # make sure bare client is initialized
+      @cache.get 'hi'
+      
+      # get the main process's bare client
+      parent_process_bare_id = get_bare_id
+      
+      # sanity check that it's not changing every time
       @cache.get 'hi'
-      raise "Didn't split!" if parent_process_bare_id == get_bare_id
+      assert_equal parent_process_bare_id, get_bare_id
+      
+      # fork a new process
+      pid = Kernel.fork do
+        @cache.get 'hi'
+        raise "Didn't split!" if parent_process_bare_id == get_bare_id
+      end
+      Process.wait pid
+      
+      # make sure it didn't raise
+      assert $?.success?
     end
-    Process.wait pid
-    
-    # make sure it didn't raise
-    assert $?.success?
   end
 end

data/test/test_rails_cache_storage.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-require 'memcached'
+require 'dalli'
 require 'active_support/cache'
 require 'active_support/cache/memory_store'
 
@@ -9,7 +9,7 @@ class TestRailsCacheStorage < Test::Unit::TestCase
     eval %{
       module ::Rails
         def self.cache
-          @cache || Memcached::Rails.new('localhost:11211', :support_cas => true)
+          @cache || ActiveSupport::Cache::DalliStore.new(['localhost:11211'])
         end
         def self.cache=(foo)
           @cache = foo
@@ -23,7 +23,7 @@ class TestRailsCacheStorage < Test::Unit::TestCase
   end
   
   def test_defaults_to_rails_cache
-    assert_equal Memcached::Rails, Cache.new.metal.class
+    assert_equal ActiveSupport::Cache::DalliStore, Cache.new.metal.class
   end
     
   def test_helpful_default
@@ -40,28 +40,28 @@ class TestRailsCacheStorage < Test::Unit::TestCase
 
   def test_explicitly_set
     c = Cache.new(Rails.cache)
-    assert_equal Memcached::Rails, c.metal.class
+    assert_equal ActiveSupport::Cache::DalliStore, c.metal.class
   end
 
-  # these behave strangely because they resolve the value of Rails.cache (e.g., Memcached::Rails) before returning
+  # these behave strangely because they resolve the value of Rails.cache (e.g., ActiveSupport::Cache::DalliStore) before returning
   def test_silly_self_reference
     Rails.cache = Cache.new(Rails.cache)
-    assert_equal Memcached::Rails, Rails.cache.metal.class
+    assert_equal ActiveSupport::Cache::DalliStore, Rails.cache.metal.class
   end
 
   def test_self_reference_twice
     Rails.cache = Cache.new(Cache.new)
-    assert_equal Memcached::Rails, Rails.cache.metal.class
+    assert_equal ActiveSupport::Cache::DalliStore, Rails.cache.metal.class
   end
   
   def test_self_reference_with_wrap
     Rails.cache = Cache.wrap(Cache.new)
-    assert_equal Memcached::Rails, Rails.cache.metal.class
+    assert_equal ActiveSupport::Cache::DalliStore, Rails.cache.metal.class
   end
   
   def test_self_reference_with_absurd_wrapping
     Rails.cache = Cache.new(Cache.wrap(Cache.new))
-    assert_equal Memcached::Rails, Rails.cache.metal.class
+    assert_equal ActiveSupport::Cache::DalliStore, Rails.cache.metal.class
   end
   #--
 end

data/test/test_redis_namespace_storage.rb

@@ -0,0 +1,61 @@
+require 'helper'
+
+require 'redis'
+require 'redis-namespace'
+
+class TestRedisNamespaceStorage < Test::Unit::TestCase
+  def raw_client
+    r = Redis.new
+    Redis::Namespace.new(:test_cache, :redis => r)
+  end
+  
+  include SharedTests
+  
+  # client DOT client
+  def get_redis_client_connection_socket_id
+    connection = @cache.metal.client.instance_variable_get :@connection
+    sock = connection.instance_variable_get(:@sock)
+    # $stderr.puts sock.inspect
+    sock.object_id
+  end
+  
+  def test_treats_as_thread_safe
+    # make sure ring is initialized
+    @cache.get 'hi'
+
+    # get the main thread's ring
+    main_thread_redis_client_connection_socket_id = get_redis_client_connection_socket_id
+
+    # sanity check that it's not changing every time
+    @cache.get 'hi'
+    assert_equal main_thread_redis_client_connection_socket_id, get_redis_client_connection_socket_id
+
+    # create a new thread and get its ring
+    new_thread_redis_client_connection_socket_id = Thread.new { @cache.get 'hi'; get_redis_client_connection_socket_id }.value
+
+    # make sure the ring was reinitialized
+    assert_equal main_thread_redis_client_connection_socket_id, new_thread_redis_client_connection_socket_id
+  end
+
+  def test_treats_as_not_fork_safe
+    # make sure ring is initialized
+    @cache.get 'hi'
+
+    # get the main thread's ring
+    parent_process_redis_client_connection_socket_id = get_redis_client_connection_socket_id
+
+    # sanity check that it's not changing every time
+    @cache.get 'hi'
+    assert_equal parent_process_redis_client_connection_socket_id, get_redis_client_connection_socket_id
+
+    # fork a new process
+    pid = Kernel.fork do
+      @cache.get 'hi'
+      raise "Didn't split!" if parent_process_redis_client_connection_socket_id == get_redis_client_connection_socket_id
+    end
+    Process.wait pid
+
+    # make sure it didn't raise
+    assert $?.success?
+  end
+end

data/test/test_redis_storage.rb

@@ -1,63 +1,60 @@
 require 'helper'
 
-if ENV['REDIS_URL']
-  require 'redis'
-  require 'uri'
-
-  class TestRedisStorage < Test::Unit::TestCase
-    def raw_client
-      uri = URI.parse(ENV["REDIS_URL"])
-      Redis.new(:host => uri.host, :port => uri.port, :password => uri.password)
-    end
-    
-    include SharedTests
-    
-    # client DOT client
-    def get_redis_client_connection_socket_id
-      connection = @cache.metal.client.instance_variable_get :@connection
-      sock = connection.instance_variable_get(:@sock)
-      # $stderr.puts sock.inspect
-      sock.object_id
-    end
-    
-    def test_treats_as_thread_safe
-      # make sure ring is initialized
-      @cache.get 'hi'
+require 'redis'
+require 'uri'
 
-      # get the main thread's ring
-      main_thread_redis_client_connection_socket_id = get_redis_client_connection_socket_id
+class TestRedisStorage < Test::Unit::TestCase
+  def raw_client
+    Redis.new#(:host => uri.host, :port => uri.port, :password => uri.password)
+  end
+  
+  include SharedTests
+  
+  # client DOT client
+  def get_redis_client_connection_socket_id
+    connection = @cache.metal.client.instance_variable_get :@connection
+    sock = connection.instance_variable_get(:@sock)
+    # $stderr.puts sock.inspect
+    sock.object_id
+  end
+  
+  def test_treats_as_thread_safe
+    # make sure ring is initialized
+    @cache.get 'hi'
 
-      # sanity check that it's not changing every time
-      @cache.get 'hi'
-      assert_equal main_thread_redis_client_connection_socket_id, get_redis_client_connection_socket_id
+    # get the main thread's ring
+    main_thread_redis_client_connection_socket_id = get_redis_client_connection_socket_id
 
-      # create a new thread and get its ring
-      new_thread_redis_client_connection_socket_id = Thread.new { @cache.get 'hi'; get_redis_client_connection_socket_id }.value
+    # sanity check that it's not changing every time
+    @cache.get 'hi'
+    assert_equal main_thread_redis_client_connection_socket_id, get_redis_client_connection_socket_id
 
-      # make sure the ring was reinitialized
-      assert_equal main_thread_redis_client_connection_socket_id, new_thread_redis_client_connection_socket_id
-    end
+    # create a new thread and get its ring
+    new_thread_redis_client_connection_socket_id = Thread.new { @cache.get 'hi'; get_redis_client_connection_socket_id }.value
 
-    def test_treats_as_not_fork_safe
-      # make sure ring is initialized
-      @cache.get 'hi'
+    # make sure the ring was reinitialized
+    assert_equal main_thread_redis_client_connection_socket_id, new_thread_redis_client_connection_socket_id
+  end
 
-      # get the main thread's ring
-      parent_process_redis_client_connection_socket_id = get_redis_client_connection_socket_id
+  def test_treats_as_not_fork_safe
+    # make sure ring is initialized
+    @cache.get 'hi'
 
-      # sanity check that it's not changing every time
-      @cache.get 'hi'
-      assert_equal parent_process_redis_client_connection_socket_id, get_redis_client_connection_socket_id
+    # get the main thread's ring
+    parent_process_redis_client_connection_socket_id = get_redis_client_connection_socket_id
 
-      # fork a new process
-      pid = Kernel.fork do
-        @cache.get 'hi'
-        raise "Didn't split!" if parent_process_redis_client_connection_socket_id == get_redis_client_connection_socket_id
-      end
-      Process.wait pid
+    # sanity check that it's not changing every time
+    @cache.get 'hi'
+    assert_equal parent_process_redis_client_connection_socket_id, get_redis_client_connection_socket_id
 
-      # make sure it didn't raise
-      assert $?.success?
+    # fork a new process
+    pid = Kernel.fork do
+      @cache.get 'hi'
+      raise "Didn't split!" if parent_process_redis_client_connection_socket_id == get_redis_client_connection_socket_id
     end
+    Process.wait pid
+
+    # make sure it didn't raise
+    assert $?.success?
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cache
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-11 00:00:00.000000000 Z
+date: 2012-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -91,6 +91,7 @@ files:
 - test/test_memcached_rails_storage.rb
 - test/test_memcached_storage.rb
 - test/test_rails_cache_storage.rb
+- test/test_redis_namespace_storage.rb
 - test/test_redis_storage.rb
 homepage: https://github.com/seamusabshere/cache
 licenses: []
@@ -130,5 +131,6 @@ test_files:
 - test/test_memcached_rails_storage.rb
 - test/test_memcached_storage.rb
 - test/test_rails_cache_storage.rb
+- test/test_redis_namespace_storage.rb
 - test/test_redis_storage.rb
 has_rdoc: