memcached 0.11 → 0.12

data/lib/memcached/rails.rb

@@ -9,13 +9,19 @@ class Memcached
     DEFAULTS = {}
          
     # See Memcached#new for details.
-    def initialize(servers, opts = {})
+    def initialize(*args)
+      opts = args.last.is_a?(Hash) ? args.pop : {}
+      servers = Array(
+        args.any? ? args.unshift : opts.delete(:servers)
+      ).flatten.compact
+
+      opts[:prefix_key] ||= opts[:namespace]
       super(servers, DEFAULTS.merge(opts))      
     end
     
     # Wraps Memcached#get so that it doesn't raise. This has the side-effect of preventing you from 
     # storing <tt>nil</tt> values.
-    def get(key, raw = false)
+    def get(key, raw=false)
       super(key, !raw)
     rescue NotFound
     end
@@ -26,13 +32,33 @@ class Memcached
     end
     
     # Wraps Memcached#set.
-    def set(key, value, ttl = 0, raw = false)
+    def set(key, value, ttl=nil, raw=false)
+      super(key, value, ttl, !raw)
+    end
+
+    # Wraps Memcached#add so that it doesn't raise. 
+    def add(key, value, ttl=nil, raw=false)
       super(key, value, ttl, !raw)
+      true
+    rescue NotStored
+      false    
     end
     
     # Wraps Memcached#delete so that it doesn't raise. 
     def delete(key)
-      super(key)
+      super
+    rescue NotFound
+    end
+    
+    # Wraps Memcached#incr so that it doesn't raise. 
+    def incr(*args)
+      super
+    rescue NotFound
+    end
+
+    # Wraps Memcached#decr so that it doesn't raise. 
+    def decr(*args)
+      super
     rescue NotFound
     end
     
@@ -40,16 +66,11 @@ class Memcached
     def namespace
       options[:prefix_key]
     end
+    
+    alias :flush_all :flush
 
-    # Alias for get.
-    def [](key)
-      get key
-    end        
-
-    # Alias for Memcached#set.
-    def []=(key, value)
-      set key, value
-    end
+    alias :"[]" :get
+    alias :"[]=" :set    
     
   end
 end

data/memcached.gemspec

@@ -1,108 +1,38 @@
+# -*- encoding: utf-8 -*-
 
-# Gem::Specification for Memcached-0.11
-# Originally generated by Echoe
+Gem::Specification.new do |s|
+  s.name = %q{memcached}
+  s.version = "0.12"
 
---- !ruby/object:Gem::Specification 
-name: memcached
-version: !ruby/object:Gem::Version 
-  version: "0.11"
-platform: ruby
-authors: 
-- Evan Weaver
-autorequire: 
-bindir: bin
-date: 2008-07-14 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: echoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-description: An interface to the libmemcached C client.
-email: ""
-executables: []
+  s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Evan Weaver"]
+  s.cert_chain = ["/Users/eweaver/p/configuration/gem_certificates/evan_weaver-original-public_cert.pem"]
+  s.date = %q{2008-12-02}
+  s.description = %q{An interface to the libmemcached C client.}
+  s.email = %q{}
+  s.extensions = ["ext/extconf.rb"]
+  s.extra_rdoc_files = ["BENCHMARKS", "CHANGELOG", "COMPATIBILITY", "lib/memcached/behaviors.rb", "lib/memcached/exceptions.rb", "lib/memcached/memcached.rb", "lib/memcached/rails.rb", "lib/memcached.rb", "LICENSE", "README", "TODO"]
+  s.files = ["BENCHMARKS", "CHANGELOG", "COMPATIBILITY", "ext/extconf.rb", "ext/rlibmemcached.i", "ext/rlibmemcached_wrap.c", "lib/memcached/behaviors.rb", "lib/memcached/exceptions.rb", "lib/memcached/integer.rb", "lib/memcached/memcached.rb", "lib/memcached/rails.rb", "lib/memcached.rb", "LICENSE", "Manifest", "Rakefile", "README", "test/profile/benchmark.rb", "test/profile/profile.rb", "test/profile/valgrind.rb", "test/setup.rb", "test/teardown.rb", "test/test_helper.rb", "test/unit/binding_test.rb", "test/unit/memcached_test.rb", "test/unit/rails_test.rb", "TODO", "memcached.gemspec"]
+  s.has_rdoc = true
+  s.homepage = %q{http://blog.evanweaver.com/files/doc/fauna/memcached/}
+  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Memcached", "--main", "README"]
+  s.require_paths = ["lib", "ext"]
+  s.rubyforge_project = %q{fauna}
+  s.rubygems_version = %q{1.3.1}
+  s.signing_key = %q{/Users/eweaver/p/configuration/gem_certificates/evan_weaver-original-private_key.pem}
+  s.summary = %q{An interface to the libmemcached C client.}
+  s.test_files = ["test/test_helper.rb", "test/unit/binding_test.rb", "test/unit/memcached_test.rb", "test/unit/rails_test.rb"]
 
-extensions: 
-- ext/extconf.rb
-extra_rdoc_files: 
-- BENCHMARKS
-- CHANGELOG
-- COMPATIBILITY
-- lib/memcached/behaviors.rb
-- lib/memcached/exceptions.rb
-- lib/memcached/memcached.rb
-- lib/memcached/rails.rb
-- lib/memcached.rb
-- LICENSE
-- README
-- TODO
-files: 
-- BENCHMARKS
-- CHANGELOG
-- COMPATIBILITY
-- ext/extconf.rb
-- ext/rlibmemcached.i
-- ext/rlibmemcached_wrap.c
-- lib/memcached/behaviors.rb
-- lib/memcached/exceptions.rb
-- lib/memcached/integer.rb
-- lib/memcached/memcached.rb
-- lib/memcached/rails.rb
-- lib/memcached.rb
-- LICENSE
-- Manifest
-- Rakefile
-- README
-- test/profile/benchmark.rb
-- test/profile/profile.rb
-- test/profile/valgrind.rb
-- test/setup.rb
-- test/teardown.rb
-- test/test_helper.rb
-- test/unit/binding_test.rb
-- test/unit/memcached_test.rb
-- test/unit/rails_test.rb
-- TODO
-- memcached.gemspec
-has_rdoc: true
-homepage: http://blog.evanweaver.com/files/doc/fauna/memcached/
-post_install_message: 
-rdoc_options: 
-- --line-numbers
-- --inline-source
-- --title
-- Memcached
-- --main
-- README
-require_paths: 
-- lib
-- ext
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - "="
-    - !ruby/object:Gem::Version 
-      version: "1.2"
-  version: 
-requirements: []
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 2
 
-rubyforge_project: fauna
-rubygems_version: 1.2.0
-specification_version: 2
-summary: An interface to the libmemcached C client.
-test_files: 
-- test/test_helper.rb
-- test/unit/binding_test.rb
-- test/unit/memcached_test.rb
-- test/unit/rails_test.rb
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<echoe>, [">= 0"])
+    else
+      s.add_dependency(%q<echoe>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<echoe>, [">= 0"])
+  end
+end

data/test/unit/memcached_test.rb

@@ -1,25 +1,27 @@
 
 require "#{File.dirname(__FILE__)}/../test_helper"
+require 'socket'
+require 'benchmark'
 
 class MemcachedTest < Test::Unit::TestCase
 
   def setup
     @servers = ['localhost:43042', 'localhost:43043']
 
-    # Maximum allowed prefix key size
-    @prefix_key = 'prefix_key_' 
-    
-    @options = {      
-      :prefix_key => @prefix_key, 
+    # Maximum allowed prefix key size for :hash_with_prefix_key_key => false
+    @prefix_key = 'prefix_key_'
+
+    @options = {
+      :prefix_key => @prefix_key,
       :hash => :default,
       :distribution => :modula
     }
     @cache = Memcached.new(@servers, @options)
-    
+
     @nb_options = {
-      :prefix_key => @prefix_key, 
-      :no_block => true, 
-      :buffer_requests => true, 
+      :prefix_key => @prefix_key,
+      :no_block => true,
+      :buffer_requests => true,
       :hash => :default
     }
     @nb_cache = Memcached.new(@servers, @nb_options)
@@ -27,7 +29,7 @@ class MemcachedTest < Test::Unit::TestCase
     @value = OpenStruct.new(:a => 1, :b => 2, :c => GenericClass)
     @marshalled_value = Marshal.dump(@value)
   end
-    
+
   # Initialize
 
   def test_initialize
@@ -38,32 +40,48 @@ class MemcachedTest < Test::Unit::TestCase
     assert_equal 'localhost', cache.send(:server_structs).last.hostname
     assert_equal 43043, cache.send(:server_structs).last.port
   end
-  
+
   def test_initialize_with_ip_addresses
-    cache = Memcached.new ['127.0.0.1:43042', '127.0.0.1:43043'], :prefix_key => 'test'  
+    cache = Memcached.new ['127.0.0.1:43042', '127.0.0.1:43043']
     assert_equal '127.0.0.1', cache.send(:server_structs).first.hostname
     assert_equal '127.0.0.1', cache.send(:server_structs).last.hostname
   end
-  
+
   def test_initialize_without_port
-    cache = Memcached.new ['localhost'], :prefix_key => 'test'
+    cache = Memcached.new ['localhost']
     assert_equal 'localhost', cache.send(:server_structs).first.hostname
     assert_equal 11211, cache.send(:server_structs).first.port
   end
 
+  def test_initialize_with_ports_and_weights
+    cache = Memcached.new ['localhost:43042:2', 'localhost:43043:10']
+    assert_equal 2, cache.send(:server_structs).first.weight
+    assert_equal 43043, cache.send(:server_structs).last.port
+    assert_equal 10, cache.send(:server_structs).last.weight
+  end
+
+  def test_initialize_with_hostname_only
+    addresses = (1..8).map { |i| "app-cache-%02d" % i }
+    cache = Memcached.new(addresses)
+    addresses.each_with_index do |address, index|
+      assert_equal address, cache.send(:server_structs)[index].hostname
+      assert_equal 11211, cache.send(:server_structs)[index].port
+    end
+  end
+
   def test_options_are_set
     Memcached::DEFAULTS.merge(@nb_options).each do |key, expected|
       value = @nb_cache.options[key]
       assert(expected == value, "#{key} should be #{expected} but was #{value}")
     end
   end
-  
+
   def test_options_are_frozen
     assert_raise(TypeError) do
       @cache.options[:no_block] = true
     end
   end
-    
+
   def test_behaviors_are_set
     Memcached::BEHAVIORS.keys.each do |key, value|
       assert_not_nil @cache.send(:get_behavior, key)
@@ -75,37 +93,34 @@ class MemcachedTest < Test::Unit::TestCase
     assert_raise(ArgumentError) { Memcached.new "localhost:memcached" }
     assert_raise(ArgumentError) { Memcached.new "local host:43043:1" }
   end
-  
-  if ENV['USER'] == "eweaver"
-    def test_initialize_with_resolvable_hosts
-     `hostname` =~ /(chloe|mackenzie)/
-      host = "#{$1}.lan"
-      cache = Memcached.new ["#{host}:43042"]
-      assert_equal host, cache.send(:server_structs).first.hostname
-      
-      cache.set(key, @value)
-      assert_equal @value, cache.get(key)
-    end
+
+  def test_initialize_with_resolvable_hosts
+    host = `hostname`.chomp
+    cache = Memcached.new ["#{host}:43042"]
+    assert_equal host, cache.send(:server_structs).first.hostname
+
+    cache.set(key, @value)
+    assert_equal @value, cache.get(key)
   end
-  
+
   def test_initialize_with_invalid_options
-    assert_raise(ArgumentError) do 
+    assert_raise(ArgumentError) do
       Memcached.new @servers, :sort_hosts => true, :distribution => :consistent
     end
   end
 
   def test_initialize_with_invalid_prefix_key
-    assert_raise(ArgumentError) do 
-      Memcached.new @servers, :prefix_key => "prefix_key__"
+    assert_raise(ArgumentError) do
+      Memcached.new @servers, :prefix_key => "x" * 128
     end
   end
-  
+
   def test_initialize_without_prefix_key
     cache = Memcached.new @servers
     assert_equal nil, cache.options[:prefix_key]
     assert_equal 2, cache.send(:server_structs).size
   end
-  
+
   def test_initialize_negative_behavior
     cache = Memcached.new @servers,
       :buffer_requests => false
@@ -113,10 +128,10 @@ class MemcachedTest < Test::Unit::TestCase
       cache.set key, @value
     end
   end
-  
-  def test_initialize_without_not_found_backtraces
+
+  def test_initialize_without_backtraces
     cache = Memcached.new @servers,
-      :show_not_found_backtraces => false
+      :show_backtraces => false
     cache.delete key rescue
     begin
       cache.get key
@@ -125,24 +140,24 @@ class MemcachedTest < Test::Unit::TestCase
     end
   end
 
-  def test_initialize_with_not_found_backtraces
+  def test_initialize_with_backtraces
     cache = Memcached.new @servers,
-      :show_not_found_backtraces => true
+      :show_backtraces => true
     cache.delete key rescue
     begin
       cache.get key
     rescue Memcached::NotFound => e
       assert !e.backtrace.empty?
-    end  
-  end  
-  
+    end
+  end
+
   def test_initialize_sort_hosts
     # Original
     cache = Memcached.new(@servers.sort,
       :sort_hosts => false,
       :distribution => :modula
     )
-    assert_equal @servers.sort, 
+    assert_equal @servers.sort,
       cache.servers
 
     # Original with sort_hosts
@@ -150,26 +165,26 @@ class MemcachedTest < Test::Unit::TestCase
       :sort_hosts => true,
       :distribution => :modula
     )
-    assert_equal @servers.sort, 
+    assert_equal @servers.sort,
       cache.servers
-    
-    # Reversed 
+
+    # Reversed
     cache = Memcached.new(@servers.sort.reverse,
       :sort_hosts => false,
       :distribution => :modula
     )
-      assert_equal @servers.sort.reverse, 
+      assert_equal @servers.sort.reverse,
     cache.servers
-      
+
     # Reversed with sort_hosts
     cache = Memcached.new(@servers.sort.reverse,
       :sort_hosts => true,
       :distribution => :modula
     )
-    assert_equal @servers.sort, 
+    assert_equal @servers.sort,
       cache.servers
   end
-  
+
   def test_initialize_single_server
     cache = Memcached.new 'localhost:43042'
     assert_equal nil, cache.options[:prefix_key]
@@ -179,9 +194,9 @@ class MemcachedTest < Test::Unit::TestCase
   def test_initialize_strange_argument
     assert_raise(ArgumentError) { Memcached.new 1 }
   end
-  
+
   # Get
-  
+
   def test_get
     @cache.set key, @value
     result = @cache.get key
@@ -193,33 +208,60 @@ class MemcachedTest < Test::Unit::TestCase
     result = @cache.get key
     assert_equal nil, result
   end
-  
+
   def test_get_missing
     @cache.delete key rescue nil
     assert_raise(Memcached::NotFound) do
       result = @cache.get key
     end
   end
-  
+
+  def test_get_with_server_timeout
+    socket = stub_server 43047
+    cache = Memcached.new(
+      "localhost:43047:1",
+      :timeout => 0.5
+    )
+    assert 0.49 < (Benchmark.measure do
+      assert_raise(Memcached::UnknownReadFailure) do
+        result = cache.get key
+      end
+    end).real
+  end
+
+  def test_get_with_no_block_server_timeout
+    socket = stub_server 43048
+    cache = Memcached.new(
+      "localhost:43048:1",
+      :no_block => true,
+      :timeout => 0.25
+    )
+    assert 0.24 < (Benchmark.measure do
+      assert_raise(Memcached::UnknownReadFailure) do
+        result = cache.get key
+      end
+    end).real
+  end
+
   def test_get_with_prefix_key
     # Prefix_key
     cache = Memcached.new(
       # We can only use one server because the key is hashed separately from the prefix key
       @servers.first,
-      :prefix_key => @prefix_key, 
+      :prefix_key => @prefix_key,
       :hash => :default,
       :distribution => :modula
     )
     cache.set key, @value
     assert_equal @value, cache.get(key)
-    
+
     # No prefix_key specified
     cache = Memcached.new(
       @servers.first,
       :hash => :default,
       :distribution => :modula
     )
-    assert_nothing_raised do    
+    assert_nothing_raised do
       assert_equal @value, cache.get("#{@prefix_key}#{key}")
     end
   end
@@ -229,11 +271,11 @@ class MemcachedTest < Test::Unit::TestCase
     @cache.set key, value
     result = @cache.get key, false
     non_wrapped_result = Rlibmemcached.memcached_get(
-      @cache.instance_variable_get("@struct"), 
+      @cache.instance_variable_get("@struct"),
       key
     ).first
