memcached 1.6.1 → 1.7.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MzBkMTUwZWJjODIyYWZiZDE5OTg1NmRmYzdkOWVkZDE5ZDNiZTkwYw==
+  data.tar.gz: !binary |-
+    MmQ5YjE1MjFjODkxNTg4YzdlYWUyMmQ5ZDFhNDgxYzVlODAzNWY3NQ==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    YWQ4ZjgxZTQ5M2Q1NzFlYWEzNzdlOTBiYjhhMWUzMzBkMDRjYzVmMDg5NjY4
+    MzllODA2YzFlM2NkOTIxYWMwYjkwYmRhODk0OGY2NjI4OWVjMjZlMTlhYzM2
+    ZDVlZmJjMjU2NDA2OTNlZDA1YzVhOTViOTdiMGMwZmMyMTI5N2I=
+  data.tar.gz: !binary |-
+    OThjNTIwYWVhNzhjMDQwYzdjZjIyNTQ4NzlkNTM1Y2FkNWQ0ZmRkOTFhMTY1
+    N2Q3YzFkNWFkYWVmN2JmYzBlMDlkOGY2YWI1NWY2MGRlNjlhYTEwYzU2N2Vl
+    M2JjYTQzNGVlZmJkMWUzNjk2ZWJkOWJmOGM3OTY4MDk4ZWZiNjI=

checksums.yaml.gz.sig

