memcache-client 1.2.0 → 1.2.1

data/History.txt

@@ -1,3 +1,13 @@
+= 1.2.1
+
+* Fix bug #7048, MemCache#servers= referenced changed local variable.
+  Submitted by Justin Dossey.
+* Fix bug #7049, MemCache#initialize resets @buckets.  Submitted by
+  Justin Dossey.
+* Fix bug #6232, Make Cache::Get work with a block only when nil is
+  returned.  Submitted by Jon Evans.
+* Moved to the seattlerb project.
+
 = 1.2.0
 
 NOTE: This version will store keys in different places than previous

data/Rakefile

@@ -2,16 +2,20 @@
 
 require 'hoe'
 
+require './lib/memcache'
+
 DEV_DOC_PATH = "Libraries/memcache-client"
 
-hoe = Hoe.new 'memcache-client', '1.2.0' do |p|
+hoe = Hoe.new 'memcache-client', MemCache::VERSION do |p|
   p.summary = 'A Ruby memcached client'
   p.description = 'memcache-client is a pure-ruby client to Danga\'s memcached.'
   p.author = ['Eric Hodel', 'Robert Cottrell']
   p.email = 'eric@robotcoop.com'
   p.url = "http://dev.robotcoop.com/#{DEV_DOC_PATH}"
+  p.changes = File.read('History.txt').scan(/\A(=.*?)^=/m).first.first
 
-  p.rubyforge_name = 'rctools'
+  p.rubyforge_name = 'seattlerb'
+  p.extra_deps << ['ZenTest', '>= 3.4.2']
 end
 
 SPEC = hoe.spec

data/lib/memcache.rb

@@ -38,6 +38,11 @@ end
 
 class MemCache
 
+  ##
+  # The version of MemCache you are using.
+
+  VERSION = '1.2.1'
+
   ##
   # Default options for the cache object.
 
@@ -109,8 +114,8 @@ class MemCache
     @readonly    = opts[:readonly]
     @multithread = opts[:multithread]
     @mutex       = Mutex.new if @multithread
-    self.servers = servers
     @buckets     = []
+    self.servers = servers
   end
 
   ##
@@ -155,8 +160,7 @@ class MemCache
         end
         server
       else
-        raise TypeError, "Cannot convert %s to MemCache::Server" %
-        svr.class.name
+        raise TypeError, "cannot convert #{server.class} into MemCache::Server"
       end
     end
 

data/lib/memcache_util.rb

@@ -4,68 +4,61 @@
 
 module Cache
 
-    ##
-    # Returns the object at +key+ from the cache if successful, or nil if
-    # either the object is not in the cache or if there was an error
-    # attermpting to access the cache.
-    #
-    # If there is a cache miss and a block is given the result of the block
-    # will be stored in the cache with optional +expiry+.
+  ##
+  # Returns the object at +key+ from the cache if successful, or nil if either
+  # the object is not in the cache or if there was an error attermpting to
+  # access the cache.
+  #
+  # If there is a cache miss and a block is given the result of the block will
+  # be stored in the cache with optional +expiry+.
 
-    def self.get(key, expiry = 0)
-        start_time = Time.now
-        result = CACHE.get key
-        end_time = Time.now
-        ActiveRecord::Base.logger.debug('MemCache Get (%0.6f)  %s' %
-                                          [end_time - start_time, key])
-        return result
-    rescue MemCache::MemCacheError => err
-        ActiveRecord::Base.logger.debug "MemCache Error: #{err.message}"
-        if block_given? then
-            value = yield
-            put key, value, expiry
-            return value
-        else
-            return nil
-        end
+  def self.get(key, expiry = 0)
+    start_time = Time.now
+    result = CACHE.get key
+    elapsed = Time.now - start_time
+    ActiveRecord::Base.logger.debug('MemCache Get (%0.6f)  %s' % [elapsed, key])
+    if result.nil? and block_given? then
+      value = yield
+      put key, value, expiry
     end
+    return result
+  rescue MemCache::MemCacheError => err
+    ActiveRecord::Base.logger.debug "MemCache Error: #{err.message}"
+  end
 
-    ##
-    # Places +value+ in the cache at +key+, with an optional +expiry+ time in
-    # seconds.
+  ##
+  # Places +value+ in the cache at +key+, with an optional +expiry+ time in
+  # seconds.
 
-    def self.put(key, value, expiry = 0)
-        start_time = Time.now
-        CACHE.set key, value, expiry
-        end_time = Time.now
-        ActiveRecord::Base.logger.debug('MemCache Set (%0.6f)  %s' %
-                                          [end_time - start_time, key])
-    rescue MemCache::MemCacheError => err
-        ActiveRecord::Base.logger.debug "MemCache Error: #{err.message}"
-    end
+  def self.put(key, value, expiry = 0)
+    start_time = Time.now
+    CACHE.set key, value, expiry
+    elapsed = Time.now - start_time
+    ActiveRecord::Base.logger.debug('MemCache Set (%0.6f)  %s' % [elapsed, key])
+  rescue MemCache::MemCacheError => err
+    ActiveRecord::Base.logger.debug "MemCache Error: #{err.message}"
+  end
 
-    ##
-    # Deletes +key+ from the cache in +delay+ seconds. (?)
+  ##
+  # Deletes +key+ from the cache in +delay+ seconds.
 
-    def self.delete(key, delay = nil)
-        start_time = Time.now
-        CACHE.delete key, delay
-        end_time = Time.now
-        ActiveRecord::Base.logger.debug('MemCache Delete (%0.6f)  %s' %
-                                          [end_time - start_time, key])
-    rescue MemCache::MemCacheError => err
-        ActiveRecord::Base.logger.debug "MemCache Error: #{err.message}"
-    end
+  def self.delete(key, delay = nil)
+    start_time = Time.now
+    CACHE.delete key, delay
+    elapsed = Time.now - start_time
+    ActiveRecord::Base.logger.debug('MemCache Delete (%0.6f)  %s' %
+                                    [elapsed, key])
+  rescue MemCache::MemCacheError => err
+    ActiveRecord::Base.logger.debug "MemCache Error: #{err.message}"
+  end
 
-    ##
-    # Resets all connections to mecache servers.
+  ##
+  # Resets all connections to MemCache servers.
 
-    def self.reset
-        CACHE.reset
-        ActiveRecord::Base.logger.debug 'MemCache Connections Reset'
-    end
-    
-end
+  def self.reset
+    CACHE.reset
+    ActiveRecord::Base.logger.debug 'MemCache Connections Reset'
+  end
 
-# vim: ts=4 sts=4 sw=4
+end
 

data/test/test_mem_cache.rb

@@ -1,5 +1,7 @@
 require 'stringio'
 require 'test/unit'
+require 'rubygems'
+require 'test/zentest_assertions'
 
 $TESTING = true
 
@@ -122,6 +124,16 @@ class TestMemCache < Test::Unit::TestCase
     assert_equal 'first argument must be Array, Hash or String', e.message
   end
 
+  def test_initialize_multiple_servers
+    cache = MemCache.new %w[localhost:11211 localhost:11212],
+                         :namespace => 'my_namespace', :readonly => true
+
+    assert_equal 'my_namespace', cache.namespace
+    assert_equal true, cache.readonly?
+    assert_equal false, cache.servers.empty?
+    deny_empty cache.instance_variable_get(:@buckets)
+  end
+
   def test_initialize_too_many_args
     assert_raises ArgumentError do
       MemCache.new 1, 2, 3
@@ -233,6 +245,14 @@ class TestMemCache < Test::Unit::TestCase
     assert_equal 'key', @cache.make_cache_key('key')
   end
 
+  def test_servers_equals_type_error
+    e = assert_raise TypeError do
+      @cache.servers = [Object.new]
+    end
+
+    assert_equal 'cannot convert Object into MemCache::Server', e.message
+  end
+
   def test_basic_threaded_operations_should_work
     cache = MemCache.new :multithread => true,
                          :namespace => 'my_namespace',

metadata

@@ -1,17 +1,16 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.99
+rubygems_version: 0.9.0.7
 specification_version: 1
 name: memcache-client
 version: !ruby/object:Gem::Version 
-  version: 1.2.0
-date: 2006-10-17 00:00:00 -07:00
+  version: 1.2.1
+date: 2006-12-06 00:00:00 -08:00
 summary: A Ruby memcached client
 require_paths: 
 - lib
-- test
 email: eric@robotcoop.com
 homepage: http://dev.robotcoop.com/Libraries/memcache-client
-rubyforge_project: rctools
+rubyforge_project: seattlerb
 description: memcache-client is a pure-ruby client to Danga's memcached.
 autorequire: 
 default_executable: 
@@ -39,8 +38,8 @@ files:
 - lib/memcache.rb
 - lib/memcache_util.rb
 - test/test_mem_cache.rb
-test_files: []
-
+test_files: 
+- test/test_mem_cache.rb
 rdoc_options: []
 
 extra_rdoc_files: []
@@ -59,5 +58,14 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.1.0
+        version: 1.1.5
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: ZenTest
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 3.4.2
     version: