couchbase 1.3.6-x64-mingw32 → 1.3.7-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b37e03139cd0eb3cc18aeaae12b56585dde1de9f
-  data.tar.gz: e55f359b8736d406cbc6da38cd2e5add4de7e83b
+  metadata.gz: 1de56ffd293cb69e906a419a389ce44459714444
+  data.tar.gz: 85f537b39859c79ed90a7a6b99d6391aa2244d49
 SHA512:
-  metadata.gz: 5edf07f1692b79c790c4f7405ea29baccf4e8772f06de4761573b46726cccc66aa7593560834d1cc4ba7371e867af5b958c29dcaa2c30484a2dab70ae8315c0c
-  data.tar.gz: 12e56e6a11695b1f436e6f302da15b656b293d1ffefb72b8ab8818d43db39cdda0665c2676e50077e2b724a0d61baaba81c13f1e937acf753edb35806f90e188
+  metadata.gz: e35d64f29cec9f3a48fb12938ea898323fe37dd8a83a5cd93e6024eab73fe05b487a8fe2373f4d03d441068e3ef26370ec8e0aecae4b16d9febdfada4e645d1b
+  data.tar.gz: fda9011f85ea84953a28f43665fe7ad3391010928b60899be9c313788fc83a8b5d4b951e5d6a1bf9d6b8385ecbead5a540ce4e085ae9d8eb770e8fa9913cd868

data/RELEASE_NOTES.markdown

@@ -3,6 +3,59 @@
 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.7 (2014-04-18)
+
+* [major] Allow the selection of bootstrap providers. Since libcouchbase
+  2.3.0 there is a new bootstrapping transport available: Cluster
+  Configuration Carrier Publication (CCCP). It is more efficient way
+  to keep cluster configuration up to date using Carrier Publication
+  instead of HTTP connection.
+
+        nodes = ["example.com", "example.org"]
+        Couchbase.connect(node_list: nodes, bootstrap_transports: [:cccp, :http])
+
+  Read more about it here:
+  http://www.couchbase.com/wiki/display/couchbase/Cluster+Configuration+Carrier+Publication
+
+* [major] RCBC-168 An experimental DNS SRV helper for connection
+  constructor. The DNS SRV records need to be configured on a reachable
+  DNS server. An example configuration could look like the following
+  (note that the service ids might change):
+
+        _cbmcd._tcp.example.com.  0  IN  SRV  20  0  11210 node2.example.com.
+        _cbmcd._tcp.example.com.  0  IN  SRV  10  0  11210 node1.example.com.
+        _cbmcd._tcp.example.com.  0  IN  SRV  30  0  11210 node3.example.com.
+
+        _cbhttp._tcp.example.com.  0  IN  SRV  20  0  8091 node2.example.com.
+        _cbhttp._tcp.example.com.  0  IN  SRV  10  0  8091 node1.example.com.
+        _cbhttp._tcp.example.com.  0  IN  SRV  30  0  8091 node3.example.com.
+
+  Now if "example.com" is passed in as the argument, the three nodes
+  configured will be parsed and put in the returned URI list. Note
+  that the priority is respected (in this example, node1 will be the
+  first one in the list, followed by node2 and node3). As of now,
+  weighting is not supported. This is how it could be used to
+  bootstrap the connection:
+
+        transport = :http
+        nodes = Couchbase::DNS.locate('example.com', transport)
+        if nodes.empty?
+          nodes = ["example.com:8091"]
+        end
+        Couchbase.connect(node_list: nodes, bootstrap_transports: [transport])
+
+  NOTE: This is experiemental and subject to change at any time. Watch
+  the release notes for changes in future releases.
+
+* [major] RCBC-166 Fix a crash with eventmachine. In eventmachine event
+  handlers are separated and run seprately and in the following order:
+  [READ, WRITE]. So it was possible to cancel WRITE event handler from
+  the READ handler which cause crash when the reactor run it in next
+  turn.
+
+* [minor] Fixed a typo which doesn't allow to use bundler in the project
+  directory.
+
 ## 1.3.6 (2014-02-17)
 
 * [major] Fix linkage issue which blocks library installation on

data/couchbase.gemspec

