couchbase 1.1.3-x86-mingw32 → 1.1.4-x86-mingw32

data/HISTORY.markdown

@@ -1,3 +1,9 @@
+## 1.1.4 / 2012-08-30
+
+* RCBC-70 return binary keys using Encoding.external value (thanks to Alex Leverington)
+* Switch to rbenv because RVM doesn't work with tclsh
+* [backport] RCBC-37 Bootstrapping using multiple nodes
+
 ## 1.1.3 / 2012-07-27
 
 * RCBC-59 Replicate flags in Bucket#cas operation

data/ext/couchbase_ext/couchbase_ext.c

@@ -24,6 +24,15 @@
 #include <libcouchbase/couchbase.h>
 #include "couchbase_config.h"
 
+#ifdef HAVE_RUBY_ENCODING_H
+#include "ruby/encoding.h"
+#define STR_NEW(ptr, len) rb_external_str_new((ptr), (len))
+#define STR_NEW_CSTR(str) rb_external_str_new_cstr((str))
+#else
+#define STR_NEW(ptr, len) rb_str_new((ptr), (len))
+#define STR_NEW_CSTR(str) rb_str_new2((str))
+#endif
+
 #ifdef HAVE_STDARG_PROTOTYPES
 #include <stdarg.h>
 #define va_init_list(a,b) va_start(a,b)
@@ -34,9 +43,9 @@
 
 #define debug_object(OBJ) \
     rb_funcall(rb_stderr, rb_intern("print"), 1, rb_funcall(OBJ, rb_intern("object_id"), 0)); \
-    rb_funcall(rb_stderr, rb_intern("print"), 1, rb_str_new2(" ")); \
+    rb_funcall(rb_stderr, rb_intern("print"), 1, STR_NEW_CSTR(" ")); \
     rb_funcall(rb_stderr, rb_intern("print"), 1, rb_funcall(OBJ, rb_intern("class"), 0)); \
-    rb_funcall(rb_stderr, rb_intern("print"), 1, rb_str_new2(" ")); \
+    rb_funcall(rb_stderr, rb_intern("print"), 1, STR_NEW_CSTR(" ")); \
     rb_funcall(rb_stderr, rb_intern("puts"), 1, rb_funcall(OBJ, rb_intern("inspect"), 0));
 
 #define FMT_MASK        0x3
@@ -65,6 +74,7 @@ typedef struct
     VALUE exception;        /* error delivered by error_callback */
     VALUE on_error_proc;    /* is using to deliver errors in async mode */
     VALUE object_space;
+    char *node_list;
 } bucket_t;
 
 typedef struct
@@ -115,6 +125,7 @@ static ID  sym_add,
            sym_increment,
            sym_initial,
            sym_marshal,
+           sym_node_list,
            sym_password,
            sym_plain,
            sym_pool,
@@ -455,7 +466,7 @@ unify_key(VALUE key)
         case T_STRING:
             return key;
         case T_SYMBOL:
-            return rb_str_new2(rb_id2name(SYM2ID(key)));
+            return STR_NEW_CSTR(rb_id2name(SYM2ID(key)));
         default:    /* call #to_str or raise error */
             return StringValue(key);
     }
