cache 0.2.5 → 0.2.6

data/cache.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'redis'
   s.add_development_dependency 'redis-namespace'
   s.add_development_dependency 'dalli'
+  # https://github.com/fauna/memcached/pull/50
   s.add_development_dependency 'memcached', '<=1.2.6'
   s.add_development_dependency 'memcache-client'
   s.add_development_dependency 'rake'

data/lib/cache.rb

@@ -19,11 +19,7 @@ class Cache
   #     raw_client = Memcached.new('127.0.0.1:11211')
   #     cache = Cache.wrap raw_client
   def self.wrap(client = nil)
-    if client.is_a?(::Cache)
-      client
-    else
-      new client
-    end
+    new client
   end
   
   def initialize(client = nil) #:nodoc:

data/lib/cache/config.rb

@@ -18,14 +18,18 @@ class Cache
     # Example:
     #     cache.config.client = Memcached.new '127.0.0.1:11211'
     def client=(client) #:nodoc:
-      @client = client
+      @client = client.is_a?(::Cache) ? client.config.client : client
     end
 
     def client #:nodoc:
       if @client.nil?
-        require 'active_support/cache'
-        require 'active_support/cache/memory_store'
-        @client = ::ActiveSupport::Cache::MemoryStore.new
+        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

data/lib/cache/version.rb

@@ -1,4 +1,4 @@
 class Cache
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end
 

data/test/shared_tests.rb

@@ -1,3 +1,5 @@
+require 'logger'
+
 module SharedTests
   def test_get
     assert_equal nil, @cache.get('hello')
@@ -152,4 +154,12 @@ module SharedTests
     @cache.set 'privyet', 'mir'
     assert_equal({ 'hello' => 'world', 'privyet' => 'mir'}, @cache.get_multi('hello', 'privyet', 'yoyoyo'))
   end
+
+  # https://github.com/fauna/memcached/pull/50
+  def test_get_set_behavior
+    @cache.flush
+    @cache.get 'get_set'
+    @cache.set 'get_set', 'go'
+    assert_equal 'go', @cache.get('get_set')
+  end
 end

data/test/test_default_storage.rb

@@ -1,8 +1,5 @@
 require 'helper'
 
-require 'active_support/cache'
-require 'active_support/cache/memory_store'
-
 class TestDefaultStorage < Test::Unit::TestCase
   def raw_client
     nil
@@ -11,6 +8,26 @@ class TestDefaultStorage < Test::Unit::TestCase
   def test_query
     assert @cache.storage.send(:memory_store?)
   end
-    
+  
+  def test_default
+    c = Cache.new
+    assert_equal ActiveSupport::Cache::MemoryStore, c.config.client.class
+  end
+  
+  def test_self_reference
+    c = Cache.new(Cache.new)
+    assert_equal ActiveSupport::Cache::MemoryStore, c.config.client.class
+  end
+  
+  def test_wrap_with_default
+    c = Cache.wrap(Cache.new)
+    assert_equal ActiveSupport::Cache::MemoryStore, c.config.client.class
+  end
+  
+  def test_absurd_wrap
+    c = Cache.new(Cache.wrap(Cache.new))
+    assert_equal ActiveSupport::Cache::MemoryStore, c.config.client.class
+  end
+  
   include SharedTests
 end

data/test/test_memcached_binary_storage.rb

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

data/test/test_rails_cache_storage.rb