@@ -44,6 +44,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rake-compiler', '~> 0.7', '>= 0.7.5'
   s.add_development_dependency 'mini_portile', '~> 0.5', '>= 0.5.2'
   s.add_development_dependency 'yajl-ruby', '~> 1.1', '>= 1.1.0'
-  s.add_development_dependency 'active_support'
+  s.add_development_dependency 'activesupport'
   s.add_development_dependency 'eventmachine'
+  s.add_development_dependency 'em-synchrony'
 end

data/ext/couchbase_ext/bucket.c

@@ -99,6 +99,8 @@ 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);
+        rb_gc_mark(bucket->node_list);
+        rb_gc_mark(bucket->bootstrap_transports);
         if (bucket->object_space) {
             st_foreach(bucket->object_space, cb_bucket_mark_object_i, (st_data_t)bucket);
         }
@@ -172,6 +174,11 @@ do_scan_connection_options(struct cb_bucket_st *bucket, int argc, VALUE *argv)
                 bucket->node_list = rb_ary_join(arg, STR_NEW_CSTR(";"));
                 rb_str_freeze(bucket->node_list);
             }
+            arg = rb_hash_aref(opts, cb_sym_bootstrap_transports);
+            if (arg != Qnil) {
+                Check_Type(arg, T_ARRAY);
+                bucket->bootstrap_transports = arg;
+            }
             arg = rb_hash_aref(opts, cb_sym_hostname);
             if (arg != Qnil) {
                 bucket->hostname = rb_str_dup_frozen(StringValue(arg));
@@ -325,6 +332,11 @@ do_connect(struct cb_bucket_st *bucket)
 {
     lcb_error_t err;
     struct lcb_create_st create_opts;
+    lcb_config_transport_t transports[3] = {
+        LCB_CONFIG_TRANSPORT_HTTP,
+        LCB_CONFIG_TRANSPORT_LIST_END,
+        LCB_CONFIG_TRANSPORT_LIST_END
+    };
 
     if (bucket->handle) {
         cb_bucket_disconnect(bucket->self);
@@ -367,13 +379,28 @@ do_connect(struct cb_bucket_st *bucket)
     }
 
     memset(&create_opts, 0, sizeof(struct lcb_create_st));
-    create_opts.version = 1;
-    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->password) ? RSTRING_PTR(bucket->password) : NULL;
-    create_opts.v.v1.bucket = RSTRING_PTR(bucket->bucket);
-    create_opts.v.v1.io = bucket->io;
+    create_opts.version = 2;
+    create_opts.v.v2.type = bucket->type;
+    create_opts.v.v2.host = RTEST(bucket->node_list) ? RSTRING_PTR(bucket-> node_list) : RSTRING_PTR(bucket->authority);
+    create_opts.v.v2.user = RTEST(bucket->username) ? RSTRING_PTR(bucket->username) : NULL;
+    create_opts.v.v2.passwd = RTEST(bucket->password) ? RSTRING_PTR(bucket->password) : NULL;
+    create_opts.v.v2.bucket = RSTRING_PTR(bucket->bucket);
+    create_opts.v.v2.io = bucket->io;
+    if (RTEST(bucket->bootstrap_transports) && RARRAY_LEN(bucket->bootstrap_transports) > 0) {
+        int i;
+        for (i = 0; i < 2 && i < RARRAY_LEN(bucket->bootstrap_transports); ++i) {
+            VALUE transport_sym = rb_ary_entry(bucket->bootstrap_transports, i);
+            if (transport_sym == cb_sym_cccp) {
+                transports[i] = LCB_CONFIG_TRANSPORT_CCCP;
+            } else if (transport_sym == cb_sym_http) {
+                transports[i] = LCB_CONFIG_TRANSPORT_HTTP;
+            } else {
+                transports[i] = LCB_CONFIG_TRANSPORT_LIST_END;
+                break;
+            }
+        }
+    }
+    create_opts.v.v2.transports = transports;
     err = lcb_create(&bucket->handle, &create_opts);
     if (err != LCB_SUCCESS) {
         bucket->handle = NULL;
@@ -501,6 +528,17 @@ cb_bucket_alloc(VALUE klass)
  *     IO interaction will be occured only when {Couchbase::Bucket#run}
  *     called. See {Couchbase::Bucket#on_connect} to hook your code
  *     after the instance will be connected.
+ *   @option options [Array] :bootstrap_transports (nil) the list of
+ *     bootrap transport mechanisms the library should try during
+ *     initial connection and also when cluster changes its
+ *     topology. When +nil+ passed it will fallback to best accessible
+ *     option. The order of the array elements does not matter at the
+ *     momemnt. Currently following values are supported:
+ *     :http :: Previous default protocol, which involves open HTTP stream
+ *     :cccp :: Cluster Configutration Carrier Publication: new binary
+ *              protocol for efficient delivery of cluster
+ *              configuration changes to the clients. Read more at
+ *              http://www.couchbase.com/wiki/display/couchbase/Cluster+Configuration+Carrier+Publication
  *
  * @example Initialize connection using default options
  *   Couchbase.new
@@ -551,6 +589,7 @@ cb_bucket_init(int argc, VALUE *argv, VALUE self)
     bucket->environment = cb_sym_production;
     bucket->key_prefix_val = Qnil;
     bucket->node_list = Qnil;
+    bucket->bootstrap_transports = Qnil;
     bucket->object_space = st_init_numtable();
     bucket->destroying = 0;
     bucket->connected = 0;
@@ -589,7 +628,7 @@ cb_bucket_init_copy(VALUE copy, VALUE orig)
     copy_b = DATA_PTR(copy);
     orig_b = DATA_PTR(orig);
 
-    copy_b->self = copy_b->self;
+    copy_b->self = copy;
     copy_b->port = orig_b->port;
     copy_b->authority = orig_b->authority;
     copy_b->hostname = orig_b->hostname;
@@ -613,6 +652,15 @@ cb_bucket_init_copy(VALUE copy, VALUE orig)
     if (orig_b->on_connect_proc != Qnil) {
         copy_b->on_connect_proc = rb_funcall(orig_b->on_connect_proc, cb_id_dup, 0);
     }
+    if (orig_b->key_prefix_val != Qnil) {
+        copy_b->key_prefix_val = rb_funcall(orig_b->key_prefix_val, cb_id_dup, 0);
+    }
+    if (orig_b->node_list != Qnil) {
+        copy_b->node_list = rb_funcall(orig_b->node_list, cb_id_dup, 0);
+    }
+    if (orig_b->bootstrap_transports != Qnil) {
+        copy_b->bootstrap_transports = rb_funcall(orig_b->bootstrap_transports, cb_id_dup, 0);
+    }
     copy_b->key_prefix_val = orig_b->key_prefix_val;
     copy_b->object_space = st_init_numtable();
     copy_b->destroying = 0;
@@ -1164,6 +1212,22 @@ cb_bucket_inspect(VALUE self)
             (bucket->handle && bucket->connected) ? "true" : "false",
             bucket->timeout);
     rb_str_buf_cat2(str, buf);
+    if (bucket->handle && bucket->connected) {
+        lcb_config_transport_t type;
+        rb_str_buf_cat2(str, ", bootstrap_transport=");
+        lcb_cntl(bucket->handle, LCB_CNTL_GET, LCB_CNTL_CONFIG_TRANSPORT, &type);
+        switch (type) {
+        case LCB_CONFIG_TRANSPORT_HTTP:
+            rb_str_buf_cat2(str, ":http");
+            break;
+        case LCB_CONFIG_TRANSPORT_CCCP:
+            rb_str_buf_cat2(str, ":cccp");
+            break;
+        default:
+            rb_str_buf_cat2(str, "<unknown>");
+            break;
+        }
+    }
     if (RTEST(bucket->key_prefix_val)) {
         rb_str_buf_cat2(str, ", key_prefix=");
         rb_str_append(str, rb_inspect(bucket->key_prefix_val));

data/ext/couchbase_ext/couchbase_ext.c

@@ -41,8 +41,10 @@ ID cb_sym_append;
 ID cb_sym_assemble_hash;
 ID cb_sym_async;
 ID cb_sym_body;
+ID cb_sym_bootstrap_transports;
 ID cb_sym_bucket;
 ID cb_sym_cas;
+ID cb_sym_cccp;
 ID cb_sym_chunked;
 ID cb_sym_cluster;
 ID cb_sym_connect;
@@ -70,6 +72,7 @@ ID cb_sym_format;
 ID cb_sym_found;
 ID cb_sym_get;
 ID cb_sym_hostname;
+ID cb_sym_http;
 ID cb_sym_http_request;
 ID cb_sym_increment;
 ID cb_sym_initial;
@@ -1286,8 +1289,10 @@ Init_couchbase_ext(void)
     cb_sym_assemble_hash = ID2SYM(rb_intern("assemble_hash"));
     cb_sym_async = ID2SYM(rb_intern("async"));
     cb_sym_body = ID2SYM(rb_intern("body"));
+    cb_sym_bootstrap_transports = ID2SYM(rb_intern("bootstrap_transports"));
     cb_sym_bucket = ID2SYM(rb_intern("bucket"));
     cb_sym_cas = ID2SYM(rb_intern("cas"));
+    cb_sym_cccp = ID2SYM(rb_intern("cccp"));
     cb_sym_chunked = ID2SYM(rb_intern("chunked"));
     cb_sym_cluster = ID2SYM(rb_intern("cluster"));
     cb_sym_connect = ID2SYM(rb_intern("connect"));
@@ -1314,6 +1319,7 @@ Init_couchbase_ext(void)
     cb_sym_found = ID2SYM(rb_intern("found"));
     cb_sym_get = ID2SYM(rb_intern("get"));
     cb_sym_hostname = ID2SYM(rb_intern("hostname"));
+    cb_sym_http = ID2SYM(rb_intern("http"));
     cb_sym_http_request = ID2SYM(rb_intern("http_request"));
     cb_sym_increment = ID2SYM(rb_intern("increment"));
     cb_sym_initial = ID2SYM(rb_intern("initial"));

data/ext/couchbase_ext/couchbase_ext.h

@@ -116,6 +116,7 @@ struct cb_bucket_st
     VALUE environment;      /* sym_development or sym_production */
     VALUE key_prefix_val;
     VALUE node_list;
+    VALUE bootstrap_transports;
     st_table *object_space;
     char destroying;
     char async_disconnect_hook_set;
@@ -189,8 +190,10 @@ extern ID cb_sym_append;
 extern ID cb_sym_assemble_hash;
 extern ID cb_sym_async;
 extern ID cb_sym_body;
+extern ID cb_sym_bootstrap_transports;
 extern ID cb_sym_bucket;
 extern ID cb_sym_cas;
+extern ID cb_sym_cccp;
 extern ID cb_sym_chunked;
 extern ID cb_sym_cluster;
 extern ID cb_sym_connect;
@@ -218,6 +221,7 @@ extern ID cb_sym_format;
 extern ID cb_sym_found;
 extern ID cb_sym_get;
 extern ID cb_sym_hostname;
+extern ID cb_sym_http;
 extern ID cb_sym_http_request;
 extern ID cb_sym_increment;
 extern ID cb_sym_initial;

data/ext/couchbase_ext/eventmachine_plugin.c

@@ -51,6 +51,8 @@ struct rb_em_event {
     lcb_uint32_t usec;
     short canceled;
     short current_flags;
+    short in_read_handler;
+    short deferred_write_reset;
     VALUE self;
     rb_em_loop *loop;
 };
@@ -140,7 +142,9 @@ rb_em_socket_notify_readable(VALUE self)
 
     if (RTEST(event)) {
         Data_Get_Struct(event, rb_em_event, ev);
+        ev->in_read_handler = 1;
         rb_em_event_run_callback(ev, LCB_READ_EVENT);
+        ev->in_read_handler = 0;
     } else {
         rb_funcall_0(self, cb_id_detach);
     }
@@ -157,6 +161,10 @@ rb_em_socket_notify_writable(VALUE self)
     if (RTEST(event)) {
         Data_Get_Struct(event, rb_em_event, ev);
         rb_em_event_run_callback(ev, LCB_WRITE_EVENT);
+        if (ev->deferred_write_reset) {
+            ev->deferred_write_reset = 0;
+            rb_funcall_1(ev->holder, cb_id_set_notify_writable, Qfalse);
+        }
     } else {
         rb_funcall_0(self, cb_id_detach);
     }
@@ -278,8 +286,12 @@ lcb_io_update_event(struct lcb_io_opt_st *iops,
     ev->handler = handler;
 
     rb_funcall_1(ev->holder, cb_id_set_notify_readable, (flags & LCB_READ_EVENT) ? Qtrue : Qfalse);
-    rb_funcall_1(ev->holder, cb_id_set_notify_writable, (flags & LCB_WRITE_EVENT) ? Qtrue : Qfalse);
-
+    /* it is safe to reset WRITE event only from WRITE handler */
+    if (ev->in_read_handler && (flags & LCB_WRITE_EVENT) == 0 && RTEST(rb_funcall_0(ev->holder, cb_id_notify_writable_p))) {
+        ev->deferred_write_reset = 1;
+    } else {
+        rb_funcall_1(ev->holder, cb_id_set_notify_writable, (flags & LCB_WRITE_EVENT) ? Qtrue : Qfalse);
+    }
     (void)iops;
     return 0;
 }

data/ext/couchbase_ext/extconf.rb

@@ -132,14 +132,14 @@ def die(message)
   abort
 end
 
-install_notice = "You must install libcouchbase >= 2.1.3\nSee http://www.couchbase.com/communities/c/ for more details"
+install_notice = "You must install libcouchbase >= 2.3.0\nSee http://www.couchbase.com/communities/c/ for more details"
 
 unless try_compile(<<-SRC)
   #include <libcouchbase/couchbase.h>
   #include <stdio.h>
 
   int main() {
-    printf("User not found: %d\\n", LCB_INVALID_USERNAME);
+    printf("CCCP transport flag is: %d\\n", LCB_CONFIG_TRANSPORT_CCCP);
     return 0;
   }
   SRC

data/ext/couchbase_ext/utils.c

@@ -254,7 +254,7 @@ cb_check_error_with_status(lcb_error_t rc, const char *msg, VALUE key,
             klass = cb_eDuplicateCommands;
             break;
         case LCB_NO_MATCHING_SERVER:
-            klass = cb_eBadEnvironment;
+            klass = cb_eNoMatchingServer;
             break;
         case LCB_BAD_ENVIRONMENT:
             klass = cb_eBadEnvironment;

data/lib/couchbase/dns.rb

@@ -0,0 +1,76 @@
+# Author:: Couchbase <info@couchbase.com>
+# Copyright:: 2014 Couchbase, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'resolv'
+
+module Couchbase
+  module DNS
+    # Locate bootstrap nodes from a DNS SRV record.
+    #
+    # @note This is experimental interface. It might change in future
+    #       (e.g. service identifiers)
+    #
+    # The DNS SRV records need to be configured on a reachable DNS server. An
+    # example configuration could look like the following:
+    #
+    #     _cbmcd._tcp.example.com.  0  IN  SRV  20  0  11210 node2.example.com.
+    #     _cbmcd._tcp.example.com.  0  IN  SRV  10  0  11210 node1.example.com.
+    #     _cbmcd._tcp.example.com.  0  IN  SRV  30  0  11210 node3.example.com.
+    #
+    #     _cbhttp._tcp.example.com.  0  IN  SRV  20  0  8091 node2.example.com.
+    #     _cbhttp._tcp.example.com.  0  IN  SRV  10  0  8091 node1.example.com.
+    #     _cbhttp._tcp.example.com.  0  IN  SRV  30  0  8091 node3.example.com.
+    #
+    # Now if "example.com" is passed in as the argument, the three
+    # nodes configured will be parsed and put in the returned URI list. Note that
+    # the priority is respected (in this example, node1 will be the first one
+    # in the list, followed by node2 and node3). As of now, weighting is not
+    # supported.
+    #
+    # @param name the DNS name where SRV records configured
+    # @param bootstrap_protocol (Symbol) the desired protocol for
+    #        bootstrapping. See +bootstrap_protocols+ option to
+    #        {Couchbase::Bucket#new}. Allowed values +:http, :cccp+
+    # @return a list of ordered boostrap URIs by their weight.
+    #
+    # @example Initialize connection using DNS SRV records
+    #
+    #    nodes = Couchbase::DNS.locate('example.com', :http)
+    #    if nodes.empty?
+    #      nodes = ["example.com:8091"]
+    #    end
+    #    Couchbase.connect(:node_list => nodes)
+    def locate(name, bootstrap_protocol = :http)
+      service = case bootstrap_protocol
+                when :http
+                  "_cbhttp"
+                when :cccp
+                  "_cbmcd"
+                else
+                  raise ArgumentError, "unknown bootstrap protocol: #{bootstrap_transports}"
+                end
+      hosts = []
+      Resolv::DNS.open do |dns|
+        resources = dns.getresources("#{service}._tcp.#{name}", Resolv::DNS::Resource::IN::SRV)
+        hosts = resources.sort_by(&:priority).map { |res| "#{res.target}:#{res.port}" }
+      end
+      hosts
+    end
+
+    module_function :locate
+  end
+end

data/lib/couchbase/version.rb

@@ -17,5 +17,5 @@
 
 # Couchbase ruby client
 module Couchbase
-  VERSION = "1.3.6"
+  VERSION = "1.3.7"
 end

data/tasks/compile.rake

@@ -137,7 +137,7 @@ task "package:windows" => ["package", "lib/couchbase_ext.rb"] do
     ENV['TARGET'] = platform.name
     rm_rf("tmp/ ports/")
     mkdir_p("ports")
-    recipe = MiniPortile.new("libcouchbase", "2.2.0_30_gc87bec4")
+    recipe = MiniPortile.new("libcouchbase", "2.3.0")
     recipe.host = platform.host
     recipe.files << "http://packages.couchbase.com/clients/c/libcouchbase-#{recipe.version}.tar.gz"
     recipe.configure_options.push("--disable-debug",

data/test/test_bucket.rb

@@ -273,4 +273,16 @@ class TestBucket < MiniTest::Test
     end
   end
 
+  def test_it_can_duplicate_the_connection_creating_new_one
+    with_mock do |mock|
+      connection = Couchbase.new(:hostname => mock.host,
+                                 :port => mock.port)
+      double = connection.dup
+      assert_equal double.hostname, connection.hostname
+      assert_equal double.port, connection.port
+      connection.disconnect
+      refute connection.connected?, "original connection should be closed"
+      assert double.connected?, "duplicate connection should be alive"
+    end
+  end
 end

data/test/test_couchbase_rails_cache_store.rb

@@ -92,13 +92,10 @@ class TestCouchbaseRailsCacheStore < MiniTest::Test
 
   def test_it_reads_raw_data
     store.write uniq_id, @foo
-    expected = case RUBY_VERSION
-               when /^2\.0/
-                 "\x04\bU:\x0FOpenStruct{\x06:\fpayloadI\"\bfoo\x06:\x06ET"
-               when /^1\.9/
-                 "\x04\bU:\x0FOpenStruct{\x06:\fpayloadI\"\bfoo\x06:\x06EF"
-               else
+    expected = if RUBY_VERSION =~ /^1\.8/
                  "\004\bU:\017OpenStruct{\006:\fpayload\"\bfoo"
+               else
+                 "\x04\bU:\x0FOpenStruct{\x06:\fpayloadI\"\bfoo\x06:\x06ET"
                end
     assert_equal expected, store.read(uniq_id, :raw => true)
   end

data/test/test_eventmachine.rb

@@ -17,6 +17,7 @@
 
 require File.join(File.dirname(__FILE__), 'setup')
 require 'eventmachine'
+require 'em-synchrony'
 
 class TestEventmachine < MiniTest::Test
 
@@ -65,6 +66,13 @@ class TestEventmachine < MiniTest::Test
       end
     end
 
+    def test_integration_with_em_synchrony
+      EM.epoll
+      EM.synchrony do
+        Couchbase::Bucket.new(:engine => :eventmachine, bucket: "default", :node_list => ["localhost:8091"])
+        EventMachine.stop
+      end
+    end
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: couchbase
 version: !ruby/object:Gem::Version
-  version: 1.3.6
+  version: 1.3.7
 platform: x64-mingw32
 authors:
 - Couchbase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-17 00:00:00.000000000 Z
+date: 2014-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yaji
@@ -159,7 +159,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.1.0
 - !ruby/object:Gem::Dependency
-  name: active_support
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -186,6 +186,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: em-synchrony
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: The official client library for use with Couchbase Server.
 email: support@couchbase.com
 executables: []
@@ -247,6 +261,7 @@ files:
 - lib/couchbase/cluster.rb
 - lib/couchbase/connection_pool.rb
 - lib/couchbase/constants.rb
+- lib/couchbase/dns.rb
 - lib/couchbase/result.rb
 - lib/couchbase/transcoder.rb
 - lib/couchbase/utils.rb