cache 0.0.3 → 0.1.1

data/BENCHMARKS

@@ -1,3 +1,101 @@
+# sabshere 2/22/11 v0.0.3
+
+vidalia:~/github/cache (master) $ ruby test/profile/benchmark.rb 
+Darwin vidalia 9.8.0 Darwin Kernel Version 9.8.0: Wed Jul 15 16:55:01 PDT 2009; root:xnu-1228.15.4~1/RELEASE_I386 i386
+ruby 1.8.7 (2010-05-25 patchlevel 266) [i686-darwin9.8.0]
+RUBY_VERSION=ruby-1.8.7-head
+Ruby 1.8.7p266
+Loaded memcached 1.0.6
+Loaded remix-stash 1.1.3
+Loaded memcache-client 1.8.5
+Loaded cache 0.0.3
+Loaded kgio 2.3.2
+Loaded dalli 1.0.2
+Loops is 20000
+Stack depth is 0
+Small value size is: 13 bytes
+Large value size is: 4158 bytes
+No matching processes belonging to you were found
+                                          user     system      total        real
+set: cache:dalli:bin                  6.020000   1.890000   7.910000 ( 10.568499)
+set: cache:libm:bin                   1.460000   1.280000   2.740000 (  6.112829)
+set: dalli:bin                        5.640000   1.870000   7.510000 ( 10.215219)
+set: libm:ascii                       0.820000   1.320000   2.140000 (  5.446435)
+set: libm:ascii:pipeline              0.360000   0.010000   0.370000 (  0.378485)
+set: libm:ascii:udp                   0.700000   0.720000   1.420000 (  3.659001)
+set: libm:bin                         0.720000   1.340000   2.060000 (  5.364179)
+set: libm:bin:buffer                  0.300000   0.120000   0.420000 (  1.105467)
+set: mclient:ascii                   10.860000   3.820000  14.680000 ( 15.175516)
+set: stash:bin                        3.700000   1.350000   5.050000 (  8.229477)
+
+get: cache:dalli:bin                  6.130000   2.070000   8.200000 ( 10.683650)
+get: cache:libm:bin                   1.440000   1.230000   2.670000 (  5.908044)
+get: dalli:bin                        5.800000   2.080000   7.880000 ( 10.324650)
+get: libm:ascii                       0.970000   1.320000   2.290000 (  5.582769)
+get: libm:ascii:pipeline              1.050000   1.580000   2.630000 (  5.956804)
+get: libm:ascii:udp                   0.820000   0.720000   1.540000 (  3.605324)
+get: libm:bin                         0.820000   1.340000   2.160000 (  5.329828)
+get: libm:bin:buffer                  0.940000   1.630000   2.570000 (  5.748327)
+get: mclient:ascii                   12.900000   3.860000  16.760000 ( 17.249089)
+get: stash:bin                        3.360000   1.320000   4.680000 (  7.949412)
+
+delete: cache:dalli:bin               5.610000   2.100000   7.710000 ( 10.029324)
+delete: cache:libm:bin                2.030000   1.370000   3.400000 (  6.651471)
+delete: dalli:bin                     5.230000   2.110000   7.340000 (  9.676535)
+delete: libm:ascii                    1.790000   1.380000   3.170000 (  6.550488)
+delete: libm:ascii:pipeline           0.570000   0.650000   1.220000 (  1.346079)
+delete: libm:ascii:udp                1.650000   0.870000   2.520000 (  4.527372)
+delete: libm:bin                      1.730000   1.390000   3.120000 (  6.469119)
+delete: libm:bin:buffer               0.480000   0.550000   1.030000 (  1.773955)
+delete: mclient:ascii                10.890000   3.930000  14.820000 ( 15.286474)
+delete:stash:bin => #<NoMethodError: undefined method `delete' for #<Remix::Stash:0x11cc360>>
+
+get-missing: cache:dalli:bin          5.970000   2.260000   8.230000 ( 10.874274)
+get-missing: cache:libm:bin           2.470000   1.580000   4.050000 (  7.471236)
+get-missing: dalli:bin                5.550000   2.230000   7.780000 ( 10.420783)
+get-missing: libm:ascii               2.080000   1.560000   3.640000 (  7.186221)
+get-missing: libm:ascii:pipeline      2.160000   1.890000   4.050000 (  7.482394)
+get-missing: libm:ascii:udp           1.850000   0.930000   2.780000 (  4.956340)
+get-missing: libm:bin                 2.030000   1.470000   3.500000 (  7.022853)
+get-missing: libm:bin:buffer          2.090000   1.890000   3.980000 (  7.314636)
+get-missing: mclient:ascii           11.500000   4.010000  15.510000 ( 16.029498)
+get-missing: stash:bin                3.280000   1.390000   4.670000 (  7.834190)
+
+set-large: cache:dalli:bin            8.070000   2.080000  10.150000 ( 13.126027)
+set-large: cache:libm:bin             2.530000   1.410000   3.940000 (  7.636479)
+set-large: dalli:bin                  7.650000   2.070000   9.720000 ( 12.691443)
+set-large: libm:ascii                 0.930000   1.420000   2.350000 (  6.066637)
+set-large: libm:ascii:pipeline        0.640000   0.450000   1.090000 (  1.279625)
+set-large: libm:ascii:udp             0.820000   0.860000   1.680000 (  4.318411)
+set-large: libm:bin                   0.810000   1.450000   2.260000 (  5.870205)
+set-large: libm:bin:buffer            0.590000   0.660000   1.250000 (  2.492524)
+set-large: mclient:ascii             12.290000   4.120000  16.410000 ( 17.042205)
+set-large: stash:bin                  5.810000   1.430000   7.240000 ( 10.615813)
+
+get-large: cache:dalli:bin            7.680000   2.460000  10.140000 ( 13.286558)
+get-large: cache:libm:bin             6.530000   1.500000   8.030000 ( 11.980532)
+get-large: dalli:bin                  7.240000   2.460000   9.700000 ( 12.743058)
+get-large: libm:ascii                 1.610000   1.540000   3.150000 (  7.086940)
+get-large: libm:ascii:pipeline        1.720000   1.890000   3.610000 (  7.410838)
+get-large: libm:ascii:udp             1.420000   0.960000   2.380000 (  4.688834)
+get-large: libm:bin                   1.440000   1.590000   3.030000 (  6.935013)
+get-large: libm:bin:buffer            1.600000   1.920000   3.520000 (  7.278831)
+get-large: mclient:ascii             15.700000   4.800000  20.500000 ( 21.276235)
+get-large: stash:bin                  3.580000   1.420000   5.000000 (  8.259296)
+
+hash:hsieh                            0.310000   0.000000   0.310000 (  0.314801)
+hash:none                             0.320000   0.000000   0.320000 (  0.317238)
+hash:default                          0.610000   0.000000   0.610000 (  0.627191)
+hash:fnv1_64                          1.270000   0.010000   1.280000 (  1.274384)
+hash:md5                              1.070000   0.000000   1.070000 (  1.080698)
+hash:murmur                           0.560000   0.000000   0.560000 (  0.570058)
+hash:fnv1a_64                         0.690000   0.000000   0.690000 (  0.701543)
+hash:fnv1a_32                         0.680000   0.010000   0.690000 (  0.684682)
+hash:jenkins                          0.660000   0.000000   0.660000 (  0.668542)
+hash:crc                              0.660000   0.000000   0.660000 (  0.665331)
+hash:fnv1_32                          0.630000   0.000000   0.630000 (  0.636520)
+vidalia:~/github/cache (master) $ 
+
 # sabshere 2/22/11 v0.0.2
 
 Darwin vidalia 9.8.0 Darwin Kernel Version 9.8.0: Wed Jul 15 16:55:01 PDT 2009; root:xnu-1228.15.4~1/RELEASE_I386 i386