@@ -0,0 +1,65 @@
+require 'helper'
+
+require 'active_support/cache'
+require 'active_support/cache/memory_store'
+
+class TestRailsCacheStorage < Test::Unit::TestCase
+  def setup
+    eval %{
+      module ::Rails
+        def self.cache
+          @cache || :deadbeef
+        end
+        def self.cache=(foo)
+          @cache = foo
+        end
+      end
+    }
+  end
+  
+  def teardown
+    Object.send(:remove_const, :Rails)  
+  end
+  
+  def test_defaults_to_rails_cache
+    assert_equal :deadbeef, Cache.new.config.client
+  end
+    
+  def test_helpful_default
+    Rails.cache = Cache.new
+    assert_equal ActiveSupport::Cache::MemoryStore, Rails.cache.config.client.class
+  end
+
+  def test_explicitly_set
+    c = Cache.new(Rails.cache)
+    assert_equal :deadbeef, c.config.client
+  end
+
+  def test_explicitly_set_2
+    c = Cache.new
+    c.config.client = Rails.cache
+    assert_equal :deadbeef, c.config.client
+  end
+
+  # these behave strangely because they resolve the value of Rails.cache (e.g., :deadbeef) before returning
+  def test_silly_self_reference
+    Rails.cache = Cache.new(Rails.cache)
+    assert_equal :deadbeef, Rails.cache.config.client
+  end
+
+  def test_self_reference_twice
+    Rails.cache = Cache.new(Cache.new)
+    assert_equal :deadbeef, Rails.cache.config.client
+  end
+  
+  def test_self_reference_with_wrap
+    Rails.cache = Cache.wrap(Cache.new)
+    assert_equal :deadbeef, Rails.cache.config.client
+  end
+  
+  def test_self_reference_with_absurd_wrapping
+    Rails.cache = Cache.new(Cache.wrap(Cache.new))
+    assert_equal :deadbeef, Rails.cache.config.client
+  end
+  #--
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cache
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-13 00:00:00.000000000Z
+date: 2011-07-27 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2154119360 !ruby/object:Gem::Requirement
+  requirement: &2152957540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 2.3.11
   type: :runtime
   prerelease: false
-  version_requirements: *2154119360
+  version_requirements: *2152957540
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2154118940 !ruby/object:Gem::Requirement
+  requirement: &2152957040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154118940
+  version_requirements: *2152957040
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2154118480 !ruby/object:Gem::Requirement
+  requirement: &2152956460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154118480
+  version_requirements: *2152956460
 - !ruby/object:Gem::Dependency
   name: test-unit
-  requirement: &2154118060 !ruby/object:Gem::Requirement
+  requirement: &2152955960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154118060
+  version_requirements: *2152955960
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &2154117640 !ruby/object:Gem::Requirement
+  requirement: &2152955420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154117640
+  version_requirements: *2152955420
 - !ruby/object:Gem::Dependency
   name: redis-namespace
-  requirement: &2154117220 !ruby/object:Gem::Requirement
+  requirement: &2152954880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154117220
+  version_requirements: *2152954880
 - !ruby/object:Gem::Dependency
   name: dalli
-  requirement: &2154116800 !ruby/object:Gem::Requirement
+  requirement: &2152954380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154116800
+  version_requirements: *2152954380
 - !ruby/object:Gem::Dependency
   name: memcached
-  requirement: &2154116300 !ruby/object:Gem::Requirement
+  requirement: &2152953800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - <=
@@ -99,10 +99,10 @@ dependencies:
         version: 1.2.6
   type: :development
   prerelease: false
-  version_requirements: *2154116300
+  version_requirements: *2152953800
 - !ruby/object:Gem::Dependency
   name: memcache-client
-  requirement: &2154115880 !ruby/object:Gem::Requirement
+  requirement: &2152953300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154115880
+  version_requirements: *2152953300
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2154115420 !ruby/object:Gem::Requirement
+  requirement: &2152952760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,7 +121,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154115420
+  version_requirements: *2152952760
 description: Wraps memcached, redis(-namespace), memcache-client, dalli and handles
   their weirdnesses, including forking
 email:
@@ -152,8 +152,10 @@ files:
 - test/test_dalli_store_storage.rb
 - test/test_default_storage.rb
 - test/test_memcache_storage.rb
+- test/test_memcached_binary_storage.rb
 - test/test_memcached_rails_storage.rb
 - test/test_memcached_storage.rb
+- test/test_rails_cache_storage.rb
 - test/test_redis_storage.rb
 homepage: https://github.com/seamusabshere/cache
 licenses: []
@@ -188,6 +190,8 @@ test_files:
 - test/test_dalli_store_storage.rb
 - test/test_default_storage.rb
 - test/test_memcache_storage.rb
+- test/test_memcached_binary_storage.rb
 - test/test_memcached_rails_storage.rb
 - test/test_memcached_storage.rb
+- test/test_rails_cache_storage.rb
 - test/test_redis_storage.rb