@@ -0,0 +1,3 @@
+@��W�*���X�[���e��M!-aP�@�.��4'@#�"��-YI�V�"KS��?�����FщK!��?�†>h0N�׾'��
+�%�����M�9Dn
N�E)+h
^�-���Ź��p�S��[���5�Nģ��:m��ɔ�@����x%
+�������\	�(-y�N97�����DV�&Ѱ1���a^Q�T1p�P�=����udo���CY��(�[b���o��a��r���
l��E[�l�

data/CHANGELOG

@@ -1,3 +1,6 @@
+v1.7.0. Remove legacy :namespace option from base class. Always rescue in Memcached::Rails and log, for people who don't care if their cache is actually working (mnzaki). Add snd_timeout (jreichhold).
+
+v1.6.2. Add travis configuration file (tests rubies 1.8.7, 1.9, 2.0, and rbx 1.9 mode). Fixes for unit tests breaking under Ruby 1.8.7. Updated gemspec to add check for signing key so that we can also build unsigned gem. Add travis build status image to README.rdoc. Updates to Memcached::Rails to be more compatible with ActiveSupport's cache API.
 
 v1.6.1. Clean up C-level handling of to_str (jason-o-matic).
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    memcached (1.4.3)
+    memcached (1.6.2)
 
 GEM
   remote: http://rubygems.org/

data/Manifest

@@ -230,6 +230,7 @@ lib/memcached/marshal_codec.rb
 lib/memcached/memcached.rb
 lib/memcached/rails.rb
 memcached.gemspec
+memcached.pem
 test/profile/benchmark.rb
 test/profile/c_profiler.rb
 test/profile/exercise.rb

data/README.rdoc

@@ -2,6 +2,8 @@ memcached
 
 An interface to the libmemcached C client.
 
+{<img src="https://travis-ci.org/evan/memcached.png" alt="Build Status" />}[https://travis-ci.org/evan/memcached]
+
 == License
 
 Copyright 2009-2013 Cloudburst, LLC. Licensed under the AFL 3. See the included LICENSE file. Portions copyright 2007-2009 TangentOrg, Brian Aker, licensed under the BSD license, and used with permission.

data/Rakefile

@@ -1,6 +1,8 @@
 gem 'echoe', '>= 4.5.6'
 require 'echoe'
 
+ENV["GEM_CERTIFICATE_CHAIN"]="memcached.pem"
+
 Echoe.new("memcached") do |p|
   p.author = "Evan Weaver"
   p.project = "evan"

data/ext/libmemcached-0.32/libmemcached/memcached.c

@@ -86,6 +86,7 @@ memcached_st *memcached_clone(memcached_st *clone, memcached_st *source)
   new_clone->send_size= source->send_size;
   new_clone->recv_size= source->recv_size;
   new_clone->poll_timeout= source->poll_timeout;
+  new_clone->poll_max_retries = source->poll_max_retries;
   new_clone->connect_timeout= source->connect_timeout;
   new_clone->retry_timeout= source->retry_timeout;
   new_clone->distribution= source->distribution;

data/ext/libmemcached-0.32/libmemcached/memcached.h

@@ -85,6 +85,7 @@ struct memcached_st {
   memcached_server_st *hosts;
   int32_t snd_timeout;
   int32_t rcv_timeout;
+  int32_t poll_max_retries;
   uint32_t server_failure_limit;
   uint32_t io_msg_watermark;
   uint32_t io_bytes_watermark;

data/ext/libmemcached-0.32/libmemcached/memcached/protocol_binary.h

@@ -109,7 +109,7 @@ extern "C"
     PROTOCOL_BINARY_CMD_TOUCH = 0x1c,
     PROTOCOL_BINARY_CMD_SASL_LIST_MECHS = 0x20,
     PROTOCOL_BINARY_CMD_SASL_AUTH = 0x21,
-    PROTOCOL_BINARY_CMD_SASL_STEP = 0x22,
+    PROTOCOL_BINARY_CMD_SASL_STEP = 0x22
   } protocol_binary_command;
 
   /**

data/ext/libmemcached-0.32/libmemcached/memcached_behavior.c

@@ -132,6 +132,9 @@ memcached_return memcached_behavior_set(memcached_st *ptr,
   case MEMCACHED_BEHAVIOR_POLL_TIMEOUT:
     ptr->poll_timeout= (int32_t)data;
     break;
+  case MEMCACHED_BEHAVIOR_POLL_MAX_RETRIES:
+    ptr->poll_max_retries= (uint32_t) data;
+    break;
   case MEMCACHED_BEHAVIOR_CONNECT_TIMEOUT:
     ptr->connect_timeout= (int32_t)data;
     break;
@@ -229,6 +232,8 @@ uint64_t memcached_behavior_get(memcached_st *ptr,
     return (uint64_t)ptr->snd_timeout;
   case MEMCACHED_BEHAVIOR_RCV_TIMEOUT:
     return (uint64_t)ptr->rcv_timeout;
+  case MEMCACHED_BEHAVIOR_POLL_MAX_RETRIES:
+    return (uint64_t)ptr->poll_max_retries;
   case MEMCACHED_BEHAVIOR_SOCKET_SEND_SIZE:
     {
       int sock_size;

data/ext/libmemcached-0.32/libmemcached/memcached_constants.h

@@ -85,6 +85,7 @@ typedef enum {
   MEMCACHED_BEHAVIOR_CACHE_LOOKUPS,
   MEMCACHED_BEHAVIOR_SUPPORT_CAS,
   MEMCACHED_BEHAVIOR_POLL_TIMEOUT,
+  MEMCACHED_BEHAVIOR_POLL_MAX_RETRIES,
   MEMCACHED_BEHAVIOR_DISTRIBUTION,
   MEMCACHED_BEHAVIOR_BUFFER_REQUESTS,
   MEMCACHED_BEHAVIOR_USER_DATA,

data/ext/libmemcached-0.32/libmemcached/memcached_do.c

@@ -39,6 +39,8 @@ memcached_return memcached_vdo(memcached_server_st *ptr,
 {
   memcached_return rc;
   ssize_t sent_length;
+	size_t command_length;
+  uint32_t x;
 
   WATCHPOINT_ASSERT(count);
   WATCHPOINT_ASSERT(vector);
@@ -56,8 +58,8 @@ memcached_return memcached_vdo(memcached_server_st *ptr,
 
   sent_length= memcached_io_writev(ptr, vector, count, (char) with_flush);
 
-  size_t command_length = 0;
-  for (uint32_t x= 0; x < count; ++x, vector++)
+  command_length = 0;
+  for (x= 0; x < count; ++x, vector++)
     command_length+= vector->length;
 
   if (sent_length == -1 || (size_t)sent_length != command_length) {

data/ext/libmemcached-0.32/libmemcached/memcached_exist.h

@@ -17,4 +17,4 @@ memcached_return memcached_exist_by_key(memcached_st *memc,
 }
 #endif
 
-#endif /* __MEMCACHED_EXIST_H__ */
+#endif /* __MEMCACHED_EXIST_H__ */

data/ext/libmemcached-0.32/libmemcached/memcached_flush_buffers.c

@@ -4,8 +4,9 @@
 memcached_return memcached_flush_buffers(memcached_st *mem)
 {
   memcached_return ret= MEMCACHED_SUCCESS;
+  uint32_t x;
 
-  for (uint32_t x= 0; x < mem->number_of_hosts; ++x)
+  for (x= 0; x < mem->number_of_hosts; ++x)
     if (mem->hosts[x].write_buffer_offset != 0) 
     {
       if (mem->hosts[x].fd == -1 &&

data/ext/libmemcached-0.32/libmemcached/memcached_io.c

@@ -9,7 +9,7 @@
 
 typedef enum {
   MEM_READ,
-  MEM_WRITE,
+  MEM_WRITE
 } memc_read_or_write;
 
 static ssize_t io_flush(memcached_server_st *ptr, memcached_return *error);
@@ -94,6 +94,7 @@ memcached_return memcached_io_read(memcached_server_st *ptr,
                                    void *buffer, size_t length, ssize_t *nread)
 {
   char *buffer_ptr;
+  memcached_return rc;
 
   buffer_ptr= buffer;
 
@@ -111,7 +112,7 @@ memcached_return memcached_io_read(memcached_server_st *ptr,
         else if (data_read == -1)
         {
           ptr->cached_errno= errno;
-          memcached_return rc= MEMCACHED_UNKNOWN_READ_FAILURE;
+          rc= MEMCACHED_UNKNOWN_READ_FAILURE;
           switch (errno)
           {
           case EAGAIN:
@@ -197,7 +198,7 @@ static ssize_t _io_write(memcached_server_st *ptr,
 
     if (ptr->type == MEMCACHED_CONNECTION_UDP)
     {
-      //UDP does not support partial writes
+      /* UDP does not support partial writes */
       buffer_end= MAX_UDP_DATAGRAM_LENGTH;
       should_write= length;
       if (ptr->write_buffer_offset + should_write > buffer_end)
@@ -257,8 +258,9 @@ ssize_t memcached_io_writev(memcached_server_st *ptr,
 {
   ssize_t total = 0;
   char f = (char)false;
+  size_t x;
 
-  for (size_t x = 0; x < number_of; x++, vector++)
+  for (x = 0; x < number_of; x++, vector++)
   {
     ssize_t returnable;
     if ((returnable= _io_write(ptr, vector->buffer, vector->length, f)) == -1)
@@ -308,9 +310,12 @@ memcached_server_st *memcached_io_get_readable_server(memcached_st *memc)
 {
 #define MAX_SERVERS_TO_POLL 100
   struct pollfd fds[MAX_SERVERS_TO_POLL];
-  unsigned int host_index= 0;
+  unsigned int host_index= 0,
+               x,
+               y;
+  int err;
 
-  for (unsigned int x= 0;
+  for (x= 0;
        x< memc->number_of_hosts && host_index < MAX_SERVERS_TO_POLL;
        ++x)
   {
@@ -329,14 +334,14 @@ memcached_server_st *memcached_io_get_readable_server(memcached_st *memc)
   if (host_index < 2)
   {
     /* We have 0 or 1 server with pending events.. */
-    for (unsigned int x= 0; x< memc->number_of_hosts; ++x)
+    for (x= 0; x< memc->number_of_hosts; ++x)
       if (memcached_server_response_count(&memc->hosts[x]) > 0)
         return &memc->hosts[x];
 
     return NULL;
   }
 
-  int err= poll(fds, host_index, memc->poll_timeout);
+  err= poll(fds, host_index, memc->poll_timeout);
   switch (err) {
   case -1:
     memc->cached_errno = errno;
@@ -344,9 +349,9 @@ memcached_server_st *memcached_io_get_readable_server(memcached_st *memc)
   case 0:
     break;
   default:
-    for (unsigned int x= 0; x < host_index; ++x)
+    for (x= 0; x < host_index; ++x)
       if (fds[x].revents & POLLIN)
-        for (unsigned int y= 0; y < memc->number_of_hosts; ++y)
+        for (y= 0; y < memc->number_of_hosts; ++y)
           if (memc->hosts[y].fd == fds[x].fd)
             return &memc->hosts[y];
   }
@@ -357,6 +362,12 @@ memcached_server_st *memcached_io_get_readable_server(memcached_st *memc)
 static ssize_t io_flush(memcached_server_st *ptr,
                         memcached_return *error)
 {
+  ssize_t sent_length;
+  size_t return_length;
+  char *local_write_ptr;
+  size_t write_length;
+  int timeout_cnt;
+
   /*
   ** We might want to purge the input buffer if we haven't consumed
   ** any output yet... The test for the limits is the purge is inline
@@ -370,16 +381,14 @@ static ssize_t io_flush(memcached_server_st *ptr,
      if (rc != MEMCACHED_SUCCESS && rc != MEMCACHED_STORED)
        return -1;
   }
-  ssize_t sent_length;
-  size_t return_length;
-  char *local_write_ptr= ptr->write_buffer;
-  size_t write_length= ptr->write_buffer_offset;
+  local_write_ptr= ptr->write_buffer;
+  write_length= ptr->write_buffer_offset;
 
   *error= MEMCACHED_SUCCESS;
 
   WATCHPOINT_ASSERT(ptr->fd != -1);
 
-  // UDP Sanity check, make sure that we are not sending somthing too big
+  /* UDP Sanity check, make sure that we are not sending somthing too big */
   if (ptr->type == MEMCACHED_CONNECTION_UDP && write_length > MAX_UDP_DATAGRAM_LENGTH)
     return -1;
 
@@ -395,6 +404,7 @@ static ssize_t io_flush(memcached_server_st *ptr,
 #endif
 
   return_length= 0;
+  timeout_cnt = 0;
   while (write_length)
   {
     WATCHPOINT_ASSERT(ptr->fd != -1);
@@ -416,10 +426,15 @@ static ssize_t io_flush(memcached_server_st *ptr,
         memcached_return rc;
         rc= io_wait(ptr, MEM_WRITE);
 
-        if (rc == MEMCACHED_SUCCESS || rc == MEMCACHED_TIMEOUT)
+        if (rc == MEMCACHED_SUCCESS)
           continue;
+        else if (rc == MEMCACHED_TIMEOUT) {
+          if((ptr->root->poll_max_retries) && (timeout_cnt++ <=  ptr->root->poll_max_retries))
+            continue;
+        }
 
         memcached_quit_server(ptr, 1);
+        *error= MEMCACHED_TIMEOUT;
         return -1;
       }
       default:
@@ -444,11 +459,15 @@ static ssize_t io_flush(memcached_server_st *ptr,
   }
 
   WATCHPOINT_ASSERT(write_length == 0);
-  // Need to study this assert() WATCHPOINT_ASSERT(return_length ==
-  // ptr->write_buffer_offset);
+  /*
+   * Need to study this assert() WATCHPOINT_ASSERT(return_length ==
+   * ptr->write_buffer_offset);
+   */
 
-  // if we are a udp server, the begining of the buffer is reserverd for
-  // the upd frame header
+  /*
+   * if we are a udp server, the begining of the buffer is reserverd for
+   * the upd frame header
+   */
   if (ptr->type == MEMCACHED_CONNECTION_UDP)
     ptr->write_buffer_offset= UDP_DATAGRAM_HEADER_LENGTH;
   else

data/ext/libmemcached-0.32/tests/function.c

@@ -230,6 +230,7 @@ static test_return  clone_test(memcached_st *memc)
     assert(memc_clone->on_cleanup == memc->on_cleanup);
     assert(memc_clone->on_clone == memc->on_clone);
     assert(memc_clone->poll_timeout == memc->poll_timeout);
+    assert(memc_clone->poll_max_retries == memc->poll_max_retries);
     assert(memc_clone->rcv_timeout == memc->rcv_timeout);
     assert(memc_clone->recv_size == memc->recv_size);
     assert(memc_clone->retry_timeout == memc->retry_timeout);
@@ -293,7 +294,7 @@ static test_return  error_test(memcached_st *memc)
                         1437122909U, 2300930706U, 2943759320U, 674306647U, 2400528935U, 54481931U, 4186304426U, 1741088401U, 2979625118U,
                         4159057246U, 1769812374U, 2302537950U, 1110330676U};
 
-  // You have updated the memcache_error messages but not updated docs/tests.
+  /* You have updated the memcache_error messages but not updated docs/tests. */
   assert(MEMCACHED_SUCCESS == 0 && MEMCACHED_MAXIMUM_RETURN == 40);
   for (rc= MEMCACHED_SUCCESS; rc < MEMCACHED_MAXIMUM_RETURN; rc++)
   {
@@ -457,6 +458,7 @@ static test_return  cas_test(memcached_st *memc)
   size_t value_length= strlen(value);
   const char *value2= "change the value";
   size_t value2_length= strlen(value2);
+	uint64_t cas;
 
   memcached_result_st results_obj;
   memcached_result_st *results;
@@ -483,7 +485,7 @@ static test_return  cas_test(memcached_st *memc)
   assert(!memcmp(value, memcached_result_value(results), value_length));
   assert(strlen(memcached_result_value(results)) == value_length);
   assert(rc == MEMCACHED_SUCCESS);
-  uint64_t cas = memcached_result_cas(results);
+  cas = memcached_result_cas(results);
 
   #if 0
   results= memcached_fetch_result(memc, &results_obj, &rc);
@@ -514,6 +516,7 @@ static test_return  mget_len_no_cas_test(memcached_st *memc)
   const char *keys[]= {"fudge_for_me", "son_of_bonnie", "food_a_la_carte"};
   size_t keys_length[]= {12, 13, 15};
   const unsigned int specified_length = 4;
+  char *result_str;
 
   memcached_result_st results_obj;
   memcached_result_st *results;
@@ -565,7 +568,7 @@ static test_return  mget_len_no_cas_test(memcached_st *memc)
     assert(rc == MEMCACHED_SUCCESS);
     assert(!memcached_result_cas(results));
 
-    char *result_str = memcached_result_value(results);
+    result_str = memcached_result_value(results);
     assert(strlen(result_str) == specified_length);
 
     x++;
@@ -587,6 +590,11 @@ static test_return  mget_len_cas_test(memcached_st *memc)
   const unsigned int specified_length = 4;
   const char *value2= "change the value";
   size_t value2_length= strlen(value2);
+	memcached_st *mclone;
+	char *result_str;
+  uint64_t cas;
+  char *key;
+  uint32_t key_length;
 
   memcached_result_st results_obj;
   memcached_result_st *results;
@@ -635,7 +643,7 @@ static test_return  mget_len_cas_test(memcached_st *memc)
    * results so clone the memcached_st state and move on with life.
    * This happens when using memcached_mget() and memcached_mget_len().
    */
-  memcached_st *mclone= memcached_clone(NULL, memc);
+  mclone= memcached_clone(NULL, memc);
 
   x = 0;
   while ((results= memcached_fetch_result(memc, &results_obj, &rc)))
@@ -644,14 +652,14 @@ static test_return  mget_len_cas_test(memcached_st *memc)
     assert(&results_obj == results);
     assert(rc == MEMCACHED_SUCCESS);
 
-    char *result_str = memcached_result_value(results);
+    result_str = memcached_result_value(results);
     assert(strlen(result_str) == specified_length);
 
     assert(memcached_result_cas(results));
 
-    uint64_t cas = memcached_result_cas(results);
-    char *key = memcached_result_key_value(results);
-    uint32_t key_length = memcached_result_key_length(results);
+    cas = memcached_result_cas(results);
+    key = memcached_result_key_value(results);
+    key_length = memcached_result_key_length(results);
     rc= memcached_cas(mclone, key, key_length, value2, value2_length, 0, 0, cas);
 
     /*
@@ -836,6 +844,7 @@ static test_return  bad_key_test(memcached_st *memc)
   memcached_st *memc_clone;
   unsigned int set= 1;
   size_t max_keylen= 0xffff;
+  const char *keys[] = { "GoodKey", "Bad Key", "NotMine" };
 
   memc_clone= memcached_clone(NULL, memc);
   assert(memc_clone);
@@ -862,7 +871,6 @@ static test_return  bad_key_test(memcached_st *memc)
     assert(!string);
 
     /* Test multi key for bad keys */
-    const char *keys[] = { "GoodKey", "Bad Key", "NotMine" };
     size_t key_lengths[] = { 7, 7, 7 };
     set= 1;
     rc= memcached_behavior_set(memc_clone, MEMCACHED_BEHAVIOR_VERIFY_KEY, set);
@@ -2816,6 +2824,7 @@ static test_return user_supplied_bug18(memcached_st *trash)
 static test_return auto_eject_hosts(memcached_st *trash)
 {
   (void) trash;
+  int x;
 
   memcached_return rc;
   memcached_st *memc= memcached_create(NULL);
@@ -2859,7 +2868,7 @@ static test_return auto_eject_hosts(memcached_st *trash)
   memc->hosts[2].next_retry = time(NULL) + 15;
   memc->next_distribution_rebuild= time(NULL) - 1;
 
-  for (int x= 0; x < 99; x++)
+  for (x= 0; x < 99; x++)
   {
     uint32_t server_idx = memcached_generate_hash(memc, test_cases[x].key, strlen(test_cases[x].key));
     assert(server_idx != 2);
@@ -2869,7 +2878,7 @@ static test_return auto_eject_hosts(memcached_st *trash)
   memc->hosts[2].next_retry = time(NULL) - 1;
   memc->next_distribution_rebuild= time(NULL) - 1;
   run_distribution(memc);
-  for (int x= 0; x < 99; x++)
+  for (x= 0; x < 99; x++)
   {
     uint32_t server_idx = memcached_generate_hash(memc, test_cases[x].key, strlen(test_cases[x].key));
     char *hostname = memc->hosts[server_idx].hostname;
@@ -3681,6 +3690,8 @@ static memcached_return  poll_timeout(memcached_st *memc)
 
 static test_return noreply_test(memcached_st *memc)
 {
+  int count, x;
+  uint32_t y;
   memcached_return ret;
   ret= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NOREPLY, 1);
   assert(ret == MEMCACHED_SUCCESS);
@@ -3692,9 +3703,9 @@ static test_return noreply_test(memcached_st *memc)
   assert(memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_BUFFER_REQUESTS) == 1);
   assert(memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_SUPPORT_CAS) == 1);
 
-  for (int count=0; count < 5; ++count)
+  for (count=0; count < 5; ++count)
   {
-    for (int x=0; x < 100; ++x)
+    for (x=0; x < 100; ++x)
     {
       char key[10];
       size_t len= (size_t)sprintf(key, "%d", x);
@@ -3728,8 +3739,8 @@ static test_return noreply_test(memcached_st *memc)
     ** way it is supposed to do!!!!
     */
     int no_msg=0;
-    for (uint32_t x=0; x < memc->number_of_hosts; ++x)
-      no_msg+=(int)(memc->hosts[x].cursor_active);
+    for (y=0; x < memc->number_of_hosts; ++y)
+      no_msg+=(int)(memc->hosts[y].cursor_active);
 
     assert(no_msg == 0);
     assert(memcached_flush_buffers(memc) == MEMCACHED_SUCCESS);
@@ -3737,7 +3748,7 @@ static test_return noreply_test(memcached_st *memc)
     /*
      ** Now validate that all items was set properly!
      */
-    for (int x=0; x < 100; ++x)
+    for (x=0; x < 100; ++x)
     {
       char key[10];
       size_t len= (size_t)sprintf(key, "%d", x);

data/ext/rlibmemcached.i

@@ -216,6 +216,7 @@ VALUE memcached_fetch_rvalue(memcached_st *ptr, char *key, size_t *key_length, u
 VALUE memcached_fetch_rvalue(memcached_st *ptr, char *key, size_t *key_length, uint32_t *flags, memcached_return *error) {
   size_t value_length = 0;
   VALUE ary = rb_ary_new();
+  *key_length = 0;
   if (error) *error = MEMCACHED_TIMEOUT; // timeouts leave error uninitialized
   char *value = memcached_fetch(ptr, key, key_length, &value_length, flags, error);
   VALUE str = rb_str_new_by_ref(value, value_length);

data/ext/rlibmemcached_wrap.c

@@ -2301,6 +2301,7 @@ VALUE memcached_get_from_last_rvalue(memcached_st *ptr, const char *key, size_t
 VALUE memcached_fetch_rvalue(memcached_st *ptr, char *key, size_t *key_length, uint32_t *flags, memcached_return *error) {
   size_t value_length = 0;
   VALUE ary = rb_ary_new();
+  *key_length = 0;
   if (error) *error = MEMCACHED_TIMEOUT; // timeouts leave error uninitialized
   char *value = memcached_fetch(ptr, key, key_length, &value_length, flags, error);
   VALUE str = rb_str_new_by_ref(value, value_length);
@@ -13725,6 +13726,7 @@ SWIGEXPORT void Init_rlibmemcached(void) {
   rb_define_const(mRlibmemcached, "MEMCACHED_BEHAVIOR_CACHE_LOOKUPS", SWIG_From_int((int)(MEMCACHED_BEHAVIOR_CACHE_LOOKUPS)));
   rb_define_const(mRlibmemcached, "MEMCACHED_BEHAVIOR_SUPPORT_CAS", SWIG_From_int((int)(MEMCACHED_BEHAVIOR_SUPPORT_CAS)));
   rb_define_const(mRlibmemcached, "MEMCACHED_BEHAVIOR_POLL_TIMEOUT", SWIG_From_int((int)(MEMCACHED_BEHAVIOR_POLL_TIMEOUT)));
+  rb_define_const(mRlibmemcached, "MEMCACHED_BEHAVIOR_POLL_MAX_RETRIES", SWIG_From_int((int)(MEMCACHED_BEHAVIOR_POLL_MAX_RETRIES)));
   rb_define_const(mRlibmemcached, "MEMCACHED_BEHAVIOR_DISTRIBUTION", SWIG_From_int((int)(MEMCACHED_BEHAVIOR_DISTRIBUTION)));
   rb_define_const(mRlibmemcached, "MEMCACHED_BEHAVIOR_BUFFER_REQUESTS", SWIG_From_int((int)(MEMCACHED_BEHAVIOR_BUFFER_REQUESTS)));
   rb_define_const(mRlibmemcached, "MEMCACHED_BEHAVIOR_USER_DATA", SWIG_From_int((int)(MEMCACHED_BEHAVIOR_USER_DATA)));

data/lib/memcached/behaviors.rb

@@ -23,10 +23,11 @@ class Memcached
   DISTRIBUTION_VALUES = {}
   BEHAVIOR_VALUES.merge!(load_constants("MEMCACHED_DISTRIBUTION_", DISTRIBUTION_VALUES))
 
-  DIRECT_VALUE_BEHAVIORS = [:retry_timeout, :connect_timeout, :rcv_timeout, :socket_recv_size, :poll_timeout, :socket_send_size, :server_failure_limit]
+  DIRECT_VALUE_BEHAVIORS = [:retry_timeout, :connect_timeout, :rcv_timeout, :socket_recv_size, :poll_timeout, :socket_send_size, :server_failure_limit, :snd_timeout, :poll_max_retries]
 
   CONVERSION_FACTORS = {
     :rcv_timeout => 1_000_000,
+    :snd_timeout => 1_000_000,
     :poll_timeout => 1_000,
     :connect_timeout => 1_000
   }

data/lib/memcached/memcached.rb

@@ -18,6 +18,8 @@ class Memcached
     :retry_timeout => 60,
     :timeout => 0.25,
     :rcv_timeout => nil,
+    :snd_timeout => nil,
+    :poll_max_retries => 1,
     :poll_timeout => nil,
     :connect_timeout => 0.25,
     :prefix_key => '',
@@ -97,6 +99,7 @@ Valid option parameters are:
 <tt>:binary_protocol</tt>:: Use the binary protocol. Defaults to false. Please note that using the binary protocol is usually <b>slower</b> than the ASCII protocol.
 <tt>:sort_hosts</tt>:: Whether to force the server list to stay sorted. This defeats consistent hashing and is rarely useful.
 <tt>:verify_key</tt>:: Validate keys before accepting them. Never disable this.
+<tt>:poll_max_retries</tt>:: Maximum poll timeout retries before marking a flush failed on timeouts.
 
 Please note that when <tt>:no_block => true</tt>, update methods do not raise on errors. For example, if you try to <tt>set</tt> an invalid key, it will appear to succeed. The actual setting of the key occurs after libmemcached has returned control to your program, so there is no way to backtrack and raise the exception.
 
@@ -107,7 +110,11 @@ Please note that when <tt>:no_block => true</tt>, update methods do not raise on
 
     # Merge option defaults and discard meaningless keys
     @options = DEFAULTS.merge(opts)
-    @options.delete_if { |k,v| not DEFAULTS.keys.include? k }
+    @options.each do |key,_|
+       unless DEFAULTS.keys.include? key
+         raise ArgumentError, "#{key.inspect} is not a valid configuration parameter."
+       end
+    end
 
     # Marginally speed up settings access for hot paths
     @default_ttl = options[:default_ttl]
@@ -149,8 +156,11 @@ Please note that when <tt>:no_block => true</tt>, update methods do not raise on
     options[:rcv_timeout] ||= options[:timeout]
     options[:poll_timeout] ||= options[:timeout]
 
-    # Set the prefix key. Support the legacy name.
-    set_prefix_key(options[:prefix_key] || options[:namespace])
+    # Write timeouts
+    options[:snd_timeout] ||= options[:timeout]
+
+    # Set the prefix key
+    set_prefix_key(options[:prefix_key])
 
     # Set the behaviors and credentials on the struct
     set_behaviors
@@ -221,7 +231,6 @@ Please note that when <tt>:no_block => true</tt>, update methods do not raise on
       end
     )
   end
-  alias :set_namespace :set_prefix_key
 
   # Return the current prefix key.
   def prefix_key
@@ -231,7 +240,6 @@ Please note that when <tt>:no_block => true</tt>, update methods do not raise on
       ""
     end
   end
-  alias :namespace :prefix_key
 
   # Safely copy this instance. Returns a Memcached instance.
   #

data/lib/memcached/rails.rb

@@ -25,11 +25,11 @@ class Memcached
         args.any? ? args.unshift : opts.delete(:servers)
       ).flatten.compact
 
-      opts[:prefix_key] = opts[:namespace] if opts[:namespace]
-      opts[:prefix_delimiter] = opts[:namespace_separator] if opts[:namespace_separator]
+      opts[:prefix_key] = opts.delete(:namespace) if opts[:namespace]
+      opts[:prefix_delimiter] = opts.delete(:namespace_separator) if opts[:namespace_separator]
 
-      @logger = opts[:logger]
-      @string_return_types = opts[:string_return_types]
+      @logger = opts.delete(:logger)
+      @string_return_types = opts.delete(:string_return_types)
 
       logger.info { "memcached #{VERSION} #{servers.inspect}" } if logger
       super(servers, opts)
@@ -39,22 +39,40 @@ class Memcached
       @logger = logger
     end
 
+    def namespace
+       @options[:prefix_key]
+    end
+
     # Check if there are any servers defined?
     def active?
       servers.any?
     end
 
+    def log_exception(e)
+      logger.warn("memcached error: #{e.class}: #{e.message}") if logger
+      false
+    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)
       super(key, !raw)
     rescue NotFound
+    rescue Error => e
+      log_exception e
     end
 
     # Alternative to #get. Accepts a key and an optional options hash supporting the single option
     # :raw.
-    def read(key, options = {})
-      get(key, options[:raw])
+    def read(key, options = nil)
+      if options
+        get(key, options[:raw])
+      else
+        get(key)
+      end
+    rescue NotFound
+    rescue Error => e
+      log_exception e
     end
 
     # Returns whether the key exists, even if the value is nil.
@@ -63,6 +81,8 @@ class Memcached
       true
     rescue NotFound
       false
+    rescue Error => e
+      log_exception e
     end
 
     # Wraps Memcached#cas so that it doesn't raise. Doesn't set anything if no value is present.
@@ -74,6 +94,8 @@ class Memcached
       ttl = ttl.value and retry rescue raise e
     rescue NotFound, ConnectionDataExists
       false
+    rescue Error => e
+      log_exception e
     end
 
     alias :compare_and_swap :cas
@@ -81,6 +103,9 @@ class Memcached
     # Wraps Memcached#get.
     def get_multi(keys, raw=false)
       get_orig(keys, !raw)
+    rescue NotFound
+    rescue Error => e
+      log_exception e
     end
 
     # Wraps Memcached#set.
@@ -92,20 +117,33 @@ class Memcached
       ttl = ttl.value and retry rescue raise e
     rescue NotStored
       false
+    rescue Error => e
+      log_exception e
     end
 
     # 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] || options[:expires_in] || @default_ttl, options[:raw])
+    def write(key, value, options = nil)
+      value = value.to_s if options && options[:raw]
+      ttl = options ? (options[:ttl] || options[:expires_in] || @default_ttl) : @default_ttl
+      raw = options ? options[:raw] : nil
+      if options && options[:unless_exist]
+        add(key, value, ttl, raw)
+      else
+        set(key, value, ttl, raw)
+      end
     end
 
-    def fetch(key, options={})
+    def fetch(key, options = nil)
       result = read(key, options)
       if result.nil?
-        result = yield
-        write(key, result, options)
-        result
+        if block_given?
+          result = yield
+          write(key, result, options)
+          result
+        else
+          result
+        end
       else
         result
       end
@@ -119,37 +157,49 @@ class Memcached
       # Maybe we got an ActiveSupport::Duration
       ttl = ttl.value and retry rescue raise e
     rescue NotStored
+    rescue Error => e
+      log_exception e
       @string_return_types? "NOT STORED\r\n" : false
     end
 
     # Wraps Memcached#delete so that it doesn't raise.
-    def delete(key, expiry=0)
+    def delete(key, options = nil)
       super(key)
     rescue NotFound
+    rescue Error => e
+      log_exception e
     end
 
     # Wraps Memcached#incr so that it doesn't raise.
     def incr(*args)
       super
     rescue NotFound
+    rescue Error => e
+      log_exception e
     end
 
     # Wraps Memcached#decr so that it doesn't raise.
     def decr(*args)
       super
     rescue NotFound
+    rescue Error => e
+      log_exception e
     end
 
     # Wraps Memcached#append so that it doesn't raise.
     def append(*args)
       super
     rescue NotStored
+    rescue Error => e
+      log_exception e
     end
 
     # Wraps Memcached#prepend so that it doesn't raise.
     def prepend(*args)
       super
     rescue NotStored
+    rescue Error => e
+      log_exception e
     end
 
     alias :flush_all :flush
@@ -180,5 +230,19 @@ class Memcached
       end
       super
     end
+
+    def increment(name, amount = 1, options = nil)
+      response = super(name, amount)
+      response ? response.to_i : nil
+    rescue
+      nil
+    end
+
+    def decrement(name, amount = 1, options = nil)
+      response = super(name, amount)
+      response ? response.to_i : nil
+    rescue
+      nil
+    end
   end
 end

data/memcached.gemspec

@@ -2,28 +2,28 @@
 
 Gem::Specification.new do |s|
   s.name = "memcached"
-  s.version = "1.6.1"
+  s.version = "1.7.0"
 
   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-11"
+  s.cert_chain = ["/Users/eweaver/cloudburst/github/memcached/memcached.pem"]
+  s.date = "2013-08-09"
   s.description = "An interface to the libmemcached C client."
   s.email = ""
   s.extensions = ["ext/extconf.rb"]
   s.extra_rdoc_files = ["BENCHMARKS", "CHANGELOG", "LICENSE", "README.rdoc", "TODO", "ext/libmemcached-0.32/README", "ext/libmemcached-0.32/TODO", "ext/libmemcached-0.32/libmemcached/memcached/README.txt", "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", "Gemfile", "Gemfile.lock", "LICENSE", "Manifest", "README.rdoc", "Rakefile", "TODO", "ext/extconf-make.rb", "ext/extconf.rb", "ext/libmemcached-0.32/AUTHORS", "ext/libmemcached-0.32/COPYING", "ext/libmemcached-0.32/ChangeLog", "ext/libmemcached-0.32/INSTALL", "ext/libmemcached-0.32/Makefile.am", "ext/libmemcached-0.32/Makefile.in", "ext/libmemcached-0.32/NEWS", "ext/libmemcached-0.32/README", "ext/libmemcached-0.32/THANKS", "ext/libmemcached-0.32/TODO", "ext/libmemcached-0.32/aclocal.m4", "ext/libmemcached-0.32/clients/Makefile.am", "ext/libmemcached-0.32/clients/Makefile.in", "ext/libmemcached-0.32/clients/client_options.h", "ext/libmemcached-0.32/clients/execute.c", "ext/libmemcached-0.32/clients/execute.h", "ext/libmemcached-0.32/clients/generator.c", "ext/libmemcached-0.32/clients/generator.h", "ext/libmemcached-0.32/clients/memcat.c", "ext/libmemcached-0.32/clients/memcp.c", "ext/libmemcached-0.32/clients/memdump.c", "ext/libmemcached-0.32/clients/memerror.c", "ext/libmemcached-0.32/clients/memflush.c", "ext/libmemcached-0.32/clients/memrm.c", "ext/libmemcached-0.32/clients/memslap.c", "ext/libmemcached-0.32/clients/memstat.c", "ext/libmemcached-0.32/clients/utilities.c", "ext/libmemcached-0.32/clients/utilities.h", "ext/libmemcached-0.32/config.h.in", "ext/libmemcached-0.32/config/compile", "ext/libmemcached-0.32/config/config.guess", "ext/libmemcached-0.32/config/config.rpath", "ext/libmemcached-0.32/config/config.sub", "ext/libmemcached-0.32/config/depcomp", "ext/libmemcached-0.32/config/install-sh", "ext/libmemcached-0.32/config/ltmain.sh", "ext/libmemcached-0.32/config/missing", "ext/libmemcached-0.32/configure", "ext/libmemcached-0.32/configure.ac", "ext/libmemcached-0.32/docs/Makefile.am", "ext/libmemcached-0.32/docs/Makefile.in", "ext/libmemcached-0.32/docs/libmemcached.pod", "ext/libmemcached-0.32/docs/libmemcached_examples.pod", "ext/libmemcached-0.32/docs/libmemcachedutil.pod", "ext/libmemcached-0.32/docs/memcached_analyze.pod", "ext/libmemcached-0.32/docs/memcached_auto.pod", "ext/libmemcached-0.32/docs/memcached_behavior.pod", "ext/libmemcached-0.32/docs/memcached_callback.pod", "ext/libmemcached-0.32/docs/memcached_create.pod", "ext/libmemcached-0.32/docs/memcached_delete.pod", "ext/libmemcached-0.32/docs/memcached_dump.pod", "ext/libmemcached-0.32/docs/memcached_flush.pod", "ext/libmemcached-0.32/docs/memcached_flush_buffers.pod", "ext/libmemcached-0.32/docs/memcached_generate_hash_value.pod", "ext/libmemcached-0.32/docs/memcached_get.pod", "ext/libmemcached-0.32/docs/memcached_memory_allocators.pod", "ext/libmemcached-0.32/docs/memcached_pool.pod", "ext/libmemcached-0.32/docs/memcached_quit.pod", "ext/libmemcached-0.32/docs/memcached_sasl.pod", "ext/libmemcached-0.32/docs/memcached_server_st.pod", "ext/libmemcached-0.32/docs/memcached_servers.pod", "ext/libmemcached-0.32/docs/memcached_set.pod", "ext/libmemcached-0.32/docs/memcached_stats.pod", "ext/libmemcached-0.32/docs/memcached_strerror.pod", "ext/libmemcached-0.32/docs/memcached_user_data.pod", "ext/libmemcached-0.32/docs/memcached_verbosity.pod", "ext/libmemcached-0.32/docs/memcached_version.pod", "ext/libmemcached-0.32/docs/memcat.pod", "ext/libmemcached-0.32/docs/memcp.pod", "ext/libmemcached-0.32/docs/memdump.pod", "ext/libmemcached-0.32/docs/memerror.pod", "ext/libmemcached-0.32/docs/memflush.pod", "ext/libmemcached-0.32/docs/memrm.pod", "ext/libmemcached-0.32/docs/memslap.pod", "ext/libmemcached-0.32/docs/memstat.pod", "ext/libmemcached-0.32/libmemcached/Makefile.am", "ext/libmemcached-0.32/libmemcached/Makefile.in", "ext/libmemcached-0.32/libmemcached/byteorder.c", "ext/libmemcached-0.32/libmemcached/common.h", "ext/libmemcached-0.32/libmemcached/crc.c", "ext/libmemcached-0.32/libmemcached/hsieh_hash.c", "ext/libmemcached-0.32/libmemcached/jenkins_hash.c", "ext/libmemcached-0.32/libmemcached/libmemcached.ver", "ext/libmemcached-0.32/libmemcached/libmemcached_probes.d", "ext/libmemcached-0.32/libmemcached/libmemcached_probes.h", "ext/libmemcached-0.32/libmemcached/md5.c", "ext/libmemcached-0.32/libmemcached/memcached.c", "ext/libmemcached-0.32/libmemcached/memcached.h", "ext/libmemcached-0.32/libmemcached/memcached.hpp", "ext/libmemcached-0.32/libmemcached/memcached/README.txt", "ext/libmemcached-0.32/libmemcached/memcached/protocol_binary.h", "ext/libmemcached-0.32/libmemcached/memcached_allocators.c", "ext/libmemcached-0.32/libmemcached/memcached_analyze.c", "ext/libmemcached-0.32/libmemcached/memcached_auto.c", "ext/libmemcached-0.32/libmemcached/memcached_behavior.c", "ext/libmemcached-0.32/libmemcached/memcached_callback.c", "ext/libmemcached-0.32/libmemcached/memcached_configure.h.in", "ext/libmemcached-0.32/libmemcached/memcached_connect.c", "ext/libmemcached-0.32/libmemcached/memcached_constants.h", "ext/libmemcached-0.32/libmemcached/memcached_delete.c", "ext/libmemcached-0.32/libmemcached/memcached_do.c", "ext/libmemcached-0.32/libmemcached/memcached_dump.c", "ext/libmemcached-0.32/libmemcached/memcached_exist.c", "ext/libmemcached-0.32/libmemcached/memcached_exist.h", "ext/libmemcached-0.32/libmemcached/memcached_fetch.c", "ext/libmemcached-0.32/libmemcached/memcached_flush.c", "ext/libmemcached-0.32/libmemcached/memcached_flush_buffers.c", "ext/libmemcached-0.32/libmemcached/memcached_get.c", "ext/libmemcached-0.32/libmemcached/memcached_get.h", "ext/libmemcached-0.32/libmemcached/memcached_hash.c", "ext/libmemcached-0.32/libmemcached/memcached_hosts.c", "ext/libmemcached-0.32/libmemcached/memcached_internal.h", "ext/libmemcached-0.32/libmemcached/memcached_io.c", "ext/libmemcached-0.32/libmemcached/memcached_io.h", "ext/libmemcached-0.32/libmemcached/memcached_key.c", "ext/libmemcached-0.32/libmemcached/memcached_parse.c", "ext/libmemcached-0.32/libmemcached/memcached_pool.h", "ext/libmemcached-0.32/libmemcached/memcached_purge.c", "ext/libmemcached-0.32/libmemcached/memcached_quit.c", "ext/libmemcached-0.32/libmemcached/memcached_response.c", "ext/libmemcached-0.32/libmemcached/memcached_result.c", "ext/libmemcached-0.32/libmemcached/memcached_result.h", "ext/libmemcached-0.32/libmemcached/memcached_sasl.c", "ext/libmemcached-0.32/libmemcached/memcached_sasl.h", "ext/libmemcached-0.32/libmemcached/memcached_server.c", "ext/libmemcached-0.32/libmemcached/memcached_server.h", "ext/libmemcached-0.32/libmemcached/memcached_stats.c", "ext/libmemcached-0.32/libmemcached/memcached_storage.c", "ext/libmemcached-0.32/libmemcached/memcached_storage.h", "ext/libmemcached-0.32/libmemcached/memcached_strerror.c", "ext/libmemcached-0.32/libmemcached/memcached_string.c", "ext/libmemcached-0.32/libmemcached/memcached_string.h", "ext/libmemcached-0.32/libmemcached/memcached_touch.c", "ext/libmemcached-0.32/libmemcached/memcached_touch.h", "ext/libmemcached-0.32/libmemcached/memcached_types.h", "ext/libmemcached-0.32/libmemcached/memcached_util.h", "ext/libmemcached-0.32/libmemcached/memcached_verbosity.c", "ext/libmemcached-0.32/libmemcached/memcached_version.c", "ext/libmemcached-0.32/libmemcached/memcached_watchpoint.h", "ext/libmemcached-0.32/libmemcached/murmur_hash.c", "ext/libmemcached-0.32/libmemcached/visibility.h", "ext/libmemcached-0.32/libmemcachedutil/Makefile.am", "ext/libmemcached-0.32/libmemcachedutil/Makefile.in", "ext/libmemcached-0.32/libmemcachedutil/libmemcachedutil.ver", "ext/libmemcached-0.32/libmemcachedutil/memcached_pool.c", "ext/libmemcached-0.32/m4/ac_cxx_compile_stdcxx_0x.m4", "ext/libmemcached-0.32/m4/ac_cxx_header_stdcxx_98.m4", "ext/libmemcached-0.32/m4/acx_pthread.m4", "ext/libmemcached-0.32/m4/byteorder.m4", "ext/libmemcached-0.32/m4/deprecated.m4", "ext/libmemcached-0.32/m4/enable_utillib.m4", "ext/libmemcached-0.32/m4/extensions.m4", "ext/libmemcached-0.32/m4/hsieh.m4", "ext/libmemcached-0.32/m4/lib-prefix.m4", "ext/libmemcached-0.32/m4/libtool.m4", "ext/libmemcached-0.32/m4/ltoptions.m4", "ext/libmemcached-0.32/m4/ltsugar.m4", "ext/libmemcached-0.32/m4/ltversion.m4", "ext/libmemcached-0.32/m4/lt~obsolete.m4", "ext/libmemcached-0.32/m4/memcached.m4", "ext/libmemcached-0.32/m4/pandora_64bit.m4", "ext/libmemcached-0.32/m4/pandora_canonical.m4", "ext/libmemcached-0.32/m4/pandora_check_compiler_version.m4", "ext/libmemcached-0.32/m4/pandora_check_cxx_standard.m4", "ext/libmemcached-0.32/m4/pandora_enable_dtrace.m4", "ext/libmemcached-0.32/m4/pandora_ensure_gcc_version.m4", "ext/libmemcached-0.32/m4/pandora_have_better_malloc.m4", "ext/libmemcached-0.32/m4/pandora_have_sasl.m4", "ext/libmemcached-0.32/m4/pandora_header_assert.m4", "ext/libmemcached-0.32/m4/pandora_libtool.m4", "ext/libmemcached-0.32/m4/pandora_optimize.m4", "ext/libmemcached-0.32/m4/pandora_shared_ptr.m4", "ext/libmemcached-0.32/m4/pandora_vc_build.m4", "ext/libmemcached-0.32/m4/pandora_warnings.m4", "ext/libmemcached-0.32/m4/pod2man.m4", "ext/libmemcached-0.32/m4/protocol_binary.m4", "ext/libmemcached-0.32/m4/setsockopt.m4", "ext/libmemcached-0.32/m4/visibility.m4", "ext/libmemcached-0.32/support/Makefile.am", "ext/libmemcached-0.32/support/Makefile.in", "ext/libmemcached-0.32/support/libmemcached-fc.spec.in", "ext/libmemcached-0.32/support/libmemcached.pc.in", "ext/libmemcached-0.32/support/libmemcached.spec", "ext/libmemcached-0.32/support/libmemcached.spec.in", "ext/libmemcached-0.32/support/set_benchmark.sh", "ext/libmemcached-0.32/tests/Makefile.am", "ext/libmemcached-0.32/tests/Makefile.in", "ext/libmemcached-0.32/tests/atomsmasher.c", "ext/libmemcached-0.32/tests/function.c", "ext/libmemcached-0.32/tests/ketama_test_cases.h", "ext/libmemcached-0.32/tests/output.cmp", "ext/libmemcached-0.32/tests/output.res", "ext/libmemcached-0.32/tests/output2.res", "ext/libmemcached-0.32/tests/plus.cpp", "ext/libmemcached-0.32/tests/r/memcat.res", "ext/libmemcached-0.32/tests/r/memcp.res", "ext/libmemcached-0.32/tests/r/memrm.res", "ext/libmemcached-0.32/tests/r/memslap.res", "ext/libmemcached-0.32/tests/r/memstat.res", "ext/libmemcached-0.32/tests/server.c", "ext/libmemcached-0.32/tests/server.h", "ext/libmemcached-0.32/tests/start.c", "ext/libmemcached-0.32/tests/t/memcat.test", "ext/libmemcached-0.32/tests/t/memcp.test", "ext/libmemcached-0.32/tests/t/memrm.test", "ext/libmemcached-0.32/tests/t/memslap.test", "ext/libmemcached-0.32/tests/t/memstat.test", "ext/libmemcached-0.32/tests/test.c", "ext/libmemcached-0.32/tests/test.h", "ext/libmemcached-0.32/tests/udp.c", "ext/rlibmemcached.i", "ext/rlibmemcached_wrap.c", "lib/memcached.rb", "lib/memcached/auth.rb", "lib/memcached/behaviors.rb", "lib/memcached/exceptions.rb", "lib/memcached/experimental.rb", "lib/memcached/marshal_codec.rb", "lib/memcached/memcached.rb", "lib/memcached/rails.rb", "memcached.gemspec", "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"]
+  s.files = ["BENCHMARKS", "CHANGELOG", "Gemfile", "Gemfile.lock", "LICENSE", "Manifest", "README.rdoc", "Rakefile", "TODO", "ext/extconf-make.rb", "ext/extconf.rb", "ext/libmemcached-0.32/AUTHORS", "ext/libmemcached-0.32/COPYING", "ext/libmemcached-0.32/ChangeLog", "ext/libmemcached-0.32/INSTALL", "ext/libmemcached-0.32/Makefile.am", "ext/libmemcached-0.32/Makefile.in", "ext/libmemcached-0.32/NEWS", "ext/libmemcached-0.32/README", "ext/libmemcached-0.32/THANKS", "ext/libmemcached-0.32/TODO", "ext/libmemcached-0.32/aclocal.m4", "ext/libmemcached-0.32/clients/Makefile.am", "ext/libmemcached-0.32/clients/Makefile.in", "ext/libmemcached-0.32/clients/client_options.h", "ext/libmemcached-0.32/clients/execute.c", "ext/libmemcached-0.32/clients/execute.h", "ext/libmemcached-0.32/clients/generator.c", "ext/libmemcached-0.32/clients/generator.h", "ext/libmemcached-0.32/clients/memcat.c", "ext/libmemcached-0.32/clients/memcp.c", "ext/libmemcached-0.32/clients/memdump.c", "ext/libmemcached-0.32/clients/memerror.c", "ext/libmemcached-0.32/clients/memflush.c", "ext/libmemcached-0.32/clients/memrm.c", "ext/libmemcached-0.32/clients/memslap.c", "ext/libmemcached-0.32/clients/memstat.c", "ext/libmemcached-0.32/clients/utilities.c", "ext/libmemcached-0.32/clients/utilities.h", "ext/libmemcached-0.32/config.h.in", "ext/libmemcached-0.32/config/compile", "ext/libmemcached-0.32/config/config.guess", "ext/libmemcached-0.32/config/config.rpath", "ext/libmemcached-0.32/config/config.sub", "ext/libmemcached-0.32/config/depcomp", "ext/libmemcached-0.32/config/install-sh", "ext/libmemcached-0.32/config/ltmain.sh", "ext/libmemcached-0.32/config/missing", "ext/libmemcached-0.32/configure", "ext/libmemcached-0.32/configure.ac", "ext/libmemcached-0.32/docs/Makefile.am", "ext/libmemcached-0.32/docs/Makefile.in", "ext/libmemcached-0.32/docs/libmemcached.pod", "ext/libmemcached-0.32/docs/libmemcached_examples.pod", "ext/libmemcached-0.32/docs/libmemcachedutil.pod", "ext/libmemcached-0.32/docs/memcached_analyze.pod", "ext/libmemcached-0.32/docs/memcached_auto.pod", "ext/libmemcached-0.32/docs/memcached_behavior.pod", "ext/libmemcached-0.32/docs/memcached_callback.pod", "ext/libmemcached-0.32/docs/memcached_create.pod", "ext/libmemcached-0.32/docs/memcached_delete.pod", "ext/libmemcached-0.32/docs/memcached_dump.pod", "ext/libmemcached-0.32/docs/memcached_flush.pod", "ext/libmemcached-0.32/docs/memcached_flush_buffers.pod", "ext/libmemcached-0.32/docs/memcached_generate_hash_value.pod", "ext/libmemcached-0.32/docs/memcached_get.pod", "ext/libmemcached-0.32/docs/memcached_memory_allocators.pod", "ext/libmemcached-0.32/docs/memcached_pool.pod", "ext/libmemcached-0.32/docs/memcached_quit.pod", "ext/libmemcached-0.32/docs/memcached_sasl.pod", "ext/libmemcached-0.32/docs/memcached_server_st.pod", "ext/libmemcached-0.32/docs/memcached_servers.pod", "ext/libmemcached-0.32/docs/memcached_set.pod", "ext/libmemcached-0.32/docs/memcached_stats.pod", "ext/libmemcached-0.32/docs/memcached_strerror.pod", "ext/libmemcached-0.32/docs/memcached_user_data.pod", "ext/libmemcached-0.32/docs/memcached_verbosity.pod", "ext/libmemcached-0.32/docs/memcached_version.pod", "ext/libmemcached-0.32/docs/memcat.pod", "ext/libmemcached-0.32/docs/memcp.pod", "ext/libmemcached-0.32/docs/memdump.pod", "ext/libmemcached-0.32/docs/memerror.pod", "ext/libmemcached-0.32/docs/memflush.pod", "ext/libmemcached-0.32/docs/memrm.pod", "ext/libmemcached-0.32/docs/memslap.pod", "ext/libmemcached-0.32/docs/memstat.pod", "ext/libmemcached-0.32/libmemcached/Makefile.am", "ext/libmemcached-0.32/libmemcached/Makefile.in", "ext/libmemcached-0.32/libmemcached/byteorder.c", "ext/libmemcached-0.32/libmemcached/common.h", "ext/libmemcached-0.32/libmemcached/crc.c", "ext/libmemcached-0.32/libmemcached/hsieh_hash.c", "ext/libmemcached-0.32/libmemcached/jenkins_hash.c", "ext/libmemcached-0.32/libmemcached/libmemcached.ver", "ext/libmemcached-0.32/libmemcached/libmemcached_probes.d", "ext/libmemcached-0.32/libmemcached/libmemcached_probes.h", "ext/libmemcached-0.32/libmemcached/md5.c", "ext/libmemcached-0.32/libmemcached/memcached.c", "ext/libmemcached-0.32/libmemcached/memcached.h", "ext/libmemcached-0.32/libmemcached/memcached.hpp", "ext/libmemcached-0.32/libmemcached/memcached/README.txt", "ext/libmemcached-0.32/libmemcached/memcached/protocol_binary.h", "ext/libmemcached-0.32/libmemcached/memcached_allocators.c", "ext/libmemcached-0.32/libmemcached/memcached_analyze.c", "ext/libmemcached-0.32/libmemcached/memcached_auto.c", "ext/libmemcached-0.32/libmemcached/memcached_behavior.c", "ext/libmemcached-0.32/libmemcached/memcached_callback.c", "ext/libmemcached-0.32/libmemcached/memcached_configure.h.in", "ext/libmemcached-0.32/libmemcached/memcached_connect.c", "ext/libmemcached-0.32/libmemcached/memcached_constants.h", "ext/libmemcached-0.32/libmemcached/memcached_delete.c", "ext/libmemcached-0.32/libmemcached/memcached_do.c", "ext/libmemcached-0.32/libmemcached/memcached_dump.c", "ext/libmemcached-0.32/libmemcached/memcached_exist.c", "ext/libmemcached-0.32/libmemcached/memcached_exist.h", "ext/libmemcached-0.32/libmemcached/memcached_fetch.c", "ext/libmemcached-0.32/libmemcached/memcached_flush.c", "ext/libmemcached-0.32/libmemcached/memcached_flush_buffers.c", "ext/libmemcached-0.32/libmemcached/memcached_get.c", "ext/libmemcached-0.32/libmemcached/memcached_get.h", "ext/libmemcached-0.32/libmemcached/memcached_hash.c", "ext/libmemcached-0.32/libmemcached/memcached_hosts.c", "ext/libmemcached-0.32/libmemcached/memcached_internal.h", "ext/libmemcached-0.32/libmemcached/memcached_io.c", "ext/libmemcached-0.32/libmemcached/memcached_io.h", "ext/libmemcached-0.32/libmemcached/memcached_key.c", "ext/libmemcached-0.32/libmemcached/memcached_parse.c", "ext/libmemcached-0.32/libmemcached/memcached_pool.h", "ext/libmemcached-0.32/libmemcached/memcached_purge.c", "ext/libmemcached-0.32/libmemcached/memcached_quit.c", "ext/libmemcached-0.32/libmemcached/memcached_response.c", "ext/libmemcached-0.32/libmemcached/memcached_result.c", "ext/libmemcached-0.32/libmemcached/memcached_result.h", "ext/libmemcached-0.32/libmemcached/memcached_sasl.c", "ext/libmemcached-0.32/libmemcached/memcached_sasl.h", "ext/libmemcached-0.32/libmemcached/memcached_server.c", "ext/libmemcached-0.32/libmemcached/memcached_server.h", "ext/libmemcached-0.32/libmemcached/memcached_stats.c", "ext/libmemcached-0.32/libmemcached/memcached_storage.c", "ext/libmemcached-0.32/libmemcached/memcached_storage.h", "ext/libmemcached-0.32/libmemcached/memcached_strerror.c", "ext/libmemcached-0.32/libmemcached/memcached_string.c", "ext/libmemcached-0.32/libmemcached/memcached_string.h", "ext/libmemcached-0.32/libmemcached/memcached_touch.c", "ext/libmemcached-0.32/libmemcached/memcached_touch.h", "ext/libmemcached-0.32/libmemcached/memcached_types.h", "ext/libmemcached-0.32/libmemcached/memcached_util.h", "ext/libmemcached-0.32/libmemcached/memcached_verbosity.c", "ext/libmemcached-0.32/libmemcached/memcached_version.c", "ext/libmemcached-0.32/libmemcached/memcached_watchpoint.h", "ext/libmemcached-0.32/libmemcached/murmur_hash.c", "ext/libmemcached-0.32/libmemcached/visibility.h", "ext/libmemcached-0.32/libmemcachedutil/Makefile.am", "ext/libmemcached-0.32/libmemcachedutil/Makefile.in", "ext/libmemcached-0.32/libmemcachedutil/libmemcachedutil.ver", "ext/libmemcached-0.32/libmemcachedutil/memcached_pool.c", "ext/libmemcached-0.32/m4/ac_cxx_compile_stdcxx_0x.m4", "ext/libmemcached-0.32/m4/ac_cxx_header_stdcxx_98.m4", "ext/libmemcached-0.32/m4/acx_pthread.m4", "ext/libmemcached-0.32/m4/byteorder.m4", "ext/libmemcached-0.32/m4/deprecated.m4", "ext/libmemcached-0.32/m4/enable_utillib.m4", "ext/libmemcached-0.32/m4/extensions.m4", "ext/libmemcached-0.32/m4/hsieh.m4", "ext/libmemcached-0.32/m4/lib-prefix.m4", "ext/libmemcached-0.32/m4/libtool.m4", "ext/libmemcached-0.32/m4/ltoptions.m4", "ext/libmemcached-0.32/m4/ltsugar.m4", "ext/libmemcached-0.32/m4/ltversion.m4", "ext/libmemcached-0.32/m4/lt~obsolete.m4", "ext/libmemcached-0.32/m4/memcached.m4", "ext/libmemcached-0.32/m4/pandora_64bit.m4", "ext/libmemcached-0.32/m4/pandora_canonical.m4", "ext/libmemcached-0.32/m4/pandora_check_compiler_version.m4", "ext/libmemcached-0.32/m4/pandora_check_cxx_standard.m4", "ext/libmemcached-0.32/m4/pandora_enable_dtrace.m4", "ext/libmemcached-0.32/m4/pandora_ensure_gcc_version.m4", "ext/libmemcached-0.32/m4/pandora_have_better_malloc.m4", "ext/libmemcached-0.32/m4/pandora_have_sasl.m4", "ext/libmemcached-0.32/m4/pandora_header_assert.m4", "ext/libmemcached-0.32/m4/pandora_libtool.m4", "ext/libmemcached-0.32/m4/pandora_optimize.m4", "ext/libmemcached-0.32/m4/pandora_shared_ptr.m4", "ext/libmemcached-0.32/m4/pandora_vc_build.m4", "ext/libmemcached-0.32/m4/pandora_warnings.m4", "ext/libmemcached-0.32/m4/pod2man.m4", "ext/libmemcached-0.32/m4/protocol_binary.m4", "ext/libmemcached-0.32/m4/setsockopt.m4", "ext/libmemcached-0.32/m4/visibility.m4", "ext/libmemcached-0.32/support/Makefile.am", "ext/libmemcached-0.32/support/Makefile.in", "ext/libmemcached-0.32/support/libmemcached-fc.spec.in", "ext/libmemcached-0.32/support/libmemcached.pc.in", "ext/libmemcached-0.32/support/libmemcached.spec", "ext/libmemcached-0.32/support/libmemcached.spec.in", "ext/libmemcached-0.32/support/set_benchmark.sh", "ext/libmemcached-0.32/tests/Makefile.am", "ext/libmemcached-0.32/tests/Makefile.in", "ext/libmemcached-0.32/tests/atomsmasher.c", "ext/libmemcached-0.32/tests/function.c", "ext/libmemcached-0.32/tests/ketama_test_cases.h", "ext/libmemcached-0.32/tests/output.cmp", "ext/libmemcached-0.32/tests/output.res", "ext/libmemcached-0.32/tests/output2.res", "ext/libmemcached-0.32/tests/plus.cpp", "ext/libmemcached-0.32/tests/r/memcat.res", "ext/libmemcached-0.32/tests/r/memcp.res", "ext/libmemcached-0.32/tests/r/memrm.res", "ext/libmemcached-0.32/tests/r/memslap.res", "ext/libmemcached-0.32/tests/r/memstat.res", "ext/libmemcached-0.32/tests/server.c", "ext/libmemcached-0.32/tests/server.h", "ext/libmemcached-0.32/tests/start.c", "ext/libmemcached-0.32/tests/t/memcat.test", "ext/libmemcached-0.32/tests/t/memcp.test", "ext/libmemcached-0.32/tests/t/memrm.test", "ext/libmemcached-0.32/tests/t/memslap.test", "ext/libmemcached-0.32/tests/t/memstat.test", "ext/libmemcached-0.32/tests/test.c", "ext/libmemcached-0.32/tests/test.h", "ext/libmemcached-0.32/tests/udp.c", "ext/rlibmemcached.i", "ext/rlibmemcached_wrap.c", "lib/memcached.rb", "lib/memcached/auth.rb", "lib/memcached/behaviors.rb", "lib/memcached/exceptions.rb", "lib/memcached/experimental.rb", "lib/memcached/marshal_codec.rb", "lib/memcached/memcached.rb", "lib/memcached/rails.rb", "memcached.gemspec", "memcached.pem", "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"]
   s.homepage = "http://evan.github.com/evan/memcached/"
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Memcached", "--main", "README.rdoc", "--exclude=ext/bin", "--exclude=ext/libmemcached-.*/(clients|tests)"]
   s.require_paths = ["lib", "ext"]
   s.rubyforge_project = "evan"
-  s.rubygems_version = "1.8.23"
-  s.signing_key = "/Users/eweaver/cloudburst/configuration/gem_certificates/evan_weaver-original-private_key.pem"
+  s.rubygems_version = "2.0.6"
+  s.signing_key = "/Users/eweaver/cloudburst/configuration/gem_certificates/gem-private_key.pem"
   s.summary = "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"]
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rake>, [">= 0"])

data/memcached.pem

@@ -0,0 +1,21 @@
+-----BEGIN CERTIFICATE-----
+MIIDaDCCAlCgAwIBAgIBATANBgkqhkiG9w0BAQUFADA9MQ0wCwYDVQQDDARldmFu
+MRgwFgYKCZImiZPyLGQBGRYIY2xvdWRidXIxEjAQBgoJkiaJk/IsZAEZFgJzdDAe
+Fw0xMzA4MDkxNzIxMjdaFw0xNDA4MDkxNzIxMjdaMD0xDTALBgNVBAMMBGV2YW4x
+GDAWBgoJkiaJk/IsZAEZFghjbG91ZGJ1cjESMBAGCgmSJomT8ixkARkWAnN0MIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5C0Io89nyApnr+PvbNFge9Vs
+yRWAlGBUEMahpXp28VrrfXZT0rAW7JBo4PlCE3jl4nE4dzE6gAdItSycjTosrw7A
+Ir5+xoyl4Vb35adv56TIQQXvNz+BzlqnkAY5JN0CSBRTQb6mxS3hFyD/h4qgDosj
+R2RFVzHqSxCS8xq4Ny8uzOwOi+Xyu4w67fI5JvnPvMxqrlR1eaIQHmxnf76RzC46
+QO5QhufjAYGGXd960XzbQsQyTDUYJzrvT7AdOfiyZzKQykKt8dEpDn+QPjFTnGnT
+QmgJBX5WJN0lHF2l1sbv3gh4Kn1tZu+kTUqeXY6ShAoDTyvZRiFqQdwh8w2lTQID
+AQABo3MwcTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQU+WqJz3xQ
+XSea1hRvvHWcIMgeeC4wGwYDVR0RBBQwEoEQZXZhbkBjbG91ZGJ1ci5zdDAbBgNV
+HRIEFDASgRBldmFuQGNsb3VkYnVyLnN0MA0GCSqGSIb3DQEBBQUAA4IBAQAth/dF
+vuoj+VzNgvwg09SiK+l3PsWP8D1jPaleuHe7KLnNVTOVZBHQmFGW7f/KrzGLFyaC
+WPB4j8tuC2kAA/vLidRQbUGrYP+bpgNi2Mb4+N109oT8+1G8g3q3C4Uo89B6kddd
+DfhnhmIZ+ejeHPrqAzwbp0e0fnCLThYdFaJ8FWNPq4lf6z8/oCtFe/dPOXTFtg+o
+ZfyWyxMwnyaIe59YRB2vUg0jup3e4GLGGDaFacFarxIA69IfqCtzDA+BVqD5xjob
+KBJ2lOaQtQy7Rlul0reUKqOc+LTMoebY/z+cmbYwfhN4tOFskhn1h09KEvsyPXkm
+/ytodP0AZbjpjMXw
+-----END CERTIFICATE-----

data/test/unit/memcached_test.rb

@@ -100,7 +100,7 @@ class MemcachedTest < Test::Unit::TestCase
   def test_options_are_set
     Memcached::DEFAULTS.merge(@noblock_options).each do |key, expected|
       value = @noblock_cache.options[key]
-      unless key == :rcv_timeout or key == :poll_timeout or key == :prefix_key or key == :ketama_weighted
+      unless key == :rcv_timeout or key == :poll_timeout or key == :prefix_key or key == :ketama_weighted or key == :snd_timeout
         assert(expected == value, "#{key} should be #{expected} but was #{value}")
       end
     end

data/test/unit/rails_test.rb

@@ -1,5 +1,6 @@
 require File.expand_path("#{File.dirname(__FILE__)}/../test_helper")
 require 'active_support/duration'
+require 'logger'
 
 class RailsTest < Test::Unit::TestCase
 
@@ -7,7 +8,7 @@ class RailsTest < Test::Unit::TestCase
     @servers = ['127.0.0.1:43042', '127.0.0.1:43043', "#{UNIX_SOCKET_NAME}0"]
     @duration = ActiveSupport::Duration.new(2592000, [[:months, 1]])
     @namespace = 'rails_test'
-    @cache = Memcached::Rails.new(:servers => @servers, :namespace => @namespace)
+    @cache = Memcached::Rails.new(:servers => @servers, :namespace => @namespace, :logger => Logger.new(File.open("/dev/null", "w")))
     @value = OpenStruct.new(:a => 1, :b => 2, :c => GenericClass)
     @marshalled_value = Marshal.dump(@value)
   end
@@ -196,6 +197,24 @@ class RailsTest < Test::Unit::TestCase
     @cache.write key, @value, :expires_in => 123
   end
 
+  def test_write_with_unless_exist
+    @cache.write key, @value, :unless_exist => true
+    result = @cache.get key
+    assert_equal @value, result
+
+    rand_value = "rand-value-#{rand}"
+    @cache.write key, rand_value, :unless_exist => true
+
+    result = @cache.get key
+    assert_equal @value, result
+  end
+
+  def test_write_with_fixnum_and_raw
+    @cache.write key, 1, :raw => true
+    result = @cache.read key, :raw => true
+    assert_equal "1", result
+  end
+
   def test_add_with_duration
     @cache.add key, @value, @duration
     result = @cache.get key
@@ -217,6 +236,19 @@ class RailsTest < Test::Unit::TestCase
     @cache.fetch("y", :foo => :bar){ 1 }
   end
 
+  def test_fetch_when_no_block_given
+    rand_key = "key-#{rand}"
+
+    # gets nil the first time
+    assert_equal nil, @cache.fetch(rand_key)
+
+    # sets value to @value
+    assert_equal @value, @cache.fetch(rand_key) { @value }
+
+    # gets @value
+    assert_equal @value, @cache.fetch(rand_key)
+  end
+
   def test_read_multi
     # empty
     assert_equal({}, @cache.read_multi)
@@ -250,6 +282,42 @@ class RailsTest < Test::Unit::TestCase
     assert_equal nil, @cache.read("x")
   end
 
+  def test_increment
+    rand_key = "rand-key-#{rand}"
+    assert_equal nil, @cache.increment(rand_key)
+
+    start = 10
+    @cache.write rand_key, start.to_s, { :raw => true }
+
+    assert_equal start, @cache.read(rand_key, { :raw => true }).to_i
+    assert_equal start+1, @cache.increment(rand_key)
+
+    assert_equal start+1+5, @cache.increment(rand_key, 5)
+  end
+
+  def test_decrement
+    rand_key = "rand-key-#{rand}"
+    assert_equal nil, @cache.decrement(rand_key)
+
+    start = 10
+    @cache.write rand_key, start.to_s, { :raw => true }
+
+    assert_equal start, @cache.read(rand_key, { :raw => true }).to_i
+    assert_equal start-1, @cache.decrement(rand_key)
+
+    assert_equal start-1-5, @cache.decrement(rand_key, 5)
+  end
+
+  def test_read_with_nil_options
+    @cache.write key, @value
+    assert_equal @value, @cache.read(key, nil)
+  end
+
+  def test_write_with_nil_options
+    @cache.write key, @value, nil
+    assert_equal @value, @cache.read(key)
+  end
+
   private
 
   def key

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: memcached
 version: !ruby/object:Gem::Version
-  version: 1.6.1
-  prerelease: 
+  version: 1.7.0
 platform: ruby
 authors:
 - Evan Weaver
@@ -10,11 +9,11 @@ autorequire:
 bindir: bin
 cert_chain:
 - !binary |-
-  LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURMakNDQWhhZ0F3SUJB
-  Z0lCQURBTkJna3Foa2lHOXcwQkFRVUZBREE5TVEwd0N3WURWUVFEREFSbGRt
+  LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURhRENDQWxDZ0F3SUJB
+  Z0lCQVRBTkJna3Foa2lHOXcwQkFRVUZBREE5TVEwd0N3WURWUVFEREFSbGRt
   RnUKTVJnd0ZnWUtDWkltaVpQeUxHUUJHUllJWTJ4dmRXUmlkWEl4RWpBUUJn
-  b0praWFKay9Jc1pBRVpGZ0p6ZERBZQpGdzB3TnpBNU1UWXhNRE16TURCYUZ3
-  MHdPREE1TVRVeE1ETXpNREJhTUQweERUQUxCZ05WQkFNTUJHVjJZVzR4CkdE
+  b0praWFKay9Jc1pBRVpGZ0p6ZERBZQpGdzB4TXpBNE1Ea3hOekl4TWpkYUZ3
+  MHhOREE0TURreE56SXhNamRhTUQweERUQUxCZ05WQkFNTUJHVjJZVzR4CkdE
   QVdCZ29Ka2lhSmsvSXNaQUVaRmdoamJHOTFaR0oxY2pFU01CQUdDZ21TSm9t
   VDhpeGtBUmtXQW5OME1JSUIKSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4
   QU1JSUJDZ0tDQVFFQTVDMElvODlueUFwbnIrUHZiTkZnZTlWcwp5UldBbEdC
@@ -25,23 +24,24 @@ cert_chain:
   NzZSekM0NgpRTzVRaHVmakFZR0dYZDk2MFh6YlFzUXlURFVZSnpydlQ3QWRP
   Zml5WnpLUXlrS3Q4ZEVwRG4rUVBqRlRuR25UClFtZ0pCWDVXSk4wbEhGMmwx
   c2J2M2doNEtuMXRadStrVFVxZVhZNlNoQW9EVHl2WlJpRnFRZHdoOHcybFRR
-  SUQKQVFBQm96a3dOekFKQmdOVkhSTUVBakFBTUFzR0ExVWREd1FFQXdJRXNE
-  QWRCZ05WSFE0RUZnUVUrV3FKejN4UQpYU2VhMWhSdnZIV2NJTWdlZUM0d0RR
-  WUpLb1pJaHZjTkFRRUZCUUFEZ2dFQkFHTFo3NWpmT0VXOE5zbDI2Q1R0CkpG
-  cld4UVRjUVQvVWxqZWVmVkUzeFlyN2xjOW9RamJxTzNGT3l1ZWQzcVc3VGFO
-  RXRaZlNIb1llVVNNWWJwdzEKWEF3b2NJUHVTUkZER000QitoZ1FHVkR4OFBN
-  R2lKS29tNHFMWGpPNDBVWnNSN1F5Ti91ODY5Vmo0NUxVUm02aApNQmNQZXFD
-  QVNJK1dOcHJqOSt1WmEya21IaWl0ckZxcWZNQk5sbTVJRmJuOVhlWVN0YTlB
-  SFZ2czVRUXFWMm01CmhJUGZMcUN5eHNuL1lnT0d2bzZpd3lRVFd5VHN3YW1h
-  QUMzSFJXWnhJUzFzZm4vU3NxYTdFN29RTWt2NUZBWHIKeDVyS2VQZlhJTmY4
-  WFRKY3prbDlPQkVZZEU5YU5kSnNKcFhEMGFzTGdHVndCSUNTNUJqb2hwNm1p
-  ekpjREMxKwp5WjA9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
-date: 2013-06-11 00:00:00.000000000 Z
+  SUQKQVFBQm8zTXdjVEFKQmdOVkhSTUVBakFBTUFzR0ExVWREd1FFQXdJRXNE
+  QWRCZ05WSFE0RUZnUVUrV3FKejN4UQpYU2VhMWhSdnZIV2NJTWdlZUM0d0d3
+  WURWUjBSQkJRd0VvRVFaWFpoYmtCamJHOTFaR0oxY2k1emREQWJCZ05WCkhS
+  SUVGREFTZ1JCbGRtRnVRR05zYjNWa1luVnlMbk4wTUEwR0NTcUdTSWIzRFFF
+  QkJRVUFBNElCQVFBdGgvZEYKdnVvaitWek5ndndnMDlTaUsrbDNQc1dQOEQx
+  alBhbGV1SGU3S0xuTlZUT1ZaQkhRbUZHVzdmL0tyekdMRnlhQwpXUEI0ajh0
+  dUMya0FBL3ZMaWRSUWJVR3JZUCticGdOaTJNYjQrTjEwOW9UOCsxRzhnM3Ez
+  QzRVbzg5QjZrZGRkCkRmaG5obUlaK2VqZUhQcnFBendicDBlMGZuQ0xUaFlk
+  RmFKOEZXTlBxNGxmNno4L29DdEZlL2RQT1hURnRnK28KWmZ5V3l4TXdueWFJ
+  ZTU5WVJCMnZVZzBqdXAzZTRHTEdHRGFGYWNGYXJ4SUE2OUlmcUN0ekRBK0JW
+  cUQ1eGpvYgpLQkoybE9hUXRReTdSbHVsMHJlVUtxT2MrTFRNb2ViWS96K2Nt
+  Yll3ZmhONHRPRnNraG4xaDA5S0V2c3lQWGttCi95dG9kUDBBWmJqcGpNWHcK
+  LS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
+date: 2013-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -49,7 +49,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -57,7 +56,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -65,7 +63,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -73,7 +70,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: echoe
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -81,7 +77,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -89,7 +84,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -97,7 +91,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -355,6 +348,7 @@ files:
 - lib/memcached/memcached.rb
 - lib/memcached/rails.rb
 - memcached.gemspec
+- memcached.pem
 - test/profile/benchmark.rb
 - test/profile/c_profiler.rb
 - test/profile/exercise.rb
@@ -369,6 +363,7 @@ files:
 - test/unit/rails_test.rb
 homepage: http://evan.github.com/evan/memcached/
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --line-numbers
@@ -383,22 +378,20 @@ require_paths:
 - lib
 - ext
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '1.2'
 requirements: []
 rubyforge_project: evan
-rubygems_version: 1.8.23
+rubygems_version: 2.0.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: An interface to the libmemcached C client.
 test_files:
 - test/test_helper.rb