data/README.rdoc

@@ -6,22 +6,30 @@ Takes care of exceptions like Memcached::NotFound and also forking/threading.
 
 == Example
 
+It uses a (useless?) memory store by default:
+
+    cache = Cache.new
+    cache.set 'hello'
+    cache.get 'hello', 'world'
+
+You can specify a more useful cache client:
+
     require 'memcached' # a really fast memcached client gem
-    require 'client'    # this gem, which provides a standard interface
+    require 'cache'    # this gem, which provides a standard interface
     raw_client = Memcached.new '127.0.0.1:11211'
     cache = Cache.new raw_client
 
 or
 
     require 'redis'     # the redis key-value store
-    require 'client'    # this gem, which provides a standard interface
+    require 'cache'    # this gem, which provides a standard interface
     raw_client = Redis.new
     cache = Cache.new raw_client
 
 or
 
     require 'dalli'     # the dalli memcached client used by heroku
-    require 'client'    # this gem, which provides a standard interface
+    require 'cache'    # this gem, which provides a standard interface
     raw_client = Dalli::Client.new
     cache = Cache.new raw_client
 

data/cache.gemspec

@@ -19,11 +19,11 @@ Gem::Specification.new do |s|
   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 'test-unit'
   s.add_development_dependency 'redis'
   s.add_development_dependency 'dalli'
-  s.add_development_dependency 'activesupport', '>=2.3.4' # for DalliStore
-  s.add_development_dependency 'i18n' # activesupport
   s.add_development_dependency 'memcached'
   s.add_development_dependency 'memcache-client'
 end

data/lib/cache/config.rb

@@ -22,7 +22,13 @@ class Cache
     end
 
     def client #:nodoc:
