couchbase 1.3.2-x86-mingw32 → 1.3.3-x86-mingw32

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 64c92cbfdb47cf90b52c5a3ddf6817b0b2f47824
+  data.tar.gz: 52b91ab4cad3bd75ca351b24f34a7cf3b68b7344
+SHA512:
+  metadata.gz: 1cc2d6eaf5fff25fa40b9d0ac9e389bd2cbc3561c6e98355d138c746db7004614d01e3e47ef5c1f2990657cfb68571bba12a19182c091c8c70f045320232fb66
+  data.tar.gz: db81527b9c87d8522e5b4e0c9712fbef06b53628d388757e0f5c60d12e9403afd71b10b4c8311073fbf178f79397b6c86775da28e02c6fb1f961e26dbaf3bfb6

data/.travis.yml

@@ -19,4 +19,4 @@ rvm:
 
 notifications:
   email:
-    - sdk_dev@couchbase.com
+    - sergey@couchbase.com

data/RELEASE_NOTES.markdown

@@ -3,6 +3,56 @@
 This document is a list of user visible feature changes and important
 bugfixes. Do not forget to update this doc in every important patch.
 
+## 1.3.3 (2013-09-12)
+
+* [major] RCBC-134 Allow application to use several connections with
+  thread-local singleton.
+
+* [major] RCBC-135 Fixed invalid memory access which was detected by
+  using 'GC.stress = true' in tests.
+
+* [major] RCBC-141 Initialize event indexes correctly. The plugin
+  didn't trace event callbacks, which might lead to invalid memory
+  access during rebalance, where libcouchbase creates/removes a lot of
+  events because of a fast-changing topology.
+
+* [major] RCBC-137 Add selection options for new IO engines: select
+  and iocp.
+
+* [major] When setting the username field, check for password
+  presence. Fixes segmentation fault in this code:
+
+        Couchbase.connect(:username => "default", :bucket => "default")
+
+* [minor] Allow to determine the version of libcouchbase:
+
+        Couchbase.libcouchbase_version
+
+* [major] RCBC-136 Build shared object for ruby 2.0 on windows. Also
+  fixes build script when using latest rake and rake-compiler.
+
+* [minor] Fix deprecation warning on ruby 2.x. On newer versions it
+  should use `rb_thread_call_without_gvl()`.
+
+        ext/couchbase_ext/multithread_plugin.c: In function ‘loop_run_poll’:
+        ext/couchbase_ext/multithread_plugin.c:772:5: warning: ‘rb_thread_blocking_region’ is deprecated (declared at .../2.0.0-p247-dbg/include/ruby-2.0.0/ruby/intern.h:839) [-Wdeprecated-declarations]
+             rb_thread_blocking_region(loop_blocking_poll, args, RUBY_UBF_PROCESS, NULL);
+
+* [major] Do not try to compile with plugins for Windows platform.
+
+* [major] Force handle to be NULL on `lcb_create()` failure.
+  `lcb_create()` can leave garbage in the pointer even if the call
+  itself failed.  This behaviour could lead to illegal memory access
+  on GC.
+
+* [minor] Remove usage of `RARRAY_PTR` in favor of `rb_ary_entry`.
+  This improves performance significantly on Rubinius and also
+  improves compatibility with future CRuby 2.1 which introduces
+  generational garbage collection. This results in these arrays not
+  having to be rescanned in Rubinius and not marked as shady in
+  RBGCENC in CRuby 2.1.
+  For more discussion, also see: https://bugs.ruby-lang.org/issues/8399
+
 ## 1.3.2 (2013-07-10)
 
 * [major] RCBC-133 Allow application to select the strategy of reading

data/ext/couchbase_ext/arguments.c

@@ -130,14 +130,14 @@ cb_params_touch_parse_arguments(struct cb_params_st *params, int argc, VALUE arg
         rb_raise(rb_eArgError, "must be at least one key");
     }
     if (argc == 1) {
-        VALUE keys = RARRAY_PTR(argv)[0];
+        VALUE keys = rb_ary_entry(argv, 0);
         switch(TYPE(keys)) {
             case T_ARRAY:
                 /* array of keys as a first argument */
                 params->cmd.touch.array = 1;
                 cb_params_touch_alloc(params, RARRAY_LEN(keys));
                 for (ii = 0; ii < params->cmd.touch.num; ++ii) {
-                    cb_params_touch_init_item(params, ii, RARRAY_PTR(keys)[ii], params->cmd.touch.ttl);
+                    cb_params_touch_init_item(params, ii, rb_ary_entry(keys, ii), params->cmd.touch.ttl);
                 }
                 break;
             case T_HASH:
@@ -155,7 +155,7 @@ cb_params_touch_parse_arguments(struct cb_params_st *params, int argc, VALUE arg
         /* just list of arguments */
         cb_params_touch_alloc(params, argc);
         for (ii = 0; ii < params->cmd.touch.num; ++ii) {
-            cb_params_touch_init_item(params, ii, RARRAY_PTR(argv)[ii], params->cmd.touch.ttl);
+            cb_params_touch_init_item(params, ii, rb_ary_entry(argv, ii), params->cmd.touch.ttl);
         }
     }
 }
@@ -215,14 +215,14 @@ cb_params_remove_parse_arguments(struct cb_params_st *params, int argc, VALUE ar
         rb_raise(rb_eArgError, "must be at least one key");
     }
     if (argc == 1) {
-        VALUE keys = RARRAY_PTR(argv)[0];
+        VALUE keys = rb_ary_entry(argv, 0);
         switch(TYPE(keys)) {
             case T_ARRAY:
                 /* array of keys as a first argument */
                 params->cmd.remove.array = 1;
                 cb_params_remove_alloc(params, RARRAY_LEN(keys));
                 for (ii = 0; ii < params->cmd.remove.num; ++ii) {
-                    cb_params_remove_init_item(params, ii, RARRAY_PTR(keys)[ii], params->cmd.remove.cas);
+                    cb_params_remove_init_item(params, ii, rb_ary_entry(keys, ii), params->cmd.remove.cas);
                 }
                 break;
             case T_HASH:
@@ -240,7 +240,7 @@ cb_params_remove_parse_arguments(struct cb_params_st *params, int argc, VALUE ar
         /* just list of arguments */
         cb_params_remove_alloc(params, argc);
         for (ii = 0; ii < params->cmd.remove.num; ++ii) {
-            cb_params_remove_init_item(params, ii, RARRAY_PTR(argv)[ii], params->cmd.remove.cas);
+            cb_params_remove_init_item(params, ii, rb_ary_entry(argv, ii), params->cmd.remove.cas);
         }
     }
 }
@@ -344,7 +344,7 @@ cb_params_store_parse_arguments(struct cb_params_st *params, int argc, VALUE arg
     }
     switch (argc) {
         case 1:
-            keys = RARRAY_PTR(argv)[0];
+            keys = rb_ary_entry(argv, 0);
             switch(TYPE(keys)) {
                 case T_HASH:
                     /* key-value pairs */
@@ -360,7 +360,7 @@ cb_params_store_parse_arguments(struct cb_params_st *params, int argc, VALUE arg
         case 2:
             /* just key and value */
             cb_params_store_alloc(params, 1);
-            cb_params_store_init_item(params, 0, RARRAY_PTR(argv)[0], RARRAY_PTR(argv)[1],
+            cb_params_store_init_item(params, 0, rb_ary_entry(argv, 0), rb_ary_entry(argv, 1),
                     params->cmd.store.flags, params->cmd.store.cas, params->cmd.store.ttl);
             break;
         default:
@@ -475,15 +475,15 @@ cb_params_get_parse_arguments(struct cb_params_st *params, int argc, VALUE argv)
         rb_raise(rb_eArgError, "must be at least one key");
     }
     if (argc == 1) {
-        VALUE keys = RARRAY_PTR(argv)[0];
+        VALUE keys = rb_ary_entry(argv, 0);
         switch(TYPE(keys)) {
             case T_ARRAY:
                 /* array of keys as a first argument */
                 params->cmd.get.array = 1;
                 cb_params_get_alloc(params, RARRAY_LEN(keys));
                 for (ii = 0; ii < params->cmd.get.num; ++ii) {
-                    rb_ary_push(params->cmd.get.keys_ary, RARRAY_PTR(keys)[ii]);
-                    cb_params_get_init_item(params, ii, RARRAY_PTR(keys)[ii], params->cmd.get.ttl);
+                    rb_ary_push(params->cmd.get.keys_ary, rb_ary_entry(keys, ii));
+                    cb_params_get_init_item(params, ii, rb_ary_entry(keys, ii), params->cmd.get.ttl);
                 }
                 break;
             case T_HASH:
@@ -505,8 +505,8 @@ cb_params_get_parse_arguments(struct cb_params_st *params, int argc, VALUE argv)
         /* just list of arguments */
         cb_params_get_alloc(params, argc);
         for (ii = 0; ii < params->cmd.get.num; ++ii) {
-            rb_ary_push(params->cmd.get.keys_ary, RARRAY_PTR(argv)[ii]);
-            cb_params_get_init_item(params, ii, RARRAY_PTR(argv)[ii], params->cmd.get.ttl);
+            rb_ary_push(params->cmd.get.keys_ary, rb_ary_entry(argv, ii));
+            cb_params_get_init_item(params, ii, rb_ary_entry(argv, ii), params->cmd.get.ttl);
         }
     }
 }
@@ -589,14 +589,14 @@ cb_params_arith_parse_arguments(struct cb_params_st *params, int argc, VALUE arg
         rb_raise(rb_eArgError, "must be at least one key");
     }
     if (argc == 1) {
-        VALUE keys = RARRAY_PTR(argv)[0];
+        VALUE keys = rb_ary_entry(argv, 0);
         switch(TYPE(keys)) {
             case T_ARRAY:
                 /* array of keys as a first argument */
                 params->cmd.arith.array = 1;
                 cb_params_arith_alloc(params, RARRAY_LEN(keys));
                 for (ii = 0; ii < params->cmd.arith.num; ++ii) {
-                    cb_params_arith_init_item(params, ii, RARRAY_PTR(keys)[ii], params->cmd.arith.delta);
+                    cb_params_arith_init_item(params, ii, rb_ary_entry(keys, ii), params->cmd.arith.delta);
                 }
                 break;
             case T_HASH:
@@ -613,7 +613,7 @@ cb_params_arith_parse_arguments(struct cb_params_st *params, int argc, VALUE arg
         /* just list of arguments */
         cb_params_arith_alloc(params, argc);
         for (ii = 0; ii < params->cmd.arith.num; ++ii) {
-            cb_params_arith_init_item(params, ii, RARRAY_PTR(argv)[ii], params->cmd.arith.delta);
+            cb_params_arith_init_item(params, ii, rb_ary_entry(argv, ii), params->cmd.arith.delta);
         }
     }
 }
@@ -643,14 +643,14 @@ cb_params_stats_parse_arguments(struct cb_params_st *params, int argc, VALUE arg
     lcb_size_t ii;
 
     if (argc == 1) {
-        VALUE keys = RARRAY_PTR(argv)[0];
+        VALUE keys = rb_ary_entry(argv, 0);
         switch(TYPE(keys)) {
             case T_ARRAY:
                 /* array of keys as a first argument */
                 params->cmd.stats.array = 1;
                 cb_params_stats_alloc(params, RARRAY_LEN(keys));
                 for (ii = 0; ii < params->cmd.stats.num; ++ii) {
-                    cb_params_stats_init_item(params, ii, RARRAY_PTR(keys)[ii]);
+                    cb_params_stats_init_item(params, ii, rb_ary_entry(keys, ii));
                 }
                 break;
             default:
@@ -665,7 +665,7 @@ cb_params_stats_parse_arguments(struct cb_params_st *params, int argc, VALUE arg
         /* just list of arguments */
         cb_params_stats_alloc(params, argc);
         for (ii = 0; ii < params->cmd.stats.num; ++ii) {
-            cb_params_stats_init_item(params, ii, RARRAY_PTR(argv)[ii]);
+            cb_params_stats_init_item(params, ii, rb_ary_entry(argv, ii));
         }
     }
 }
@@ -698,14 +698,14 @@ cb_params_observe_parse_arguments(struct cb_params_st *params, int argc, VALUE a
         rb_raise(rb_eArgError, "must be at least one key");
     }
     if (argc == 1) {
-        VALUE keys = RARRAY_PTR(argv)[0];
+        VALUE keys = rb_ary_entry(argv, 0);
         switch(TYPE(keys)) {
             case T_ARRAY:
                 /* array of keys as a first argument */
                 params->cmd.observe.array = 1;
                 cb_params_observe_alloc(params, RARRAY_LEN(keys));
                 for (ii = 0; ii < params->cmd.observe.num; ++ii) {
-                    cb_params_observe_init_item(params, ii, RARRAY_PTR(keys)[ii]);
+                    cb_params_observe_init_item(params, ii, rb_ary_entry(keys, ii));
                 }
                 break;
             default:
@@ -717,7 +717,7 @@ cb_params_observe_parse_arguments(struct cb_params_st *params, int argc, VALUE a
         /* just list of arguments */
         cb_params_observe_alloc(params, argc);
         for (ii = 0; ii < params->cmd.observe.num; ++ii) {
-            cb_params_observe_init_item(params, ii, RARRAY_PTR(argv)[ii]);
+            cb_params_observe_init_item(params, ii, rb_ary_entry(argv, ii));
         }
     }
 }
@@ -771,7 +771,7 @@ cb_params_unlock_parse_options(struct cb_params_st *params, VALUE options)
 cb_params_unlock_parse_arguments(struct cb_params_st *params, int argc, VALUE argv)
 {
     if (argc == 1) {
-        VALUE keys = RARRAY_PTR(argv)[0];
+        VALUE keys = rb_ary_entry(argv, 0);
         switch(TYPE(keys)) {
             case T_HASH:
                 /* key-cas pairs */
@@ -847,7 +847,7 @@ do_params_build(VALUE ptr)
     VALUE argv = params->args;
 
     /* extract options */
-    if (argc > 1 && TYPE(RARRAY_PTR(argv)[argc-1]) == T_HASH) {
+    if (argc > 1 && TYPE(rb_ary_entry(argv, argc-1)) == T_HASH) {
         opts = rb_ary_pop(argv);
         --argc;
     } else {
@@ -865,7 +865,7 @@ do_params_build(VALUE ptr)
         case cb_cmd_remove:
             params->cmd.remove.quiet = params->bucket->quiet;
             if (argc == 2) {
-                int type = TYPE(RARRAY_PTR(argv)[1]);
+                int type = TYPE(rb_ary_entry(argv, 1));
                 if (type == T_FIXNUM || type == T_BIGNUM) {
                     /* allow form delete("foo", 0xdeadbeef) */
                     --argc;
@@ -906,7 +906,7 @@ do_params_build(VALUE ptr)
             params->cmd.arith.initial = params->bucket->default_arith_init;
             params->cmd.arith.delta = 1;
             params->cmd.arith.ttl = params->bucket->default_ttl;
-            if (argc == 2 && TYPE(RARRAY_PTR(argv)[1]) == T_FIXNUM) {
+            if (argc == 2 && TYPE(rb_ary_entry(argv, 1)) == T_FIXNUM) {
                 /* allow form incr("foo", 1) */
                 --argc;
                 params->cmd.arith.delta = NUM2ULL(rb_ary_pop(argv)) & INT64_MAX;
@@ -926,7 +926,7 @@ do_params_build(VALUE ptr)
         case cb_cmd_unlock:
             params->cmd.unlock.quiet = params->bucket->quiet;
             if (argc == 2) {
-                int type = TYPE(RARRAY_PTR(argv)[1]);
+                int type = TYPE(rb_ary_entry(argv, 1));
                 if (type == T_FIXNUM || type == T_BIGNUM) {
                     /* allow form unlock("foo", 0xdeadbeef) */
                     --argc;

data/ext/couchbase_ext/bucket.c

@@ -97,7 +97,9 @@ cb_bucket_mark(void *ptr)
         rb_gc_mark(bucket->on_error_proc);
         rb_gc_mark(bucket->on_connect_proc);
         rb_gc_mark(bucket->key_prefix_val);
-        st_foreach(bucket->object_space, cb_bucket_mark_object_i, (st_data_t)bucket);
+        if (bucket->object_space) {
+            st_foreach(bucket->object_space, cb_bucket_mark_object_i, (st_data_t)bucket);
+        }
     }
 }
 
@@ -260,7 +262,12 @@ do_scan_connection_options(struct cb_bucket_st *bucket, int argc, VALUE *argv)
             if (arg != Qnil) {
                 if (arg == cb_sym_default) {
                     bucket->engine = cb_sym_default;
-#ifndef _WIN32
+                } else if (arg == cb_sym_select) {
+                    bucket->engine = cb_sym_select;
+#ifdef _WIN32
+                } else if (arg == cb_sym_iocp) {
+                    bucket->engine = cb_sym_iocp;
+#else
                 } else if (arg == cb_sym_libev) {
                     bucket->engine = cb_sym_libev;
                 } else if (arg == cb_sym_libevent) {
@@ -317,11 +324,7 @@ do_connect(struct cb_bucket_st *bucket)
     struct lcb_create_st create_opts;
 
     if (bucket->handle) {
-        lcb_destroy(bucket->handle);
-        lcb_destroy_io_ops(bucket->io);
-        bucket->handle = NULL;
-        bucket->io = NULL;
-        bucket->connected = 0;
+        cb_bucket_disconnect(bucket->self);
     }
 
     {
@@ -331,6 +334,12 @@ do_connect(struct cb_bucket_st *bucket)
 
         if (bucket->engine == cb_sym_libevent) {
             ciops.v.v0.type = LCB_IO_OPS_LIBEVENT;
+        } else if (bucket->engine == cb_sym_select) {
+            ciops.v.v0.type = LCB_IO_OPS_SELECT;
+#ifdef _WIN32
+        } else if (bucket->engine == cb_sym_iocp) {
+            ciops.v.v0.type = LCB_IO_OPS_WINIOCP;
+#endif
         } else if (bucket->engine == cb_sym_libev) {
             ciops.v.v0.type = LCB_IO_OPS_LIBEV;
         } else if (bucket->engine == cb_sym_eventmachine) {
@@ -359,11 +368,12 @@ do_connect(struct cb_bucket_st *bucket)
     create_opts.v.v1.type = bucket->type;
     create_opts.v.v1.host = RTEST(bucket->node_list) ? RSTRING_PTR(bucket-> node_list) : RSTRING_PTR(bucket->authority);
     create_opts.v.v1.user = RTEST(bucket->username) ? RSTRING_PTR(bucket->username) : NULL;
-    create_opts.v.v1.passwd = RTEST(bucket->username) ? RSTRING_PTR(bucket->password) : NULL;
+    create_opts.v.v1.passwd = RTEST(bucket->password) ? RSTRING_PTR(bucket->password) : NULL;
     create_opts.v.v1.bucket = RSTRING_PTR(bucket->bucket);
     create_opts.v.v1.io = bucket->io;
     err = lcb_create(&bucket->handle, &create_opts);
     if (err != LCB_SUCCESS) {
+        bucket->handle = NULL;
         rb_exc_raise(cb_check_error(err, "failed to create libcouchbase instance", Qnil));
     }
     lcb_set_cookie(bucket->handle, bucket);
@@ -388,10 +398,7 @@ do_connect(struct cb_bucket_st *bucket)
     }
     err = lcb_connect(bucket->handle);
     if (err != LCB_SUCCESS) {
-        lcb_destroy(bucket->handle);
-        lcb_destroy_io_ops(bucket->io);
-        bucket->handle = NULL;
-        bucket->io = NULL;
+        cb_bucket_disconnect(bucket->self);
         rb_exc_raise(cb_check_error(err, "failed to connect libcouchbase instance to server", Qnil));
     }
     bucket->exception = Qnil;
@@ -402,10 +409,7 @@ do_connect(struct cb_bucket_st *bucket)
     if (!bucket->async) {
         lcb_wait(bucket->handle);
         if (bucket->exception != Qnil) {
-            lcb_destroy(bucket->handle);
-            lcb_destroy_io_ops(bucket->io);
-            bucket->handle = NULL;
-            bucket->io = NULL;
+            cb_bucket_disconnect(bucket->self);
             rb_exc_raise(bucket->exception);
         }
     }
@@ -484,6 +488,8 @@ cb_bucket_alloc(VALUE klass)
  *   @option options [Symbol] :engine (:default) the IO engine to use
  *     Currently following engines are supported:
  *     :default      :: Built-in engine (multi-thread friendly)
+ *     :select       :: select(2) IO plugin from libcouchbase
+ *     :iocp         :: "I/O Completion Ports" plugin from libcouchbase (windows only)
  *     :libevent     :: libevent IO plugin from libcouchbase (optional)
  *     :libev        :: libev IO plugin from libcouchbase (optional)
  *     :eventmachine :: EventMachine plugin (builtin, but requires EM gem and ruby 1.9+)

data/ext/couchbase_ext/couchbase_ext.c

@@ -73,6 +73,7 @@ ID cb_sym_hostname;
 ID cb_sym_http_request;
 ID cb_sym_increment;
 ID cb_sym_initial;
+ID cb_sym_iocp;
 ID cb_sym_key_prefix;
 ID cb_sym_libev;
 ID cb_sym_libevent;
@@ -97,6 +98,7 @@ ID cb_sym_put;
 ID cb_sym_quiet;
 ID cb_sym_replace;
 ID cb_sym_replica;
+ID cb_sym_select;
 ID cb_sym_send_threshold;
 ID cb_sym_set;
 ID cb_sym_stats;
@@ -183,6 +185,16 @@ VALUE cb_eBucketNotFoundError;     /* LCB_BUCKET_ENOENT = 0x19   */
 VALUE cb_eClientNoMemoryError;     /* LCB_CLIENT_ENOMEM = 0x1a   */
 VALUE cb_eClientTmpFailError;      /* LCB_CLIENT_ETMPFAIL = 0x1b */
 VALUE cb_eBadHandleError;          /* LCB_EBADHANDLE = 0x1c      */
+VALUE cb_eServerBug;               /* LCB_SERVER_BUG = 0x1d      */
+VALUE cb_ePluginVersionMismatch;   /* LCB_PLUGIN_VERSION_MISMATCH = 0x1e */
+VALUE cb_eInvalidHostFormat;       /* LCB_INVALID_HOST_FORMAT = 0x1f     */
+VALUE cb_eInvalidChar;             /* LCB_INVALID_CHAR = 0x20            */
+VALUE cb_eDurabilityTooMany;       /* LCB_DURABILITY_ETOOMANY = 0x21 */
+VALUE cb_eDuplicateCommands;       /* LCB_DUPLICATE_COMMANDS = 0x22 */
+VALUE cb_eNoMatchingServer;        /* LCB_NO_MATCHING_SERVER = 0x23 */
+VALUE cb_eBadEnvironment;          /* LCB_BAD_ENVIRONMENT = 0x24 */
+VALUE cb_eBusy;                    /* LCB_BUSY = 0x25 */
+VALUE cb_eInvalidUsername;         /* LCB_INVALID_USERNAME = 0x26 */
 
 /* Default Strings */
 VALUE cb_vStrDefault;
@@ -198,6 +210,14 @@ cb_intern_string(VALUE ar, const char *str)
     return tmp;
 }
 
+    static VALUE
+cb_libcouchbase_version(VALUE self)
+{
+    const char *ver = lcb_get_version(NULL);
+    (void)self;
+    return STR_NEW_CSTR(ver);
+}
+
 /* Ruby Extension initializer */
     void
 Init_couchbase_ext(void)
@@ -209,6 +229,15 @@ Init_couchbase_ext(void)
 
     cb_mURI = rb_const_get(rb_cObject, rb_intern("URI"));
     cb_mCouchbase = rb_define_module("Couchbase");
+    /* Document-method: libcouchbase_version
+     *
+     * @since 1.3.3
+     *
+     * Version of the libcouchbase library currently loaded
+     * @return [String]
+     */
+    rb_define_singleton_method(cb_mCouchbase, "libcouchbase_version", cb_libcouchbase_version, 0);
+
     cb_mTranscoder = rb_const_get(cb_mCouchbase, rb_intern("Transcoder"));
     cb_mDocument = rb_const_get(cb_mTranscoder, rb_intern("Document"));
     cb_mMarshal = rb_const_get(cb_mTranscoder, rb_intern("Marshal"));
@@ -436,12 +465,108 @@ Init_couchbase_ext(void)
     /* Document-class: Couchbase::Error::DlsymFailed
      * dlsym() failed
      *
-     * Failed to locate the requested cb_symbol in the shared object
+     * Failed to locate the requested symbol in the shared object
      *
      * @since 1.2.0
      */
     cb_eDlsymFailedError = rb_define_class_under(cb_mError, "DlsymFailed", cb_eBaseError);
 
+    /* Document-class: Couchbase::Error::ServerBug
+     * Server Bug
+     *
+     * Unexpected usage of the server protocol, like unexpected
+     * response. If you've received this error code, please record your
+     * steps and file the issue at:
+     *
+     *   http://www.couchbase.com/issues/browse/MB
+     *
+     * @since 1.3.3
+     */
+    cb_eServerBug = rb_define_class_under(cb_mError, "ServerBug", cb_eBaseError);
+
+    /* Document-class: Couchbase::Error::PluginVersionMismatch
+     * Plugin Version Mismatch
+     *
+     * Libcouchbase cannot load the plugin because of version mismatch
+     *
+     * @since 1.3.3
+     */
+    cb_ePluginVersionMismatch = rb_define_class_under(cb_mError, "PluginVersionMismatch", cb_eBaseError);
+
+    /* Document-class: Couchbase::Error::InvalidHostFormat
+     * Invalid Host Format
+     *
+     * The bootstrap hosts list use an invalid/unsupported format
+     *
+     * @since 1.3.3
+     */
+    cb_eInvalidHostFormat = rb_define_class_under(cb_mError, "InvalidHostFormat", cb_eBaseError);
+
+    /* Document-class: Couchbase::Error::InvalidChar
+     * Invalid Character
+     *
+     * Invalid character used in the path component of an URL
+     *
+     * @since 1.3.3
+     */
+    cb_eInvalidChar = rb_define_class_under(cb_mError, "InvalidChar", cb_eBaseError);
+
+    /* Document-class: Couchbase::Error::DurabilityTooMany
+     * Too Many Nodes
+     *
+     * Too many nodes were requested for the observe criteria
+     *
+     * @since 1.3.3
+     */
+    cb_eDurabilityTooMany = rb_define_class_under(cb_mError, "DurabilityTooMany", cb_eBaseError);
+
+    /* Document-class: Couchbase::Error::DuplicateCommands
+     * Duplicate Commands
+     *
+     * The same key was passed multiple times in a command list
+     *
+     * @since 1.3.3
+     */
+    cb_eDuplicateCommands = rb_define_class_under(cb_mError, "DuplicateCommands", cb_eBaseError);
+
+    /* Document-class: Couchbase::Error::NoMatchingServer
+     * No Matching Server
+     *
+     * The config says that there is no server yet at that
+     * position (-1 in the cluster topology map)
+     *
+     * @since 1.3.3
+     */
+    cb_eNoMatchingServer = rb_define_class_under(cb_mError, "NoMatchingServer", cb_eBaseError);
+
+    /* Document-class: Couchbase::Error::BadEnvironment
+     * Busy
+     *
+     * An operation has not yet completed
+     *
+     * @since 1.3.3
+     */
+    cb_eBadEnvironment = rb_define_class_under(cb_mError, "BadEnvironment", cb_eBaseError);
+
+    /* Document-class: Couchbase::Error::Busy
+     * Invalid Character
+     *
+     * Invalid character used in the path component of an URL
+     *
+     * @since 1.3.3
+     */
+    cb_eBusy = rb_define_class_under(cb_mError, "Busy", cb_eBaseError);
+
+    /* Document-class: Couchbase::Error::InvalidUsername
+     * Invalid Username
+     *
+     * Administrator account must not be used to access the data
+     * in the bucket
+     *
+     * @since 1.3.3
+     */
+    cb_eInvalidUsername = rb_define_class_under(cb_mError, "InvalidUsername", cb_eBaseError);
+
     /* Document-class: Couchbase::Error::HTTP
      * HTTP error with status code
      *
@@ -484,7 +609,10 @@ Init_couchbase_ext(void)
      * 0x1a :: LCB_CLIENT_ENOMEM (Out of memory on the client)
      * 0x1b :: LCB_CLIENT_ETMPFAIL (Temporary failure on the client)
      * 0x1c :: LCB_EBADHANDLE (Invalid handle type)
-     *
+     * 0x1d :: LCB_SERVER_BUG (Server bug)
+     * 0x1e :: LCB_PLUGIN_VERSION_MISMATCH (Plugin version mismatch)
+     * 0x1f :: LCB_INVALID_HOST_FORMAT (Invalid host format)
+     * 0x20 :: LCB_INVALID_CHAR (Invalid character)
      *
      * @since 1.0.0
      *
@@ -1189,6 +1317,7 @@ Init_couchbase_ext(void)
     cb_sym_http_request = ID2SYM(rb_intern("http_request"));
     cb_sym_increment = ID2SYM(rb_intern("increment"));
     cb_sym_initial = ID2SYM(rb_intern("initial"));
+    cb_sym_iocp = ID2SYM(rb_intern("iocp"));
     cb_sym_key_prefix = ID2SYM(rb_intern("key_prefix"));
     cb_sym_libev = ID2SYM(rb_intern("libev"));
     cb_sym_libevent = ID2SYM(rb_intern("libevent"));
@@ -1213,6 +1342,7 @@ Init_couchbase_ext(void)
     cb_sym_quiet = ID2SYM(rb_intern("quiet"));
     cb_sym_replace = ID2SYM(rb_intern("replace"));
     cb_sym_replica = ID2SYM(rb_intern("replica"));
+    cb_sym_select = ID2SYM(rb_intern("select"));
     cb_sym_send_threshold = ID2SYM(rb_intern("send_threshold"));
     cb_sym_set = ID2SYM(rb_intern("set"));
     cb_sym_stats = ID2SYM(rb_intern("stats"));

data/ext/couchbase_ext/couchbase_ext.h

@@ -22,6 +22,10 @@
 #include <st.h>
 #endif
 
+#ifdef HAVE_RUBY_THREAD_H
+#include <ruby/thread.h>
+#endif
+
 #include "couchbase_config.h"
 #ifdef HAVE_RB_FIBER_YIELD
 #define BUILD_EVENTMACHINE_PLUGIN
@@ -217,6 +221,7 @@ extern ID cb_sym_hostname;
 extern ID cb_sym_http_request;
 extern ID cb_sym_increment;
 extern ID cb_sym_initial;
+extern ID cb_sym_iocp;
 extern ID cb_sym_key_prefix;
 extern ID cb_sym_libev;
 extern ID cb_sym_libevent;
@@ -241,6 +246,7 @@ extern ID cb_sym_put;
 extern ID cb_sym_quiet;
 extern ID cb_sym_replace;
 extern ID cb_sym_replica;
+extern ID cb_sym_select;
 extern ID cb_sym_send_threshold;
 extern ID cb_sym_set;
 extern ID cb_sym_stats;
@@ -326,6 +332,17 @@ extern VALUE cb_eBucketNotFoundError;     /* LCB_BUCKET_ENOENT = 0x19   */
 extern VALUE cb_eClientNoMemoryError;     /* LCB_CLIENT_ENOMEM = 0x1a   */
 extern VALUE cb_eClientTmpFailError;      /* LCB_CLIENT_ETMPFAIL = 0x1b */
 extern VALUE cb_eBadHandleError;          /* LCB_EBADHANDLE = 0x1c      */
+extern VALUE cb_eServerBug;               /* LCB_SERVER_BUG = 0x1d      */
+extern VALUE cb_ePluginVersionMismatch;   /* LCB_PLUGIN_VERSION_MISMATCH = 0x1e */
+extern VALUE cb_eInvalidHostFormat;       /* LCB_INVALID_HOST_FORMAT = 0x1f     */
+extern VALUE cb_eInvalidChar;             /* LCB_INVALID_CHAR = 0x20            */
+extern VALUE cb_eDurabilityTooMany;       /* LCB_DURABILITY_ETOOMANY = 0x21 */
+extern VALUE cb_eDuplicateCommands;       /* LCB_DUPLICATE_COMMANDS = 0x22 */
+extern VALUE cb_eNoMatchingServer;        /* LCB_NO_MATCHING_SERVER = 0x23 */
+extern VALUE cb_eBadEnvironment;          /* LCB_BAD_ENVIRONMENT = 0x24 */
+extern VALUE cb_eBusy;                    /* LCB_BUSY = 0x25 */
+extern VALUE cb_eInvalidUsername;         /* LCB_INVALID_USERNAME = 0x26 */
+
 
 /* Default Strings */
 extern VALUE cb_vStrDefault;

data/ext/couchbase_ext/extconf.rb

@@ -128,14 +128,14 @@ end
 
 unless try_compile(<<-SRC)
   #include <libcouchbase/couchbase.h>
+  #include <stdio.h>
 
   int main() {
-    lcb_get_replica_cmd_t cmd;
-    cmd.v.v1.strategy = 42;
+    printf("User not found: %d\\n", LCB_INVALID_USERNAME);
     return 0;
   }
   SRC
-  die("You must install libcouchbase >= 2.0.7\nSee http://www.couchbase.com/communities/c/ for more details")
+  die("You must install libcouchbase >= 2.1.3\nSee http://www.couchbase.com/communities/c/ for more details")
 end
 
 have_library("couchbase", "lcb_verify_compiler_setup", "libcouchbase/couchbase.h") # just to add -lcouchbase properly
@@ -151,6 +151,7 @@ have_func("gethrtime")
 have_func("rb_hash_lookup2")
 have_func("rb_thread_fd_select")
 have_func("rb_thread_blocking_region")
+have_func("rb_thread_call_without_gvl")
 have_func("poll", "poll.h")
 have_func("ppoll", "poll.h")
 have_func("rb_fiber_yield")

data/ext/couchbase_ext/get.c

@@ -36,19 +36,23 @@ cb_get_callback(lcb_t handle, const void *cookie, lcb_error_t error, const lcb_g
         }
     }
 
-    flags = ULONG2NUM(resp->v.v0.flags);
-    cas = ULL2NUM(resp->v.v0.cas);
-    raw = STR_NEW((const char*)resp->v.v0.bytes, resp->v.v0.nbytes);
-    val = cb_decode_value(ctx->transcoder, raw, resp->v.v0.flags, ctx->transcoder_opts);
-    if (rb_obj_is_kind_of(val, rb_eStandardError)) {
-        VALUE exc_str = rb_funcall(val, cb_id_to_s, 0);
-        VALUE msg = rb_funcall(rb_mKernel, cb_id_sprintf, 3,
-                rb_str_new2("unable to convert value for key \"%s\": %s"), key, exc_str);
-        ctx->exception = rb_exc_new3(cb_eValueFormatError, msg);
-        rb_ivar_set(ctx->exception, cb_id_iv_operation, cb_sym_get);
-        rb_ivar_set(ctx->exception, cb_id_iv_key, key);
-        rb_ivar_set(ctx->exception, cb_id_iv_inner_exception, val);
-        val = Qnil;
+    if (error == LCB_SUCCESS) {
+        flags = ULONG2NUM(resp->v.v0.flags);
+        cas = ULL2NUM(resp->v.v0.cas);
+        raw = STR_NEW((const char*)resp->v.v0.bytes, resp->v.v0.nbytes);
+        val = cb_decode_value(ctx->transcoder, raw, resp->v.v0.flags, ctx->transcoder_opts);
+        if (rb_obj_is_kind_of(val, rb_eStandardError)) {
+            VALUE exc_str = rb_funcall(val, cb_id_to_s, 0);
+            VALUE msg = rb_funcall(rb_mKernel, cb_id_sprintf, 3,
+                    rb_str_new2("unable to convert value for key \"%s\": %s"), key, exc_str);
+            ctx->exception = rb_exc_new3(cb_eValueFormatError, msg);
+            rb_ivar_set(ctx->exception, cb_id_iv_operation, cb_sym_get);
+            rb_ivar_set(ctx->exception, cb_id_iv_key, key);
+            rb_ivar_set(ctx->exception, cb_id_iv_inner_exception, val);
+            val = Qnil;
+        }
+    } else {
+        val = flags = cas = Qnil;
     }
     if (bucket->async) { /* asynchronous */
         if (ctx->proc != Qnil) {
@@ -291,11 +295,14 @@ cb_bucket_get(int argc, VALUE *argv, VALUE self)
             return rv;  /* return as a hash {key => [value, flags, cas], ...} */
         }
         if (params.cmd.get.num > 1 || params.cmd.get.array) {
-            VALUE *keys_ptr, ret;
+            VALUE keys, ret;
             ret = rb_ary_new();
-            keys_ptr = RARRAY_PTR(params.cmd.get.keys_ary);
+            /* make sure ret is guarded so not invisible in a register
+             * when stack scanning */
+            RB_GC_GUARD(ret);
+            keys = params.cmd.get.keys_ary;
             for (ii = 0; ii < params.cmd.get.num; ++ii) {
-                rb_ary_push(ret, rb_hash_aref(rv, keys_ptr[ii]));
+                rb_ary_push(ret, rb_hash_aref(rv, rb_ary_entry(keys, ii)));
             }
             return ret;  /* return as an array [value1, value2, ...] */
         } else {

data/ext/couchbase_ext/multithread_plugin.c

@@ -433,6 +433,7 @@ callbacks_push(rb_mt_callbacks *callbacks, rb_mt_event *event)
         callbacks->capa = new_capa;
         callbacks->events = new_events;
     }
+    event->loop_index = callbacks->count;
     callbacks->events[callbacks->count] = event;
     callbacks->count++;
 }
@@ -457,6 +458,8 @@ callbacks_run(rb_mt_callbacks *callbacks)
     for(i = 0; i < callbacks->count; i++) {
         rb_mt_event *cb = callbacks->events[i];
         if (cb) {
+            cb->loop_index = -1;
+            callbacks->events[i] = NULL;
             cb->handler(cb->socket, cb->actual_flags, cb->cb_data);
         }
     }
@@ -725,7 +728,7 @@ lp_arg_alloc(lp_arg **args)
     return Data_Make_Struct(rb_cObject, lp_arg, 0, lp_arg_free, *args);
 }
 
-#ifdef HAVE_RB_THREAD_BLOCKING_REGION
+#if defined(HAVE_RB_THREAD_BLOCKING_REGION) || defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL)
     static VALUE
 loop_blocking_poll(void *argp)
 {
@@ -768,7 +771,10 @@ retry:
         args->ts = HRTIME_INFINITY;
     }
 
-#ifdef HAVE_RB_THREAD_BLOCKING_REGION
+
+#if defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL)
+    rb_thread_call_without_gvl((void *(*)(void*))loop_blocking_poll, args, RUBY_UBF_IO, 0);
+#elif defined(HAVE_RB_THREAD_BLOCKING_REGION)
     rb_thread_blocking_region(loop_blocking_poll, args, RUBY_UBF_PROCESS, NULL);
 #else
     if (rb_thread_alone()) {

data/ext/couchbase_ext/utils.c

@@ -235,6 +235,36 @@ cb_check_error_with_status(lcb_error_t rc, const char *msg, VALUE key,
         case LCB_EBADHANDLE:
             klass = cb_eBadHandleError;
             break;
+        case LCB_SERVER_BUG:
+            klass = cb_eServerBug;
+            break;
+        case LCB_PLUGIN_VERSION_MISMATCH:
+            klass = cb_ePluginVersionMismatch;
+            break;
+        case LCB_INVALID_HOST_FORMAT:
+            klass = cb_eInvalidHostFormat;
+            break;
+        case LCB_INVALID_CHAR:
+            klass = cb_eInvalidChar;
+            break;
+        case LCB_DURABILITY_ETOOMANY:
+            klass = cb_eDurabilityTooMany;
+            break;
+        case LCB_DUPLICATE_COMMANDS:
+            klass = cb_eDuplicateCommands;
+            break;
+        case LCB_NO_MATCHING_SERVER:
+            klass = cb_eBadEnvironment;
+            break;
+        case LCB_BAD_ENVIRONMENT:
+            klass = cb_eBadEnvironment;
+            break;
+        case LCB_BUSY:
+            klass = cb_eBusyError;
+            break;
+        case LCB_INVALID_USERNAME:
+            klass = cb_eInvalidUsername;
+            break;
         case LCB_ERROR:
             /* fall through */
         default:
@@ -375,8 +405,8 @@ do_encode(VALUE *args)
     if (RARRAY_LEN(ret) != 2) {
         rb_raise(rb_eArgError, "#dump method of transcoder should return two items");
     }
-    *flags = NUM2ULONG(RARRAY_PTR(ret)[1]);
-    return RARRAY_PTR(ret)[0];
+    *flags = NUM2ULONG(rb_ary_entry(ret, 1));
+    return rb_ary_entry(ret, 0);
 }
 
     static VALUE

data/lib/couchbase.rb

@@ -77,7 +77,7 @@ module Couchbase
 
     # @private the thread local storage
     def thread_storage
-      Thread.current[:couchbase] ||= { :pid => Process.pid }
+      Thread.current[:couchbase] ||= { :pid => Process.pid, :bucket => {} }
     end
 
     # @private resets thread local storage if process ids don't match
@@ -100,10 +100,42 @@ module Couchbase
     # @example
     #   Couchbase.bucket.set("foo", "bar")
     #
+    # @example Set connection options using Hash
+    #   Couchbase.connection_options = {:node_list => ["example.com:8091"]}
+    #   Couchbase.bucket("slot1").set("foo", "bar")
+    #   Couchbase.bucket("slot1").bucket #=> "default"
+    #   Couchbase.connection_options[:bucket] = "test"
+    #   Couchbase.bucket("slot2").bucket #=> "test"
+    #
+    # @example Set connection options using URI
+    #   Couchbase.connection_options = "http://example.com:8091/pools"
+    #   Couchbase.bucket("slot1").set("foo", "bar")
+    #   Couchbase.bucket("slot1").bucket #=> "default"
+    #   Couchbase.connection_options = "http://example.com:8091/pools/buckets/test"
+    #   Couchbase.bucket("slot2").bucket #=> "test"
+    #
+    # @example Use named slots to keep a connection
+    #   Couchbase.connection_options = {
+    #     :node_list => ["example.com", "example.org"],
+    #     :bucket => "users"
+    #   }
+    #   Couchbase.bucket("users").set("john", {"balance" => 0})
+    #   Couchbase.connection_options[:bucket] = "orders"
+    #   Couchbase.bucket("other").set("john:1", {"products" => [42, 66]})
+    #
     # @return [Bucket]
-    def bucket
+    def bucket(name = nil)
       verify_connection!
-      thread_storage[:bucket] ||= connect(connection_options)
+      name ||= case @connection_options
+               when Hash
+                 @connection_options[:bucket]
+               when String
+                 path = URI.parse(@connection_options).path
+                 path[%r(^(/pools/([A-Za-z0-9_.-]+)(/buckets/([A-Za-z0-9_.-]+))?)?), 3] || "default"
+               else
+                 "default"
+               end
+      thread_storage[:bucket][name] ||= connect(connection_options)
     end
 
     # Set a connection instance for current thread
@@ -111,10 +143,12 @@ module Couchbase
     # @since 1.1.0
     #
     # @return [Bucket]
-    def bucket=(connection)
+    def bucket=(connection, name = nil)
       verify_connection!
-      thread_storage[:bucket] = connection
+      name ||= @connection_options && @connection_options[:bucket] || "default"
+      thread_storage[:bucket][name] = connection
     end
+    alias set_bucket bucket=
 
   end
 

data/lib/couchbase/version.rb

@@ -17,5 +17,5 @@
 
 # Couchbase ruby client
 module Couchbase
-  VERSION = "1.3.2"
+  VERSION = "1.3.3"
 end

data/tasks/compile.rake

@@ -22,6 +22,14 @@ def gemspec
   @clean_gemspec ||= eval(File.read(File.expand_path('../../couchbase.gemspec', __FILE__)))
 end
 
+version_router = lambda do |t|
+  File.open(t.name, 'wb') do |f|
+    f.write <<-RUBY
+      require "couchbase/\#{RUBY_VERSION.sub(/\\.\\d+$/, '')}/couchbase_ext"
+    RUBY
+  end
+end
+
 # Setup compile tasks.  Configuration can be passed via ENV.
 # Example:
 #  rake compile with_libcouchbase_include=/opt/couchbase/include
@@ -33,13 +41,14 @@ end
 #
 Rake::ExtensionTask.new("couchbase_ext", gemspec) do |ext|
   ext.cross_compile = true
-  ext.cross_platform = [ENV['HOST'] || "i386-mingw32"]
+  ext.cross_platform = ENV['HOST'] || "i386-mingw32"
   if ENV['RUBY_CC_VERSION']
     ext.lib_dir = "lib/couchbase"
   end
   ext.cross_compiling do |spec|
     spec.files.delete("lib/couchbase/couchbase_ext.so")
     spec.files.push("lib/couchbase_ext.rb", Dir["lib/couchbase/1.{8,9}/couchbase_ext.so"])
+    file "#{ext.tmp_dir}/#{ext.cross_platform}/stage/lib/couchbase_ext.rb", &version_router
   end
 
   CLEAN.include "#{ext.lib_dir}/*.#{RbConfig::CONFIG['DLEXT']}"
@@ -84,12 +93,14 @@ namespace :ports do
   directory "ports"
 
   task :libcouchbase => ["ports"] do
-    recipe = MiniPortile.new "libcouchbase", "2.0.7"
+    recipe = MiniPortile.new "libcouchbase", "2.1.3"
     recipe.files << "http://packages.couchbase.com/clients/c/libcouchbase-#{recipe.version}.tar.gz"
+
     recipe.configure_options.push("--disable-debug",
                                   "--disable-dependency-tracking",
                                   "--disable-couchbasemock",
                                   "--disable-cxx",
+                                  "--disable-plugins",
                                   "--disable-examples",
                                   "--disable-tools")
     recipe.cook
@@ -97,19 +108,13 @@ namespace :ports do
   end
 end
 
-file "lib/couchbase_ext.rb" do
-  File.open("lib/couchbase_ext.rb", 'wb') do |f|
-    f.write <<-RUBY
-      require "couchbase/\#{RUBY_VERSION.sub(/\\.\\d+$/, '')}/couchbase_ext"
-    RUBY
-  end
-end
-
+file "lib/couchbase_ext.rb", &version_router
 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 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")
+  sh("env RUBY_CC_VERSION=2.0.0 RBENV_VERSION=2.0.0-p247 rbenv exec bundle exec rake cross compile")
+  sh("env RUBY_CC_VERSION=1.8.7:1.9.2:2.0.0 RBENV_VERSION=1.9.2-p320 rbenv exec bundle exec rake cross native gem")
 end

data/test/test_bucket.rb

@@ -119,6 +119,12 @@ class TestBucket < MiniTest::Test
   def test_it_raises_error_with_wrong_credentials
     with_mock do |mock|
       assert_raises Couchbase::Error::Auth do
+        Couchbase.new(:hostname => mock.host,
+                      :port => mock.port,
+                      :bucket => 'default',
+                      :password => 'wrong_password')
+      end
+      assert_raises Couchbase::Error::InvalidUsername do
         Couchbase.new(:hostname => mock.host,
                       :port => mock.port,
                       :bucket => 'default',
@@ -130,7 +136,7 @@ class TestBucket < MiniTest::Test
 
   def test_it_unable_to_connect_to_protected_buckets_with_wrong_credentials
     with_mock(:buckets_spec => 'protected:secret') do |mock|
-      assert_raises Couchbase::Error::Auth do
+      assert_raises Couchbase::Error::InvalidUsername do
         Couchbase.new(:hostname => mock.host,
                       :port => mock.port,
                       :bucket => 'protected',
@@ -234,4 +240,11 @@ class TestBucket < MiniTest::Test
     end
   end
 
+  def test_it_doesnt_try_to_destroy_handle_in_case_of_lcb_create_failure
+    assert_raises(Couchbase::Error::InvalidHostFormat) do
+      Couchbase.connect(:hostname => "foobar:baz")
+    end
+    GC.start # make sure it won't touch handle in finalizer
+  end
+
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: couchbase
 version: !ruby/object:Gem::Version
-  version: 1.3.2
-  prerelease: 
+  version: 1.3.3
 platform: x86-mingw32
 authors:
 - Couchbase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-10 00:00:00.000000000 Z
+date: 2013-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yaji
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: connection_pool
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -110,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_portile
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -126,7 +111,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -134,7 +118,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -142,7 +125,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: active_support
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -150,7 +132,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -158,7 +139,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -166,7 +146,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -269,36 +248,30 @@ files:
 - test/test_version.rb
 - lib/couchbase/1.8/couchbase_ext.so
 - lib/couchbase/1.9/couchbase_ext.so
+- lib/couchbase/2.0/couchbase_ext.so
 - lib/couchbase_ext.rb
 homepage: http://couchbase.org
 licenses:
 - ASL-2
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 786073145375983008
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 786073145375983008
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.7
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Couchbase ruby driver
 test_files: []