-    assert result.size > non_wrapped_result.size      
-  end  
+    assert result.size > non_wrapped_result.size
+  end
 
   def test_get_multi
     @cache.set "#{key}_1", 1
@@ -241,33 +283,33 @@ class MemcachedTest < Test::Unit::TestCase
     assert_equal({"#{key}_1" => 1, "#{key}_2" => 2},
       @cache.get(["#{key}_1", "#{key}_2"]))
   end
-  
+
   def test_get_multi_missing
     @cache.set "#{key}_1", 1
     @cache.delete "#{key}_2" rescue nil
     @cache.set "#{key}_3", 3
-    @cache.delete "#{key}_4" rescue nil    
+    @cache.delete "#{key}_4" rescue nil
     assert_equal(
-      {"test_get_multi_missing_3"=>3, "test_get_multi_missing_1"=>1}, 
+      {"test_get_multi_missing_3"=>3, "test_get_multi_missing_1"=>1},
       @cache.get(["#{key}_1", "#{key}_2",  "#{key}_3",  "#{key}_4"])
      )
   end
-  
+
   def test_get_multi_completely_missing
     @cache.delete "#{key}_1" rescue nil
-    @cache.delete "#{key}_2" rescue nil    
+    @cache.delete "#{key}_2" rescue nil
     assert_equal(
       {},
       @cache.get(["#{key}_1", "#{key}_2"])
      )
-  end  
+  end
 
   def test_set_and_get_unmarshalled
     @cache.set key, @value
     result = @cache.get key, false
     assert_equal @marshalled_value, result
   end
-  
+
   def test_get_multi_unmarshalled
     @cache.set "#{key}_1", 1, 0, false
     @cache.set "#{key}_2", 2, 0, false
@@ -276,7 +318,7 @@ class MemcachedTest < Test::Unit::TestCase
       @cache.get(["#{key}_1", "#{key}_2"], false)
     )
   end
-  
+
   def test_get_multi_mixed_marshalling
     @cache.set "#{key}_1", 1
     @cache.set "#{key}_2", 2, 0, false
@@ -286,7 +328,22 @@ class MemcachedTest < Test::Unit::TestCase
     assert_raise(ArgumentError) do
       @cache.get(["#{key}_1", "#{key}_2"])
     end
-  end  
+  end
+
+  def test_get_with_random_distribution
+    cache = Memcached.new(@servers, :distribution => :random)
+    cache.set key, @value
+    
+    hits = (0..10).to_a.map do
+      begin
+        cache.get(key)
+      rescue Memcached::NotFound
+      end
+    end.compact.size
+
+    assert 0 < hits
+    assert 10 > hits
+  end
 
   # Set
 
@@ -295,7 +352,7 @@ class MemcachedTest < Test::Unit::TestCase
       @cache.set(key, @value)
     end
   end
-    
+
   def test_set_expiry
     @cache.set key, @value, 1
     assert_nothing_raised do
@@ -306,16 +363,31 @@ class MemcachedTest < Test::Unit::TestCase
       @cache.get key
     end
   end
-  
+
+  def test_set_with_default_ttl
+    cache = Memcached.new(
+      @servers,
+      :default_ttl => 1
+    )
+    cache.set key, @value
+    assert_nothing_raised do
+      cache.get key
+    end
+    sleep(2)
+    assert_raise(Memcached::NotFound) do
+      cache.get key
+    end
+  end
+
   # Delete
-  
+
   def test_delete
     @cache.set key, @value
     @cache.delete key
     assert_raise(Memcached::NotFound) do
       @cache.get key
     end
-  end  
+  end
 
   def test_missing_delete
     @cache.delete key rescue nil
@@ -323,19 +395,19 @@ class MemcachedTest < Test::Unit::TestCase
       @cache.delete key
     end
   end
-  
+
   # Flush
-  
+
   def test_flush
     @cache.set key, @value
-    assert_equal @value, 
+    assert_equal @value,
       @cache.get(key)
     @cache.flush
-    assert_raise(Memcached::NotFound) do 
+    assert_raise(Memcached::NotFound) do
       @cache.get key
     end
   end
-  
+
   # Add
 
   def test_add
@@ -360,7 +432,7 @@ class MemcachedTest < Test::Unit::TestCase
     sleep(1)
     assert_raise(Memcached::NotFound) do
       @cache.get key
-    end  
+    end
   end
 
   def test_unmarshalled_add
@@ -369,14 +441,14 @@ class MemcachedTest < Test::Unit::TestCase
     assert_equal @marshalled_value, @cache.get(key, false)
     assert_equal @value, @cache.get(key)
   end
-  
+
   # Increment and decrement
 
   def test_increment
     @cache.set key, 10, 0, false
     assert_equal 11, @cache.increment(key)
   end
-  
+
   def test_increment_offset
     @cache.set key, 10, 0, false
     assert_equal 15, @cache.increment(key, 5)
@@ -393,11 +465,11 @@ class MemcachedTest < Test::Unit::TestCase
     @cache.set key, 10, 0, false
     assert_equal 9, @cache.decrement(key)
   end
-  
+
   def test_decrement_offset
     @cache.set key, 10, 0, false
     assert_equal 5, @cache.decrement(key, 5)
-  end  
+  end
 
   def test_missing_decrement
     @cache.delete key rescue nil
@@ -405,9 +477,9 @@ class MemcachedTest < Test::Unit::TestCase
       @cache.decrement key
     end
   end
-  
+
   # Replace
-  
+
   def test_replace
     @cache.set key, nil
     assert_nothing_raised do
@@ -421,11 +493,11 @@ class MemcachedTest < Test::Unit::TestCase
     assert_raise(Memcached::NotStored) do
       @cache.replace key, @value
     end
-    assert_raise(Memcached::NotFound) do    
-      assert_equal @value, @cache.get(key)    
+    assert_raise(Memcached::NotFound) do
+      assert_equal @value, @cache.get(key)
     end
   end
-  
+
   # Append and prepend
 
   def test_append
@@ -441,8 +513,8 @@ class MemcachedTest < Test::Unit::TestCase
     assert_raise(Memcached::NotStored) do
       @cache.append key, "end"
     end
-    assert_raise(Memcached::NotFound) do    
-      assert_equal @value, @cache.get(key)    
+    assert_raise(Memcached::NotFound) do
+      assert_equal @value, @cache.get(key)
     end
   end
 
@@ -459,17 +531,17 @@ class MemcachedTest < Test::Unit::TestCase
     assert_raise(Memcached::NotStored) do
       @cache.prepend key, "end"
     end
-    assert_raise(Memcached::NotFound) do    
-      assert_equal @value, @cache.get(key)    
+    assert_raise(Memcached::NotFound) do
+      assert_equal @value, @cache.get(key)
     end
   end
 
   def test_cas
     cache = Memcached.new(
-      @servers, 
-      :prefix_key => @prefix_key, 
+      @servers,
+      :prefix_key => @prefix_key,
       :support_cas => true
-    )        
+    )
     value2 = OpenStruct.new(:d => 3, :e => 4, :f => GenericClass)
 
     # Existing set
@@ -479,20 +551,20 @@ class MemcachedTest < Test::Unit::TestCase
       value2
     end
     assert_equal value2, cache.get(key)
-    
+
     # Existing test without marshalling
     cache.set(key, "foo", 0, false)
     cache.cas(key, 0, false) do |current|
       "#{current}bar"
     end
     assert_equal "foobar", cache.get(key, false)
-    
+
     # Missing set
     cache.delete key
     assert_raises(Memcached::NotFound) do
       cache.cas(key) {}
     end
-    
+
     # Conflicting set
     cache.set key, @value
     assert_raises(Memcached::ConnectionDataExists) do
@@ -502,9 +574,9 @@ class MemcachedTest < Test::Unit::TestCase
       end
     end
   end
-    
+
   # Error states
-  
+
   def test_key_with_spaces
     key = "i have a space"
     assert_raises(Memcached::ABadKeyWasProvidedOrCharactersOutOfRange) do
@@ -514,7 +586,7 @@ class MemcachedTest < Test::Unit::TestCase
       @cache.get(key)
     end
   end
-  
+
   def test_key_with_null
     key = "with\000null"
     assert_raises(Memcached::ABadKeyWasProvidedOrCharactersOutOfRange) do
