memcache 1.2.9 → 1.2.10

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :build: 
 :minor: 2
-:patch: 9
+:patch: 10
 :major: 1

data/ext/native_server.c

@@ -131,8 +131,8 @@ static VALUE mc_initialize(VALUE self, VALUE opts) {
     char* server;
     int i;
 
-    for (i = 0; i < RARRAY(servers_aryv)->len; i++) {
-      server    = StringValuePtr(RARRAY(servers_aryv)->ptr[i]);
+    for (i = 0; i < RARRAY_LEN(servers_aryv); i++) {
+      server    = StringValuePtr(RARRAY_PTR(servers_aryv)[i]);
       memcached_server_push(mc, memcached_servers_parse(server));
     }
   } else {
@@ -153,6 +153,12 @@ static VALUE mc_initialize(VALUE self, VALUE opts) {
   return self;
 }
 
+#ifdef RUBY_19
+#define RSTRING_SET_LEN(str, newlen) (rb_str_set_len(str, new_len))
+#else
+#define RSTRING_SET_LEN(str, newlen) (RSTRING(str)->len = new_len)
+#endif
+
 static VALUE escape_key(VALUE key, bool* escaped) {
   char*    str = RSTRING_PTR(key);
   uint16_t len = RSTRING_LEN(key);
@@ -170,7 +176,7 @@ static VALUE escape_key(VALUE key, bool* escaped) {
   } else {
     if (escaped) *escaped = true;
     key = rb_str_buf_new(new_len);
-    RSTRING(key)->len = new_len;
+    RSTRING_SET_LEN(key, new_len);
     new_str = RSTRING_PTR(key);
 
     for (i = 0, j = 0; i < len; i++, j++) {
@@ -209,7 +215,7 @@ static VALUE unescape_key(const char* str, uint16_t len) {
     key = rb_str_new(str, len);
   } else {
     key = rb_str_buf_new(new_len);
-    RSTRING(key)->len = new_len;
+    RSTRING_SET_LEN(key, new_len);
     new_str = RSTRING_PTR(key);
 
     for (i = 0, j = 0; i < len; j++, i++) {
@@ -279,8 +285,8 @@ static VALUE mc_get(int argc, VALUE *argv, VALUE self) {
 
     key_strings = (const char**) malloc(num_keys * sizeof(char *));
     key_lengths = (size_t *) malloc(num_keys * sizeof(size_t));
-    for (i = 0; i < RARRAY(keys)->len; i++) {
-      key = RARRAY(keys)->ptr[i];
+    for (i = 0; i < RARRAY_LEN(keys); i++) {
+      key = RARRAY_PTR(keys)[i];
       if (!use_binary(mc)) key = escape_key(key, &escaped);
 
       key_lengths[i] = RSTRING_LEN(key);

data/lib/memcache.rb

@@ -240,9 +240,7 @@ class Memcache
 
   def add_or_get(key, value, opts = {})
     # Try to add, but if that fails, get the existing value.
-    add(key, value, opts)
-  rescue Memcache::Error
-    get(key)
+    add(key, value, opts) || get(key)
   end
 
   def get_some(keys, opts = {})

data/memcache.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{memcache}
-  s.version = "1.2.9"
+  s.version = "1.2.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Balthrop"]
-  s.date = %q{2010-04-05}
+  s.date = %q{2010-04-12}
   s.description = %q{Ruby client for memcached supporting advanced protocol features and pluggable architecture.}
   s.email = %q{code@justinbalthrop.com}
   s.extensions = ["ext/extconf.rb"]

data/test/memcache_test.rb

@@ -112,6 +112,14 @@ class MemcacheTest < Test::Unit::TestCase
     end
   end
 
+  def test_add_or_get
+    100.times do |i|
+      assert_equal [i, :foo], m.add_or_get("FOO#{i}", [i, :foo])
+      assert_equal nil,       m.add("FOO#{i}", [i, :bar])
+      assert_equal [i, :foo], m.add_or_get("FOO#{i}", [i, :baz])
+    end
+  end
+
   def test_update
     100.times do |i|
       m.set("foo#{i}", [:foo, i])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: memcache
 version: !ruby/object:Gem::Version 
-  version: 1.2.9
+  version: 1.2.10
 platform: ruby
 authors: 
 - Justin Balthrop
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-05 00:00:00 -07:00
+date: 2010-04-12 00:00:00 -07:00
 default_executable: 
 dependencies: []