memcached 1.1.3 → 1.2

data/ext/rlibmemcached_wrap.c

@@ -6466,67 +6466,6 @@ fail:
 }
 
 
-SWIGINTERN VALUE
-_wrap_MemcachedSt_number_of_replicas_set(int argc, VALUE *argv, VALUE self) {
-  struct memcached_st *arg1 = (struct memcached_st *) 0 ;
-  uint32_t arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  void *argp2 ;
-  int res2 = 0 ;
-  
-  if ((argc < 1) || (argc > 1)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_memcached_st, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct memcached_st *","number_of_replicas", 1, self )); 
-  }
-  arg1 = (struct memcached_st *)(argp1);
-  {
-    res2 = SWIG_ConvertPtr(argv[0], &argp2, SWIGTYPE_p_uint32_t,  0 );
-    if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "uint32_t","number_of_replicas", 2, argv[0] )); 
-    }  
-    if (!argp2) {
-      SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "uint32_t","number_of_replicas", 2, argv[0]));
-    } else {
-      arg2 = *((uint32_t *)(argp2));
-    }
-  }
-  if (arg1) (arg1)->number_of_replicas = arg2;
-  return Qnil;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_MemcachedSt_number_of_replicas_get(int argc, VALUE *argv, VALUE self) {
-  struct memcached_st *arg1 = (struct memcached_st *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  uint32_t result;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 0) || (argc > 0)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_memcached_st, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct memcached_st *","number_of_replicas", 1, self )); 
-  }
-  arg1 = (struct memcached_st *)(argp1);
-  result =  ((arg1)->number_of_replicas);
-  {
-    vresult = UINT2NUM(result);
-  }
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
 SWIGINTERN VALUE
 _wrap_MemcachedSt_number_of_live_hosts_set(int argc, VALUE *argv, VALUE self) {
   struct memcached_st *arg1 = (struct memcached_st *) 0 ;
@@ -13350,8 +13289,6 @@ SWIGEXPORT void Init_rlibmemcached(void) {
   rb_define_method(SwigClassMemcachedSt.klass, "delete_trigger", _wrap_MemcachedSt_delete_trigger_get, -1);
   rb_define_method(SwigClassMemcachedSt.klass, "prefix_key=", _wrap_MemcachedSt_prefix_key_set, -1);
   rb_define_method(SwigClassMemcachedSt.klass, "prefix_key", _wrap_MemcachedSt_prefix_key_get, -1);
-  rb_define_method(SwigClassMemcachedSt.klass, "number_of_replicas=", _wrap_MemcachedSt_number_of_replicas_set, -1);
-  rb_define_method(SwigClassMemcachedSt.klass, "number_of_replicas", _wrap_MemcachedSt_number_of_replicas_get, -1);
   rb_define_method(SwigClassMemcachedSt.klass, "number_of_live_hosts=", _wrap_MemcachedSt_number_of_live_hosts_set, -1);
   rb_define_method(SwigClassMemcachedSt.klass, "number_of_live_hosts", _wrap_MemcachedSt_number_of_live_hosts_get, -1);
   rb_define_method(SwigClassMemcachedSt.klass, "live_host_indices=", _wrap_MemcachedSt_live_host_indices_set, -1);
@@ -13498,7 +13435,6 @@ SWIGEXPORT void Init_rlibmemcached(void) {
   rb_define_const(mRlibmemcached, "MEMCACHED_BEHAVIOR_NOREPLY", SWIG_From_int((int)(MEMCACHED_BEHAVIOR_NOREPLY)));
   rb_define_const(mRlibmemcached, "MEMCACHED_BEHAVIOR_USE_UDP", SWIG_From_int((int)(MEMCACHED_BEHAVIOR_USE_UDP)));
   rb_define_const(mRlibmemcached, "MEMCACHED_BEHAVIOR_AUTO_EJECT_HOSTS", SWIG_From_int((int)(MEMCACHED_BEHAVIOR_AUTO_EJECT_HOSTS)));
-  rb_define_const(mRlibmemcached, "MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS", SWIG_From_int((int)(MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS)));
   rb_define_const(mRlibmemcached, "MEMCACHED_CALLBACK_PREFIX_KEY", SWIG_From_int((int)(MEMCACHED_CALLBACK_PREFIX_KEY)));
   rb_define_const(mRlibmemcached, "MEMCACHED_CALLBACK_USER_DATA", SWIG_From_int((int)(MEMCACHED_CALLBACK_USER_DATA)));
   rb_define_const(mRlibmemcached, "MEMCACHED_CALLBACK_CLEANUP_FUNCTION", SWIG_From_int((int)(MEMCACHED_CALLBACK_CLEANUP_FUNCTION)));

data/lib/memcached/memcached.rb

@@ -70,7 +70,7 @@ Weights only affect Ketama hashing.  If you use Ketama hashing and don't specify
 Valid option parameters are:
 
 <tt>:prefix_key</tt>:: A string to prepend to every key, for namespacing. Max length is 127. Defaults to the empty string.
-<tt>:prefix_delimiter</tt>:: A character to postpend to the prefix key. Defaults to the empty string.
+<tt>:prefix_delimiter</tt>:: A character to append to the prefix key. Defaults to the empty string.
 <tt>:hash</tt>:: The name of a hash function to use. Possible values are: <tt>:crc</tt>, <tt>:default</tt>, <tt>:fnv1_32</tt>, <tt>:fnv1_64</tt>, <tt>:fnv1a_32</tt>, <tt>:fnv1a_64</tt>, <tt>:hsieh</tt>, <tt>:md5</tt>, <tt>:murmur</tt>, and <tt>:none</tt>. <tt>:fnv1_32</tt> is fast and well known, and is the default. Use <tt>:md5</tt> for compatibility with other ketama clients. <tt>:none</tt> is for use when there is a single server, and performs no actual hashing.
 <tt>:distribution</tt>:: Either <tt>:modula</tt>, <tt>:consistent_ketama</tt>, <tt>:consistent_wheel</tt>, or <tt>:ketama</tt>. Defaults to <tt>:ketama</tt>.
 <tt>:server_failure_limit</tt>:: How many consecutive failures to allow before marking a host as dead. Has no effect unless <tt>:retry_timeout</tt> is also set.
@@ -141,7 +141,7 @@ Please note that when <tt>:no_block => true</tt>, update methods do not raise on
     options[:poll_timeout] ||= options[:timeout] || 0
 
     # Set the prefix key. Support the legacy name.
-    set_prefix_key(options.delete(:prefix_key) || options.delete(:namespace))
+    set_prefix_key(options[:prefix_key] || options[:namespace])
 
     # Set the behaviors and credentials on the struct
     set_behaviors
@@ -213,7 +213,11 @@ Please note that when <tt>:no_block => true</tt>, update methods do not raise on
 
   # Return the current prefix key.
   def prefix_key
-    @struct.prefix_key[0..-1 - options[:prefix_delimiter].size] if @struct.prefix_key.size > 0
+    if @struct.prefix_key.size > 0
+      @struct.prefix_key[0..-1 - options[:prefix_delimiter].size]
+    else
+      ""
+    end
   end
   alias :namespace :prefix_key
 
@@ -260,24 +264,6 @@ Please note that when <tt>:no_block => true</tt>, update methods do not raise on
   alias :dup :clone #:nodoc:
   #:startdoc:
 
-  # change the prefix_key after we're in motion
-  def prefix_key=(key)
-    unless key.size < Lib::MEMCACHED_PREFIX_KEY_MAX_SIZE
-      raise ArgumentError, "Max prefix_key size is #{Lib::MEMCACHED_PREFIX_KEY_MAX_SIZE - 1}"
-    end
-    check_return_code(
-      Lib.memcached_callback_set(@struct, Lib::MEMCACHED_CALLBACK_PREFIX_KEY, "#{key}#{options[:prefix_delimiter]}")
-    )
-  end
-  alias namespace= prefix_key=
-
-  # report the prefix_key
-  def prefix_key
-    @struct.prefix_key[0..-1 - options[:prefix_delimiter].size]
-  end
-  alias namespace prefix_key
-
-
 ### Configuration helpers
 
   private

data/lib/memcached/rails.rb

@@ -26,7 +26,7 @@ class Memcached
       opts[:prefix_key] ||= opts[:namespace]
       @logger = opts[:logger]
       @string_return_types = opts[:string_return_types]
-      
+
       logger.info { "memcached #{VERSION} #{servers.inspect}" } if logger
       super(servers, opts)
     end
@@ -48,6 +48,14 @@ class Memcached
       get(key, options[:raw])
     end
 
+    # Returns whether the key exists, even if the value is nil.
+    def exist?(key, options = {})
+      get_orig(key, options)
+      true
+    rescue NotFound
+      false
+    end
+
     # Wraps Memcached#cas so that it doesn't raise. Doesn't set anything if no value is present.
     def cas(key, ttl=@default_ttl, raw=false, &block)
       super(key, ttl, !raw, &block)
@@ -71,7 +79,7 @@ class Memcached
       false
     end
 
-    # Alternative to #set. Accepts a key, value, and an optional options hash supporting the 
+    # Alternative to #set. Accepts a key, value, and an optional options hash supporting the
     # options :raw and :ttl.
     def write(key, value, options = {})
       set(key, value, options[:ttl] || @default_ttl, options[:raw])
@@ -122,4 +130,4 @@ class Memcached
     alias :"[]=" :set
 
   end
-end
+end

data/memcached.gemspec

@@ -2,22 +2,22 @@
 
 Gem::Specification.new do |s|
   s.name = %q{memcached}
-  s.version = "1.1.3"
+  s.version = "1.2"
 
   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{2011-02-27}
+  s.date = %q{2011-03-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", "LICENSE", "README", "TODO", "lib/memcached.rb", "lib/memcached/behaviors.rb", "lib/memcached/exceptions.rb", "lib/memcached/experimental.rb", "lib/memcached/memcached.rb", "lib/memcached/rails.rb"]
-  s.files = ["BENCHMARKS", "CHANGELOG", "LICENSE", "Manifest", "README", "Rakefile", "TODO", "ext/extconf-make.rb", "ext/extconf.rb", "ext/libmemcached-0.32.tar.gz", "ext/libmemcached-2.patch", "ext/libmemcached-3.patch", "ext/libmemcached-4.patch", "ext/libmemcached-5.patch", "ext/libmemcached-6.patch", "ext/libmemcached.patch", "ext/rlibmemcached.i", "ext/rlibmemcached_wrap.c", "ext/sasl.patch", "lib/memcached.rb", "lib/memcached/auth.rb", "lib/memcached/behaviors.rb", "lib/memcached/exceptions.rb", "lib/memcached/experimental.rb", "lib/memcached/memcached.rb", "lib/memcached/rails.rb", "lib/rlibmemcached.bundle.dSYM/Contents/Info.plist", "test/profile/benchmark.rb", "test/profile/c_profiler.rb", "test/profile/exercise.rb", "test/profile/rb_profiler.rb", "test/profile/valgrind.rb", "test/setup.rb", "test/teardown.rb", "test/test_helper.rb", "test/unit/binding_test.rb", "test/unit/memcached_experimental_test.rb", "test/unit/memcached_test.rb", "test/unit/rails_test.rb", "memcached.gemspec"]
+  s.files = ["BENCHMARKS", "CHANGELOG", "LICENSE", "Manifest", "README", "Rakefile", "TODO", "ext/extconf-make.rb", "ext/extconf.rb", "ext/libmemcached-0.32.tar.gz", "ext/libmemcached-2.patch", "ext/libmemcached-3.patch", "ext/libmemcached-4.patch", "ext/libmemcached-5.patch", "ext/libmemcached-6.patch", "ext/libmemcached-7.patch", "ext/libmemcached.patch", "ext/rlibmemcached.i", "ext/rlibmemcached_wrap.c", "ext/sasl.patch", "lib/memcached.rb", "lib/memcached/auth.rb", "lib/memcached/behaviors.rb", "lib/memcached/exceptions.rb", "lib/memcached/experimental.rb", "lib/memcached/memcached.rb", "lib/memcached/rails.rb", "test/profile/benchmark.rb", "test/profile/c_profiler.rb", "test/profile/exercise.rb", "test/profile/rb_profiler.rb", "test/profile/valgrind.rb", "test/setup.rb", "test/teardown.rb", "test/test_helper.rb", "test/unit/binding_test.rb", "test/unit/memcached_experimental_test.rb", "test/unit/memcached_test.rb", "test/unit/rails_test.rb", "memcached.gemspec"]
   s.homepage = %q{http://fauna.github.com/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.5.0}
+  s.rubygems_version = %q{1.6.0}
   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_experimental_test.rb", "test/unit/memcached_test.rb", "test/unit/rails_test.rb"]

data/test/unit/memcached_test.rb

@@ -13,21 +13,24 @@ class MemcachedTest < Test::Unit::TestCase
     @options = {
       :prefix_key => @prefix_key,
       :hash => :default,
-      :distribution => :modula}
+      :distribution => :modula,
+      :show_backtraces => true}
     @cache = Memcached.new(@servers, @options)
 
     @binary_protocol_options = {
       :prefix_key => @prefix_key,
       :hash => :default,
       :distribution => :modula,
-      :binary_protocol => true}
+      :binary_protocol => true,
+      :show_backtraces => true}
     @binary_protocol_cache = Memcached.new(@servers, @binary_protocol_options)
 
     @udp_options = {
       :prefix_key => @prefix_key,
       :hash => :default,
       :use_udp => true,
-      :distribution => :modula}
+      :distribution => :modula,
+      :show_backtraces => true}
     @udp_cache = Memcached.new(@udp_servers, @udp_options)
 
     @noblock_options = {
@@ -36,7 +39,8 @@ class MemcachedTest < Test::Unit::TestCase
       :noreply => true,
       :buffer_requests => true,
       :hash => :default,
-      :distribution => :modula}
+      :distribution => :modula,
+      :show_backtraces => true}
     @noblock_cache = Memcached.new(@servers, @noblock_options)
 
     @value = OpenStruct.new(:a => 1, :b => 2, :c => GenericClass)
@@ -128,26 +132,25 @@ class MemcachedTest < Test::Unit::TestCase
 
   def test_initialize_without_prefix_key
     cache = Memcached.new @servers
-    assert_equal nil, cache.options[:prefix_key]
     assert_equal 3, cache.send(:server_structs).size
   end
 
   def test_set_prefix_key
     cache = Memcached.new @servers, :prefix_key => "foo"
-    cache.prefix_key = "bar"
+    cache.set_prefix_key("bar")
     assert_equal "bar", cache.prefix_key
   end
 
   def test_set_prefix_key_to_empty_string
     cache = Memcached.new @servers, :prefix_key => "foo"
-    cache.prefix_key = ""
+    cache.set_prefix_key("")
     assert_equal "", cache.prefix_key
   end
 
   def test_memcached_callback_set_with_empty_string_should_not_raise_exception
     cache = Memcached.new @servers, :prefix_key => "foo"
     assert_nothing_raised do
-      cache.prefix_key = ""
+      cache.set_prefix_key("")
     end
   end
 
@@ -221,7 +224,6 @@ class MemcachedTest < Test::Unit::TestCase
 
   def test_initialize_single_server
     cache = Memcached.new 'localhost:43042'
-    assert_equal nil, cache.options[:prefix_key]
     assert_equal 1, cache.send(:server_structs).size
   end
 
@@ -233,12 +235,8 @@ class MemcachedTest < Test::Unit::TestCase
 
   def test_get
     @cache.set key, @value
-    result = @cache.get key
-    assert_equal @value, result
-
-    @binary_protocol_cache.set key, @value
-    result = @binary_protocol_cache.get key
-    assert_equal @value, result
+    assert_equal @value, @cache.get(key)
+    assert_equal @value, @binary_protocol_cache.get(key)
 
     @udp_cache.set(key, @value)
     assert_raises(Memcached::ActionNotSupported) do
@@ -518,6 +516,12 @@ class MemcachedTest < Test::Unit::TestCase
     assert_raise(Memcached::NotFound) do
       @cache.get key
     end
+
+    @binary_protocol_cache.set key, @value
+    @binary_protocol_cache.delete key
+    assert_raise(Memcached::NotFound) do
+      @binary_protocol_cache.get key
+    end
   end
 
   def test_missing_delete
@@ -818,7 +822,7 @@ class MemcachedTest < Test::Unit::TestCase
     end
   end
 
-  # Non-blocking IO
+  # Pipelined, non-blocking IO
 
   def test_buffered_requests_return_value
     cache = Memcached.new @servers,
@@ -867,9 +871,10 @@ class MemcachedTest < Test::Unit::TestCase
   end
 
   def test_no_block_missing_delete
-    @noblock_cache.delete key rescue nil
+   @noblock_cache.delete key rescue nil
     assert_nothing_raised do
       @noblock_cache.delete key
+      @noblock_cache.delete key
     end
   end
 

data/test/unit/rails_test.rb

@@ -16,21 +16,29 @@ class RailsTest < Test::Unit::TestCase
     result = @cache.get key
     assert_equal @value, result
   end
-  
+
+  def test_exist
+    assert !@cache.exist?(key)
+    @cache.set key, nil
+    assert @cache.exist?(key)
+    @cache.set key, @value
+    assert @cache.exist?(key)
+  end
+
   def test_get_multi
     @cache.set key, @value
     assert_equal(
-      {key => @value}, 
+      {key => @value},
       @cache.get_multi([key]))
   end
 
   def test_get_multi_empty_string
     @cache.set key, "", 0, true
     assert_equal(
-      {key => ""}, 
+      {key => ""},
       @cache.get_multi([key], true))
   end
-   
+
   def test_delete
     @cache.set key, @value
     assert_nothing_raised do
@@ -38,7 +46,7 @@ class RailsTest < Test::Unit::TestCase
     end
     assert_nil(@cache.get(key))
   end
-  
+
   def test_delete_missing
     assert_nothing_raised do
       @cache.delete key
@@ -58,7 +66,7 @@ class RailsTest < Test::Unit::TestCase
     result = @cache[key]
     assert_equal @value, result
   end
-  
+
   def test_cas
     cache = Memcached::Rails.new(:servers => @servers, :namespace => @namespace, :support_cas => true)
     value2 = OpenStruct.new(:d => 3, :e => 4, :f => GenericClass)
@@ -87,28 +95,28 @@ class RailsTest < Test::Unit::TestCase
         current
       end
     end
-  end  
-  
+  end
+
   def test_get_missing
     @cache.delete key rescue nil
     result = @cache.get key
     assert_equal nil, result
-  end    
-  
+  end
+
   def test_get_nil
     @cache.set key, nil, 0
     result = @cache.get key
     assert_equal nil, result
-  end  
-  
+  end
+
   def test_namespace
     assert_equal @namespace, @cache.namespace
   end
 
   private
-  
+
   def key
     caller.first[/.*[` ](.*)'/, 1] # '
   end
-  
-end
+
+end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: memcached
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 11
   prerelease: 
   segments: 
   - 1
-  - 1
-  - 3
-  version: 1.1.3
+  - 2
+  version: "1.2"
 platform: ruby
 authors: 
 - Evan Weaver
@@ -36,7 +35,7 @@ cert_chain:
   yZ0=
   -----END CERTIFICATE-----
 
-date: 2011-02-27 00:00:00 -08:00
+date: 2011-03-02 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -74,6 +73,7 @@ files:
 - ext/libmemcached-4.patch
 - ext/libmemcached-5.patch
 - ext/libmemcached-6.patch
+- ext/libmemcached-7.patch
 - ext/libmemcached.patch
 - ext/rlibmemcached.i
 - ext/rlibmemcached_wrap.c
@@ -85,7 +85,6 @@ files:
 - lib/memcached/experimental.rb
 - lib/memcached/memcached.rb
 - lib/memcached/rails.rb
-- lib/rlibmemcached.bundle.dSYM/Contents/Info.plist
 - test/profile/benchmark.rb
 - test/profile/c_profiler.rb
 - test/profile/exercise.rb
@@ -136,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: fauna
-rubygems_version: 1.5.0
+rubygems_version: 1.6.0
 signing_key: 
 specification_version: 3
 summary: An interface to the libmemcached C client.