@@ -527,8 +599,8 @@ class MemcachedTest < Test::Unit::TestCase
     assert_raises(Memcached::ABadKeyWasProvidedOrCharactersOutOfRange) do
       response = @cache.get([key])
     end
-  end  
-  
+  end
+
   def test_key_with_invalid_control_characters
     key = "ch\303\242teau"
     assert_raises(Memcached::ABadKeyWasProvidedOrCharactersOutOfRange) do
@@ -542,7 +614,7 @@ class MemcachedTest < Test::Unit::TestCase
       response = @cache.get([key])
     end
   end
-  
+
   def test_key_too_long
     key = "x"*251
     assert_raises(Memcached::ClientError) do
@@ -551,18 +623,18 @@ class MemcachedTest < Test::Unit::TestCase
     assert_raises(Memcached::ClientError) do
       @cache.get(key)
     end
-    
+
     assert_raises(Memcached::ClientError) do
       @cache.get([key])
     end
-  end  
+  end
 
   def test_set_object_too_large
     assert_raise(Memcached::ServerError) do
       @cache.set key, "I'm big" * 1000000
     end
   end
-  
+
   # Stats
 
   def test_stats
@@ -571,25 +643,25 @@ class MemcachedTest < Test::Unit::TestCase
     assert_instance_of Fixnum, stats[:pid].first
     assert_instance_of String, stats[:version].first
   end
-  
+
   # Clone
-  
+
   def test_clone
     cache = @cache.clone
     assert_equal cache.servers, @cache.servers
     assert_not_equal cache, @cache
-    
+
     # Definitely check that the structs are unlinked
     assert_not_equal @cache.instance_variable_get('@struct').object_id,
       cache.instance_variable_get('@struct').object_id
-    
+
     assert_nothing_raised do
       @cache.set key, @value
     end
   end
-  
+
   # Non-blocking IO
-  
+
   def test_buffered_requests_return_value
     cache = Memcached.new @servers,
       :buffer_requests => true
@@ -597,13 +669,13 @@ class MemcachedTest < Test::Unit::TestCase
       cache.set key, @value
     end
     ret = Rlibmemcached.memcached_set(
-      cache.instance_variable_get("@struct"), 
-      key, 
-      @marshalled_value, 
-      0, 
+      cache.instance_variable_get("@struct"),
+      key,
+      @marshalled_value,
+      0,
       Memcached::FLAGS
     )
-    assert_equal 31, ret
+    assert_equal Rlibmemcached::MEMCACHED_BUFFERED, ret
   end
 
   def test_no_block_return_value
@@ -611,71 +683,79 @@ class MemcachedTest < Test::Unit::TestCase
       @nb_cache.set key, @value
     end
     ret = Rlibmemcached.memcached_set(
-      @nb_cache.instance_variable_get("@struct"), 
-      key, 
-      @marshalled_value, 
-      0, 
+      @nb_cache.instance_variable_get("@struct"),
+      key,
+      @marshalled_value,
+      0,
       Memcached::FLAGS
     )
-    assert_equal 31, ret
+    assert_equal Rlibmemcached::MEMCACHED_BUFFERED, ret
   end
   
+  def test_no_block_get
+    @nb_cache.set key, @value
+    assert_equal @value, 
+      @nb_cache.get(key)
+  end
+
   def test_no_block_missing_delete
     @nb_cache.delete key rescue nil
     assert_nothing_raised do
       @nb_cache.delete key
     end
-  end  
+  end
 
   def test_no_block_set_invalid_key
     assert_raises(Memcached::ABadKeyWasProvidedOrCharactersOutOfRange) do
       @nb_cache.set "I'm so bad", @value
     end
-  end   
+  end
 
   def test_no_block_set_object_too_large
     assert_nothing_raised do
       @nb_cache.set key, "I'm big" * 1000000
     end
   end
-  
+
   def test_no_block_existing_add
     # Should still raise
     @nb_cache.set key, @value
     assert_raise(Memcached::NotStored) do
       @nb_cache.add key, @value
     end
-  end  
-  
+  end
+
   # Server removal and consistent hashing
-  
-  def test_missing_server
+
+  def test_dying_server
+    socket = stub_server 43041  
     cache = Memcached.new(
-      [@servers.last, 'localhost:43041'], # Use a server that isn't running
+      [@servers.last, 'localhost:43041'],
       :prefix_key => @prefix_key,
       :failover => true,
+      :hash_with_prefix_key => false,
       :hash => :md5
     )
