memcached 1.6.0 → 1.6.1

data/lib/memcached/memcached.rb

@@ -486,7 +486,7 @@ Please note that when <tt>:no_block => true</tt>, update methods do not raise on
 
   # Gets a key's value from the server. Accepts a String <tt>key</tt> or array of String <tt>keys</tt>.
   #
-  # Also accepts a <tt>encode</tt> value, which defaults to <tt>true</tt>. Set <tt>encode</tt> to <tt>false</tt> if you want the <tt>value</tt> to be returned directly as a String. Otherwise it will be assumed to be an encoded Ruby object and decoded.
+  # Also accepts a <tt>decode</tt> value, which defaults to <tt>true</tt>. Set <tt>decode</tt> to <tt>false</tt> if you want the <tt>value</tt> to be returned directly as a String. Otherwise it will be assumed to be an encoded Ruby object and decoded.
   #
   # If you pass a String key, and the key does not exist on the server, <b>Memcached::NotFound</b> will be raised. If you pass an array of keys, memcached's <tt>multiget</tt> mode will be used, and a hash of key/value pairs will be returned. The hash will contain only the keys that were found.
   #
@@ -494,7 +494,7 @@ Please note that when <tt>:no_block => true</tt>, update methods do not raise on
   #
   # Note that when you rescue Memcached::NotFound exceptions, you should use a the block rescue syntax instead of the inline syntax. Block rescues are very fast, but inline rescues are very slow.
   #
-  def get(keys, encode=true)
+  def get(keys, decode=true)
     if keys.is_a? Array
       # Multi get
       ret = Lib.memcached_mget(@struct, keys);
@@ -504,13 +504,13 @@ Please note that when <tt>:no_block => true</tt>, update methods do not raise on
       value, key, flags, ret = Lib.memcached_fetch_rvalue(@struct)
       while ret != 21 do # Lib::MEMCACHED_END
         if ret == 0 # Lib::MEMCACHED_SUCCESS
-          hash[key] = encode ? [value, flags] : value
+          hash[key] = decode ? [value, flags] : value
         elsif ret != 16 # Lib::MEMCACHED_NOTFOUND
           check_return_code(ret, key)
         end
         value, key, flags, ret = Lib.memcached_fetch_rvalue(@struct)
       end
-      if encode
+      if decode
         hash.each do |key, value_and_flags|
           hash[key] = @codec.decode(key, *value_and_flags)
         end
@@ -520,7 +520,7 @@ Please note that when <tt>:no_block => true</tt>, update methods do not raise on
       # Single get
       value, flags, ret = Lib.memcached_get_rvalue(@struct, keys)
       check_return_code(ret, keys)
-      encode ? @codec.decode(keys, value, flags) : value
+      decode ? @codec.decode(keys, value, flags) : value
     end
   rescue => e
     tries ||= 0
@@ -539,11 +539,11 @@ Please note that when <tt>:no_block => true</tt>, update methods do not raise on
   end
 
   # Gets a key's value from the previous server. Only useful with random distribution.
-  def get_from_last(key, encode=true)
+  def get_from_last(key, decode=true)
     raise ArgumentError, "get_from_last() is not useful unless :random distribution is enabled." unless options[:distribution] == :random
     value, flags, ret = Lib.memcached_get_from_last_rvalue(@struct, key)
     check_return_code(ret, key)
-    encode ? @codec.decode(key, value, flags) : value
+    decode ? @codec.decode(key, value, flags) : value
   end
 
   ### Information methods

data/memcached.gemspec

@@ -2,12 +2,12 @@
 
 Gem::Specification.new do |s|
   s.name = "memcached"
-  s.version = "1.6.0"
+  s.version = "1.6.1"
 
   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/cloudburst/configuration/gem_certificates/evan_weaver-original-public_cert.pem"]
-  s.date = "2013-06-10"
+  s.date = "2013-06-11"
   s.description = "An interface to the libmemcached C client."
   s.email = ""
   s.extensions = ["ext/extconf.rb"]

data/test/unit/memcached_test.rb

@@ -1,6 +1,12 @@
 
 require File.expand_path("#{File.dirname(__FILE__)}/../test_helper")
 
+class NilClass
+  def to_str
+    "nil"
+  end
+end
+
 class MemcachedTest < Test::Unit::TestCase
 
   def setup
@@ -265,6 +271,15 @@ class MemcachedTest < Test::Unit::TestCase
     end
   end
 
+  def test_get_coerces_string_type
+    assert_raises(Memcached::NotFound) do
+      @cache.get nil
+    end
+    assert_raises(TypeError) do
+      @cache.get 1
+    end
+  end
+
   def test_get_with_server_timeout
     socket = stub_server 43047
     cache = Memcached.new("localhost:43047:1", :timeout => 0.5, :exception_retry_limit => 0)
@@ -408,9 +423,12 @@ class MemcachedTest < Test::Unit::TestCase
       @cache.get(["#{key}_1"], false))
   end
 
-  def test_get_multi_checks_types
-    assert_raises(TypeError, ArgumentError) do
-      @cache.get([nil])
+  def test_get_multi_coerces_string_type
+    assert_nothing_raised do
+      @cache.get [nil]
+    end
+    assert_raises(TypeError) do
+      @cache.get [1]
     end
   end
 
@@ -522,6 +540,16 @@ class MemcachedTest < Test::Unit::TestCase
     end
   end
 
+  def test_set_coerces_string_type
+    assert_nothing_raised do
+      @cache.set nil, @value
+    end
+
+    assert_raises(TypeError) do
+      @cache.set 1, @value
+    end
+  end
+
   def disabled_test_set_retry_on_client_error
     # FIXME Test passes, but Mocha doesn't restore the original method properly
     Rlibmemcached.stubs(:memcached_set).raises(Memcached::ClientError)
@@ -1342,4 +1370,3 @@ class MemcachedTest < Test::Unit::TestCase
   end
 
 end
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: memcached
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -36,7 +36,7 @@ cert_chain:
   QUMzSFJXWnhJUzFzZm4vU3NxYTdFN29RTWt2NUZBWHIKeDVyS2VQZlhJTmY4
   WFRKY3prbDlPQkVZZEU5YU5kSnNKcFhEMGFzTGdHVndCSUNTNUJqb2hwNm1p
   ekpjREMxKwp5WjA9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
-date: 2013-06-10 00:00:00.000000000 Z
+date: 2013-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake