cache 0.2.3 → 0.2.4

data/README.md

@@ -2,7 +2,13 @@
 
 Wraps memcached, redis, memcache-client, dalli and handles their weirdnesses, including forking.
 
-A unified cache handling interface, inspired by libraries like [ActiveSupport::Cache::Store](http://api.rubyonrails.org/classes/ActiveSupport/Cache/Store.html), Perl's [Cache::Cache](http://cpan.uwinnipeg.ca/module/Cache::Cache), and [CHI](http://cpan.uwinnipeg.ca/module/CHI).
+Aims to let other libraries be cache-agnostic in return for a performance hit.
+
+## Real world usage
+
+Used by [lock_method](https://github.com/seamusabshere/lock_method) and  [cache_method](https://github.com/seamusabshere/cache_method) so that you can use them with memcached, redis, etc.
+
+In production use at [carbon.brighterplanet.com](http://carbon.brighterplanet.com) and [data.brighterplanet.com](http://data.brighterplanet.com).
 
 ## Quick example
 
@@ -34,10 +40,6 @@ I wanted a common interface to a bunch of great Ruby cache clients so I can deve
 * I don't know why Memcached::Rails isn't implemented as an ActiveRecord::Cache::Store (Dalli did it just fine!)
 * Why are you asking me about :raw or whatever? Just marshal it
 
-## Real world usage
-
-In production use at [carbon.brighterplanet.com](http://carbon.brighterplanet.com), the Brighter Planet emission estimate web service.
-
 ## Speed
 
 It's about 50% slower than raw Memcached (if that's what you're wrapping) and barely slower at all than Dalli (if that's what you're wrapping.)

data/cache.gemspec

@@ -6,11 +6,11 @@ Gem::Specification.new do |s|
   s.name        = "cache"
   s.version     = Cache::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Seamus Abshere"]
-  s.email       = ["seamus@abshere.net"]
+  s.authors     = ["Seamus Abshere","Christoph Grabo"]
+  s.email       = ["seamus@abshere.net","chris@dinarrr.com"]
   s.homepage    = "https://github.com/seamusabshere/cache"
   s.summary     = %q{A unified cache handling interface inspired by libraries like ActiveSupport::Cache::Store, Perl's Cache::Cache, CHI, etc.}
-  s.description = %q{Wraps memcached, redis, memcache-client, dalli and handles their weirdnesses, including forking}
+  s.description = %q{Wraps memcached, redis(-namespace), memcache-client, dalli and handles their weirdnesses, including forking}
 
   s.rubyforge_project = "cache"
 
@@ -18,13 +18,15 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-  
+
   s.add_dependency 'activesupport', '>=2.3.11' # for default memory store
   s.add_dependency 'i18n' # activesupport
   s.add_development_dependency 'yard'
   s.add_development_dependency 'test-unit'
   s.add_development_dependency 'redis'
+  s.add_development_dependency 'redis-namespace'
   s.add_development_dependency 'dalli'
   s.add_development_dependency 'memcached'
   s.add_development_dependency 'memcache-client'
 end
+

data/lib/cache/storage.rb

@@ -8,7 +8,7 @@ class Cache
       @pid = ::Process.pid
       @thread_object_id = ::Thread.current.object_id
     end
-    
+
     def get(k)
       reset_if_forked_or_threaded
       if memcached?
@@ -25,7 +25,7 @@ class Cache
         raise "Don't know how to GET with #{bare.inspect}"
       end
     end
-    
+
     def get_multi(ks)
       reset_if_forked_or_threaded
       if memcached?
@@ -41,7 +41,7 @@ class Cache
         end
       end
     end
-        
+
     def set(k, v, ttl)
       reset_if_forked_or_threaded
       if memcached? or dalli? or memcached_rails? or mem_cache?
@@ -62,7 +62,7 @@ class Cache
         raise "Don't know how to SET with #{bare.inspect}"
       end
     end
-    
+
     def delete(k)
       reset_if_forked_or_threaded
       if memcached?
@@ -75,12 +75,12 @@ class Cache
         raise "Don't know how to DELETE with #{bare.inspect}"
       end
     end
-    
+
     def flush
       reset_if_forked_or_threaded
       bare.send %w{ flush flushdb flush_all clear }.detect { |flush_cmd| bare.respond_to? flush_cmd }
     end
-    
+
     # TODO detect nils
     def exist?(k)
       reset_if_forked_or_threaded
@@ -96,7 +96,7 @@ class Cache
         !get(k).nil?
       end
     end
-    
+
     # TODO use native memcached increment if available
     # TODO don't reset the timer!
     def increment(k, amount)
@@ -105,17 +105,17 @@ class Cache
       set k, new_v, 0
       new_v
     end
-    
+
     def decrement(k, amount)
       # reset_if_forked_or_threaded - uses increment, which uses get
       increment k, -amount
     end
-    
+
     # TODO don't resort to trickery like this
     def reset
       @pid = nil
     end
-    
+
     def fetch(k, ttl, &blk)
       reset_if_forked_or_threaded
       if dalli? or mem_cache?
@@ -132,7 +132,7 @@ class Cache
         end
       end
     end
-    
+
     def cas(k, ttl, &blk)
       reset_if_forked_or_threaded
       if memcached?
@@ -146,7 +146,7 @@ class Cache
         new_v
       end
     end
-    
+
     def stats
       reset_if_forked_or_threaded
       if bare.respond_to?(:stats)
@@ -155,13 +155,13 @@ class Cache
         {}
       end
     end
-    
+
     private
-    
+
     def bare
       @bare ||= parent.config.client
     end
-    
+
     def reset_if_forked_or_threaded
       if fork_detected?
         # $stderr.puts "fork detected" if ENV['CACHE_DEBUG'] == 'true'
@@ -187,47 +187,47 @@ class Cache
         end
       end
     end
-    
+
     def fork_detected?
       if @pid != ::Process.pid
         @pid = ::Process.pid
       end
     end
-    
+
     def new_thread_detected?
       if @thread_object_id != ::Thread.current.object_id
         @thread_object_id = ::Thread.current.object_id
       end
     end
-        
+
     def dalli?
       return @dalli_query[0] if @dalli_query.is_a?(::Array)
       answer = (defined?(::Dalli) and bare.is_a?(::Dalli::Client))
       @dalli_query = [answer]
       answer
     end
-    
+
     def active_support_store?
       return @active_support_store_query[0] if @active_support_store_query.is_a?(::Array)
       answer = (defined?(::ActiveSupport::Cache) and bare.is_a?(::ActiveSupport::Cache::Store))
       @active_support_store_query = [answer]
       answer
     end
-    
+
     def dalli_store?
       return @dalli_store_query[0] if @dalli_store_query.is_a?(::Array)
       answer = (defined?(::ActiveSupport::Cache::DalliStore) and bare.is_a?(::ActiveSupport::Cache::DalliStore))
       @dalli_store_query = [answer]
       answer
     end
-    
+
     def memory_store?
       return @memory_store_query[0] if @memory_store_query.is_a?(::Array)
       answer = (defined?(::ActiveSupport::Cache::MemoryStore) and bare.is_a?(::ActiveSupport::Cache::MemoryStore))
       @memory_store_query = [answer]
       answer
     end
-    
+
     def mem_cache?
       return @mem_cache_query[0] if @mem_cache_query.is_a?(::Array)
       answer = (defined?(::MemCache) and bare.is_a?(::MemCache))
@@ -241,19 +241,20 @@ class Cache
       @memcached_query = [answer]
       answer
     end
-    
+
     def memcached_rails?
       return @memcached_rails_query[0] if @memcached_rails_query.is_a?(::Array)
       answer = (defined?(::Memcached) and bare.is_a?(::Memcached::Rails))
       @memcached_rails_query = [answer]
       answer
     end
-    
+
     def redis?
       return @redis_query[0] if @redis_query.is_a?(::Array)
-      answer = (defined?(::Redis) and bare.is_a?(::Redis))
+      answer = (defined?(::Redis) and bare.is_a?(::Redis)) || (defined?(::Redis::Namespace) and bare.is_a?(::Redis::Namespace))
       @redis_query = [answer]
       answer
     end
   end
 end
+

data/lib/cache/version.rb

@@ -1,3 +1,4 @@
 class Cache
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end
+

data/test/shared_tests.rb

@@ -121,17 +121,17 @@ module SharedTests
   
   def test_increment
     assert !@cache.exist?('high-fives')
-    @cache.increment 'high-fives'
+    assert_equal 1, @cache.increment('high-fives')
     assert_equal 1, @cache.get('high-fives')
-    @cache.increment 'high-fives'
+    assert_equal 2, @cache.increment('high-fives')
     assert_equal 2, @cache.get('high-fives')
   end
   
   def test_decrement
     assert !@cache.exist?('high-fives')
-    @cache.decrement 'high-fives'
+    assert_equal -1, @cache.decrement('high-fives')
     assert_equal -1, @cache.get('high-fives')
-    @cache.decrement 'high-fives'
+    assert_equal -2, @cache.decrement('high-fives')
     assert_equal -2, @cache.get('high-fives')
   end
   

metadata

@@ -1,21 +1,17 @@
 --- !ruby/object:Gem::Specification 
 name: cache
 version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 3
-  version: 0.2.3
+  prerelease: 
+  version: 0.2.4
 platform: ruby
 authors: 
 - Seamus Abshere
+- Christoph Grabo
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-03-09 00:00:00 -06:00
+date: 2011-05-08 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,11 +22,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 2
-        - 3
-        - 11
         version: 2.3.11
   type: :runtime
   version_requirements: *id001
@@ -42,9 +33,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id002
@@ -56,9 +44,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id003
@@ -70,9 +55,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id004
@@ -84,57 +66,57 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: dalli
+  name: redis-namespace
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: memcached
+  name: dalli
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: memcache-client
+  name: memcached
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id008
-description: Wraps memcached, redis, memcache-client, dalli and handles their weirdnesses, including forking
+- !ruby/object:Gem::Dependency 
+  name: memcache-client
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id009
+description: Wraps memcached, redis(-namespace), memcache-client, dalli and handles their weirdnesses, including forking
 email: 
 - seamus@abshere.net
+- chris@dinarrr.com
 executables: []
 
 extensions: []
@@ -180,23 +162,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: cache
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A unified cache handling interface inspired by libraries like ActiveSupport::Cache::Store, Perl's Cache::Cache, CHI, etc.