-    
+
     # Hit first server
-    key = 'test_missing_server3'
-    cache.set(key, @value)
-    cache.get(key) == @value
-        
+    key1 = 'test_missing_server6'
+    cache.set(key1, @value)
+    cache.get(key1) == @value
+
     # Hit second server
-    key = 'test_missing_server'
-    assert_raise(Memcached::SystemError) do
-      cache.set(key, @value)
-      cache.get(key)
-    end    
+    key2 = 'test_missing_server'
+    assert_raise(Memcached::UnknownReadFailure) do
+      cache.set(key2, @value)
+      cache.get(key2)
+    end
 
     # Hit first server on retry
     assert_nothing_raised do
-      cache.set(key, @value)
-      cache.get(key)
-    end    
+      cache.set(key2, @value)
+      cache.get(key2)
+    end
   end
-  
+
   def test_sweep_servers_with_missing_server_first
     cache = Memcached.new(['127.0.0.1:00000'] + @servers)
     assert_nothing_raised do
@@ -686,24 +766,24 @@ class MemcachedTest < Test::Unit::TestCase
   def test_consistent_hashing
 
     keys = %w(EN6qtgMW n6Oz2W4I ss4A8Brr QShqFLZt Y3hgP9bs CokDD4OD Nd3iTSE1 24vBV4AU H9XBUQs5 E5j8vUq1 AzSh8fva PYBlK2Pi Ke3TgZ4I AyAIYanO oxj8Xhyd eBFnE6Bt yZyTikWQ pwGoU7Pw 2UNDkKRN qMJzkgo2 keFXbQXq pBl2QnIg ApRl3mWY wmalTJW1 TLueug8M wPQL4Qfg uACwus23 nmOk9R6w lwgZJrzJ v1UJtKdG RK629Cra U2UXFRqr d9OQLNl8 KAm1K3m5 Z13gKZ1v tNVai1nT LhpVXuVx pRib1Itj I1oLUob7 Z1nUsd5Q ZOwHehUa aXpFX29U ZsnqxlGz ivQRjOdb mB3iBEAj)
-    
+
     # Five servers
     cache = Memcached.new(
-      @servers + ['localhost:43044', 'localhost:43045', 'localhost:43046'], 
+      @servers + ['localhost:43044', 'localhost:43045', 'localhost:43046'],
       :prefix_key => @prefix_key
-    )        
-    
-    cache.flush    
+    )
+
+    cache.flush
     keys.each do |key|
       cache.set(key, @value)
-    end 
+    end
 
     # Pull a server
     cache = Memcached.new(
       @servers + ['localhost:43044', 'localhost:43046'],
       :prefix_key => @prefix_key
     )
-    
+
     failed = 0
     keys.each_with_index do |key, i|
       begin
@@ -713,15 +793,15 @@ class MemcachedTest < Test::Unit::TestCase
       end
     end
 
-    assert(failed < keys.size / 3, "#{failed} failed out of #{keys.size}")   
+    assert(failed < keys.size / 3, "#{failed} failed out of #{keys.size}")
   end
 
   # Concurrency
-  
+
   def test_thread_contention
     threads = []
     4.times do |index|
-      threads << Thread.new do 
+      threads << Thread.new do
         cache = @cache.clone
         assert_nothing_raised do
           cache.set("test_thread_contention_#{index}", index)
@@ -731,23 +811,29 @@ class MemcachedTest < Test::Unit::TestCase
     end
     threads.each {|thread| thread.join}
   end
-  
+
   # Memory cleanup
-  
+
   def test_reset
     original_struct = @cache.instance_variable_get("@struct")
     assert_nothing_raised do
       @cache.reset
-    end 
-    assert_not_equal original_struct, 
-      @cache.instance_variable_get("@struct") 
+    end
+    assert_not_equal original_struct,
+      @cache.instance_variable_get("@struct")
   end
-    
+
   private
-  
+
   def key
-    caller.first[/`(.*)'/, 1]
+    caller.first[/`(.*)'/, 1] # '
   end
- 
+
+  def stub_server(port)
+    socket = TCPServer.new('127.0.0.1', port)
+    Thread.new { socket.accept }
+    socket
+  end
+
 end