@@ -563,7 +574,7 @@ storage_callback(libcouchbase_t handle, const void *cookie,
 
     bucket->seqno--;
 
-    k = rb_str_new((const char*)key, nkey);
+    k = STR_NEW((const char*)key, nkey);
     c = cas > 0 ? ULL2NUM(cas) : Qnil;
     switch(operation) {
         case LIBCOUCHBASE_ADD:
@@ -624,7 +635,7 @@ delete_callback(libcouchbase_t handle, const void *cookie,
 
     bucket->seqno--;
 
-    k = rb_str_new((const char*)key, nkey);
+    k = STR_NEW((const char*)key, nkey);
     if (error != LIBCOUCHBASE_KEY_ENOENT || !ctx->quiet) {
         exc = cb_check_error(error, "failed to remove value", k);
         if (exc != Qnil) {
@@ -666,7 +677,7 @@ get_callback(libcouchbase_t handle, const void *cookie,
 
     bucket->seqno--;
 
-    k = rb_str_new((const char*)key, nkey);
+    k = STR_NEW((const char*)key, nkey);
     if (error != LIBCOUCHBASE_KEY_ENOENT || !ctx->quiet) {
         exc = cb_check_error(error, "failed to get value", k);
         if (exc != Qnil) {
@@ -682,7 +693,7 @@ get_callback(libcouchbase_t handle, const void *cookie,
     c = ULL2NUM(cas);
     v = Qnil;
     if (nbytes != 0) {
-        v = decode_value(rb_str_new((const char*)bytes, nbytes), flags, ctx->force_format);
+        v = decode_value(STR_NEW((const char*)bytes, nbytes), flags, ctx->force_format);
         if (v == Qundef) {
             if (ctx->exception != Qnil) {
                 cb_gc_unprotect(bucket, ctx->exception);
@@ -693,7 +704,7 @@ get_callback(libcouchbase_t handle, const void *cookie,
             cb_gc_protect(bucket, ctx->exception);
         }
     } else if (flags_get_format(flags) == sym_plain) {
-        v = rb_str_new2("");
+        v = STR_NEW_CSTR("");
     }
     if (bucket->async) { /* asynchronous */
         if (ctx->proc != Qnil) {
@@ -731,7 +742,7 @@ flush_callback(libcouchbase_t handle, const void* cookie,
     bucket_t *bucket = ctx->bucket;
     VALUE node, success = Qtrue, *rv = ctx->rv, exc, res;
 
-    node = authority ? rb_str_new2(authority) : Qnil;
+    node = authority ? STR_NEW_CSTR(authority) : Qnil;
     exc = cb_check_error(error, "failed to flush bucket", node);
     if (exc != Qnil) {
         rb_ivar_set(exc, id_iv_operation, sym_flush);
@@ -777,7 +788,7 @@ version_callback(libcouchbase_t handle, const void *cookie,
     bucket_t *bucket = ctx->bucket;
     VALUE node, v, *rv = ctx->rv, exc, res;
 
-    node = authority ? rb_str_new2(authority) : Qnil;
+    node = authority ? STR_NEW_CSTR(authority) : Qnil;
     exc = cb_check_error(error, "failed to get version", node);
     if (exc != Qnil) {
         rb_ivar_set(exc, id_iv_operation, sym_flush);
@@ -788,7 +799,7 @@ version_callback(libcouchbase_t handle, const void *cookie,
     }
 
     if (authority) {
-        v = rb_str_new((const char*)bytes, nbytes);
+        v = STR_NEW((const char*)bytes, nbytes);
         if (bucket->async) {    /* asynchronous */
             if (ctx->proc != Qnil) {
                 res = rb_class_new_instance(0, NULL, cResult);
@@ -824,7 +835,7 @@ stat_callback(libcouchbase_t handle, const void* cookie,
     bucket_t *bucket = ctx->bucket;
     VALUE stats, node, k, v, *rv = ctx->rv, exc = Qnil, res;
 
-    node = authority ? rb_str_new2(authority) : Qnil;
+    node = authority ? STR_NEW_CSTR(authority) : Qnil;
     exc = cb_check_error(error, "failed to fetch stats", node);
     if (exc != Qnil) {
         rb_ivar_set(exc, id_iv_operation, sym_stats);
@@ -834,8 +845,8 @@ stat_callback(libcouchbase_t handle, const void* cookie,
         }
     }
     if (authority) {
-        k = rb_str_new((const char*)key, nkey);
-        v = rb_str_new((const char*)bytes, nbytes);
+        k = STR_NEW((const char*)key, nkey);
+        v = STR_NEW((const char*)bytes, nbytes);
         if (bucket->async) {    /* asynchronous */
             if (ctx->proc != Qnil) {
                 res = rb_class_new_instance(0, NULL, cResult);
@@ -876,7 +887,7 @@ touch_callback(libcouchbase_t handle, const void *cookie,
     VALUE k, success, *rv = ctx->rv, exc = Qnil, res;
 
     bucket->seqno--;
-    k = rb_str_new((const char*)key, nkey);
+    k = STR_NEW((const char*)key, nkey);
     if (error != LIBCOUCHBASE_KEY_ENOENT || !ctx->quiet) {
         exc = cb_check_error(error, "failed to touch value", k);
         if (exc != Qnil) {
@@ -922,7 +933,7 @@ arithmetic_callback(libcouchbase_t handle, const void *cookie,
 
     bucket->seqno--;
 
-    k = rb_str_new((const char*)key, nkey);
+    k = STR_NEW((const char*)key, nkey);
     c = cas > 0 ? ULL2NUM(cas) : Qnil;
     o = ctx->arithm > 0 ? sym_increment : sym_decrement;
     exc = cb_check_error(error, "failed to perform arithmetic operation", k);
@@ -1042,7 +1053,7 @@ do_scan_connection_options(bucket_t *bucket, int argc, VALUE *argv)
             uri_obj = rb_funcall(mURI, id_parse, 1, uri);
 
             arg = rb_funcall(uri_obj, id_scheme, 0);
-            if (arg == Qnil || rb_str_cmp(arg, rb_str_new2("http"))) {
+            if (arg == Qnil || rb_str_cmp(arg, STR_NEW_CSTR("http"))) {
                 rb_raise(rb_eArgError, "invalid URI: invalid scheme");
             }
 
@@ -1088,6 +1099,14 @@ do_scan_connection_options(bucket_t *bucket, int argc, VALUE *argv)
             bucket->bucket = strdup(NIL_P(arg) ? "default" : RSTRING_PTR(arg));
         }
         if (TYPE(opts) == T_HASH) {
+            arg = rb_hash_aref(opts, sym_node_list);
+            if (arg != Qnil) {
+                VALUE tt;
+                free(bucket->node_list);
+                Check_Type(arg, T_ARRAY);
+                tt = rb_ary_join(arg, rb_str_new2(";"));
+                bucket->node_list = strdup(StringValueCStr(tt));
+            }
             arg = rb_hash_aref(opts, sym_hostname);
             if (arg != Qnil) {
                 if (bucket->hostname) {
@@ -1191,7 +1210,7 @@ do_connect(bucket_t *bucket)
     if (bucket->io == NULL && err != LIBCOUCHBASE_SUCCESS) {
         rb_exc_raise(cb_check_error(err, "failed to create IO instance", Qnil));
     }
-    bucket->handle = libcouchbase_create(bucket->authority,
+    bucket->handle = libcouchbase_create(bucket->node_list ? bucket-> node_list : bucket->authority,
             bucket->username, bucket->password, bucket->bucket, bucket->io);
     if (bucket->handle == NULL) {
         rb_raise(eLibcouchbaseError, "failed to create libcouchbase instance");
@@ -1258,6 +1277,10 @@ cb_bucket_alloc(VALUE klass)
  *   Initialize bucket using options only.
  *
  *   @param [Hash] options The options for operation for connection
+ *   @option options [Array] :node_list (nil) the list of nodes to connect
+ *     to. If specified it takes precedence over +:host+ option. The list
+ *     must be array of strings in form of host names or host names with
+ *     ports (in first case port 8091 will be used, see examples).
  *   @option options [String] :host ("localhost") the hostname or IP address
  *     of the node
  *   @option options [Fixnum] :port (8091) the port of the managemenent API
@@ -1290,6 +1313,9 @@ cb_bucket_alloc(VALUE klass)
  *   Couchbase.new('http://localhost:8091/pools/default/buckets/protected',
  *                 :username => 'protected', :password => 'secret')
  *
+ * @example Use list of nodes, in case some nodes might be dead
+ *   Couchbase.new(:node_list => ['example.com:8091', 'example.org:8091', 'example.net'])
+ *
  * @return [Bucket]
  */
     static VALUE
@@ -1310,6 +1336,7 @@ cb_bucket_init(int argc, VALUE *argv, VALUE self)
     bucket->on_error_proc = Qnil;
     bucket->timeout = 0;
     bucket->object_space = rb_hash_new();
+    bucket->node_list = NULL;
 
     do_scan_connection_options(bucket, argc, argv);
     do_connect(bucket);
@@ -1569,7 +1596,7 @@ cb_bucket_hostname_get(VALUE self)
             rb_raise(eNoMemoryError, "failed to allocate memory for Bucket");
         }
     }
-    return rb_str_new2(bucket->hostname);
+    return STR_NEW_CSTR(bucket->hostname);
 }
 
 /* Document-method: port
@@ -1602,7 +1629,7 @@ cb_bucket_authority_get(VALUE self)
         rb_raise(eNoMemoryError, "failed to allocate memory for Bucket");
     }
     snprintf(bucket->authority, len, "%s:%u", bucket->hostname, bucket->port);
-    return rb_str_new2(bucket->authority);
+    return STR_NEW_CSTR(bucket->authority);
 }
 
 /* Document-method: bucket
@@ -1612,7 +1639,7 @@ cb_bucket_authority_get(VALUE self)
 cb_bucket_bucket_get(VALUE self)
 {
     bucket_t *bucket = DATA_PTR(self);
-    return rb_str_new2(bucket->bucket);
+    return STR_NEW_CSTR(bucket->bucket);
 }
 
 /* Document-method: pool
@@ -1622,7 +1649,7 @@ cb_bucket_bucket_get(VALUE self)
 cb_bucket_pool_get(VALUE self)
 {
     bucket_t *bucket = DATA_PTR(self);
-    return rb_str_new2(bucket->pool);
+    return STR_NEW_CSTR(bucket->pool);
 }
 
 /* Document-method: username
@@ -1633,7 +1660,7 @@ cb_bucket_pool_get(VALUE self)
 cb_bucket_username_get(VALUE self)
 {
     bucket_t *bucket = DATA_PTR(self);
-    return rb_str_new2(bucket->username);
+    return STR_NEW_CSTR(bucket->username);
 }
 
 /* Document-method: password
@@ -1643,7 +1670,7 @@ cb_bucket_username_get(VALUE self)
 cb_bucket_password_get(VALUE self)
 {
     bucket_t *bucket = DATA_PTR(self);
-    return rb_str_new2(bucket->password);
+    return STR_NEW_CSTR(bucket->password);
 }
 
 /* Document-method: url
@@ -3549,6 +3576,7 @@ Init_couchbase_ext(void)
     sym_increment = ID2SYM(rb_intern("increment"));
     sym_initial = ID2SYM(rb_intern("initial"));
     sym_marshal = ID2SYM(rb_intern("marshal"));
+    sym_node_list = ID2SYM(rb_intern("node_list"));
     sym_password = ID2SYM(rb_intern("password"));
     sym_plain = ID2SYM(rb_intern("plain"));
     sym_pool = ID2SYM(rb_intern("pool"));

data/lib/couchbase/version.rb

@@ -17,5 +17,5 @@
 
 # Couchbase ruby client
 module Couchbase
-  VERSION = "1.1.3"
+  VERSION = "1.1.4"
 end

data/tasks/compile.rake

@@ -95,7 +95,7 @@ namespace :ports do
   end
 
   task :libcouchbase => [:libvbucket] do
-    recipe = MiniPortile.new "libcouchbase", "1.0.4"
+    recipe = MiniPortile.new "libcouchbase", "1.0.6"
     recipe.files << "http://packages.couchbase.com/clients/c/#{recipe.name}-#{recipe.version}.tar.gz"
     recipe.configure_options.push("--disable-debug",
                                   "--disable-dependency-tracking",
@@ -118,7 +118,7 @@ task :cross => ["lib/couchbase_ext.rb", "ports:libcouchbase"]
 
 desc "Package gem for windows"
 task "package:windows" => :package do
-  sh("env RUBY_CC_VERSION=1.8.7 rvm 1.8.7 do bundle exec rake cross compile")
-  sh("env RUBY_CC_VERSION=1.9.2 rvm 1.9.2 do bundle exec rake cross compile")
-  sh("env RUBY_CC_VERSION=1.8.7:1.9.2 rvm 1.9.2 do bundle exec rake cross native gem")
+  sh("env RUBY_CC_VERSION=1.8.7 RBENV_VERSION=1.8.7-p370 rbenv exec bundle exec rake cross compile")
+  sh("env RUBY_CC_VERSION=1.9.2 RBENV_VERSION=1.9.2-p320 rbenv exec bundle exec rake cross compile")
+  sh("env RUBY_CC_VERSION=1.8.7:1.9.2 RBENV_VERSION=1.9.2-p320 rbenv exec bundle exec rake cross native gem")
 end

data/tasks/test.rake

@@ -19,7 +19,7 @@ require 'rake/testtask'
 require 'rake/clean'
 
 rule 'test/CouchbaseMock.jar' do |task|
-  jar_path = "0.5-SNAPSHOT/CouchbaseMock-0.5-20120222.060643-15.jar"
+  jar_path = "0.5-SNAPSHOT/CouchbaseMock-0.5-20120726.220757-19.jar"
   sh %{wget -q -O test/CouchbaseMock.jar http://files.couchbase.com/maven2/org/couchbase/mock/CouchbaseMock/#{jar_path}}
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: couchbase
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
   prerelease: 
 platform: x86-mingw32
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-27 00:00:00.000000000 Z
+date: 2012-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
@@ -200,7 +200,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4465124616763901635
+      hash: -2223779579395876074
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -209,10 +209,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4465124616763901635
+      hash: -2223779579395876074
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Couchbase ruby driver