-      @client || raise("You didn't select a cache client")
+      if @client.nil?
+        require 'active_support/cache'
+        require 'active_support/cache/memory_store'
+        @client = ::ActiveSupport::Cache::MemoryStore.new
+      else
+        @client
+      end
     end
     
     # TTL for method caches. Defaults to 60 seconds.

data/lib/cache/storage.rb

@@ -74,6 +74,7 @@ class Cache
     
     def reset_if_forked_or_threaded
       if fork_detected?
+        $stderr.puts "fork detected" if ENV['CACHE_DEBUG'] == 'true'
         if dalli?
           parent.config.client.close
         elsif dalli_store?
@@ -88,6 +89,7 @@ class Cache
           parent.config.client.reset
         end
       elsif new_thread_detected?
+        $stderr.puts "new thread detected" if ENV['CACHE_DEBUG'] == 'true'
         if memcached? or memcached_rails?
           cloned_client = parent.config.client.clone
           parent.config.client = cloned_client
@@ -129,6 +131,13 @@ class Cache
       answer
     end
     
+    def memory_store?
+      return @memory_store_query[0] if @memory_store_query.is_a?(::Array)
+      answer = (defined?(::ActiveSupport::Cache::MemoryStore) and bare_client.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_client.is_a?(::MemCache))

data/lib/cache/version.rb

@@ -1,3 +1,3 @@
 class Cache
-  VERSION = "0.0.3"
+  VERSION = "0.1.1"
 end

data/test/helper.rb

@@ -14,3 +14,5 @@ class Test::Unit::TestCase
     @cache.flush
   end
 end
+
+ENV['CACHE_DEBUG'] = 'true'

data/test/profile/benchmark.rb

@@ -3,7 +3,7 @@ HERE = File.dirname(__FILE__)
 $LOAD_PATH << "#{HERE}/../../lib/"
 UNIX_SOCKET_NAME = File.join(ENV['TMPDIR']||'/tmp','memcached') 
 
-require 'memcached'
+require 'cache'
 require 'benchmark'
 require 'rubygems'
 require 'ruby-debug' if ENV['DEBUG']
@@ -26,6 +26,8 @@ puts "Ruby #{RUBY_VERSION}p#{RUBY_PATCHLEVEL}"
   puts "Loaded #{gem_name} #{Gem.loaded_specs[gem_name].version.to_s rescue nil}"
 end
 
+MEMCACHED_HERE = File.expand_path(File.join(File.dirname(Gem.required_location('memcached', 'memcached.rb')), '..', 'test', 'profile'))
+
 class Remix::Stash
   # Remix::Stash API doesn't let you set servers
   @@clusters = {:default => Remix::Stash::Cluster.new(['127.0.0.1:43042', '127.0.0.1:43043'])}
@@ -100,7 +102,7 @@ class Bench
   private
   
   def reset_servers
-    system("ruby #{HERE}/../setup.rb")
+    system("ruby #{MEMCACHED_HERE}/../setup.rb")
     sleep(1)
   end
   

data/test/test_default_storage.rb

@@ -0,0 +1,16 @@
+require 'helper'
+
+require 'active_support/cache'
+require 'active_support/cache/memory_store'
+
+class TestDefaultStorage < Test::Unit::TestCase
+  def raw_client
+    nil
+  end
+  
+  def test_query
+    assert @cache.storage.send(:memory_store?)
+  end
+    
+  include SharedTests
+end

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 0
-  - 3
-  version: 0.0.3
+  - 1
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Seamus Abshere
@@ -15,25 +15,27 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-22 00:00:00 -06:00
+date: 2011-02-24 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: test-unit
+  name: activesupport
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 21
         segments: 
-        - 0
-        version: "0"
-  type: :development
+        - 2
+        - 3
+        - 11
+        version: 2.3.11
+  type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: redis
+  name: i18n
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -44,10 +46,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: dalli
+  name: test-unit
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -61,23 +63,21 @@ dependencies:
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: activesupport
+  name: redis
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 3
         segments: 
-        - 2
-        - 3
-        - 4
-        version: 2.3.4
+        - 0
+        version: "0"
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: i18n
+  name: dalli
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -143,6 +143,7 @@ files:
 - test/shared_tests.rb
 - test/test_dalli_storage.rb
 - test/test_dalli_store_storage.rb
+- test/test_default_storage.rb
 - test/test_memcache_storage.rb
 - test/test_memcached_rails_storage.rb
 - test/test_memcached_storage.rb
@@ -187,6 +188,7 @@ test_files:
 - test/shared_tests.rb
 - test/test_dalli_storage.rb
 - test/test_dalli_store_storage.rb
+- test/test_default_storage.rb
 - test/test_memcache_storage.rb
 - test/test_memcached_rails_storage.rb
 - test/test_memcached_storage.rb