couchbase 1.3.9 → 1.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 69ecaed7fa9c71eaeff099185a4327f5283dfe26
-  data.tar.gz: 329a826abafec646d68c4b536fd7eb10b8be210b
+  metadata.gz: 759661b05e920c3d62cc5983ce81f984779f4246
+  data.tar.gz: 7d34726c1916b7abdb13b53c90d3ec89c15d211c
 SHA512:
-  metadata.gz: 863b71ca2200c3eebc125ee94d89709dcb741e7f60e7696ae27995b7a9ac01f5ce5856bc0df2abda47acab1e9e1397921cbc145dd92ce4a056f9bbc5b10b122f
-  data.tar.gz: b9e0f4702eaffc50ab78a37eef07d7c500f92f7019ad9006ff60714e86b00506d49e635167def6defc6cbfd5c73c1b7dff62da3315abc92dda56c08823709d15
+  metadata.gz: ccb69b2d1a2cb30ce956ff9a787b4cc3507ca071683f5eb787e32340b104559790b55015d44cb431a2e1359fcff649359513f9f6d4fdcded682292ba222851ca
+  data.tar.gz: 2af41a0142d0a0699dda8960a081f3bdd35bbcfbc536f7f1b68baaac5a6a79f30d89cdf2019daa966413d1556ae57a74861bf89453c13f69d7616b3af78039a0

data/README.markdown

@@ -29,9 +29,19 @@ Couchbase's fork: https://github.com/couchbase/homebrew
 
     $ brew install https://raw.github.com/couchbase/homebrew/preview/Library/Formula/libcouchbase.rb
 
-If you are experience issues with installing using system ruby, you
-might try to use [rbenv][rbenv], and install couchbase there. Here are
-the steps:
+If you are experiencing issues with installing using the OS included
+ruby, the most likely reason is that architecture of libcouchbase and
+your ruby do not match (e.g. one component is fat binary while another
+is not). The best fix depends on the details of the components. If you
+are using the system ruby on Mac OS X (which contains both 32-bit and
+64-bit code), you need to install libcouchbase using the `--universal`
+option:
+
+    $ brew install --universal libcouchbase
+
+Another approach might be to try to use [rbenv][rbenv], install 64-bit
+only ruby and compile couchbase ruby gem there there. Here are the
+steps:
 
     $ brew install rbenv ruby-build
 
@@ -44,7 +54,7 @@ Then install ruby and make it global:
     $ rbenv install 2.1.2
     $ rbenv global 2.1.2
 
-Now you are ready to install and use couchbase ruby gem as usual:
+Now you are ready to install and use the couchbase ruby gem:
 
     $ gem install couchbase
 

data/RELEASE_NOTES.markdown

@@ -3,6 +3,14 @@
 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.10 (2014-09-30)
+
+* [major] Updates regarding libcouchbase 2.4.2. Bundle "bsdio-inl.c"
+  which is not part of libcouchbase distribution anymore. This fixes
+  installation recent ruby gem versions with libcouchbase 2.4.2.
+
+* [minor] Allow both `:hostname` and `:host` options to constructor
+
 ## 1.3.9 (2014-08-26)
 
 * [major] Updates regarding libcouchbase 2.4.0. Deprecations cleanup

data/ext/couchbase_ext/bucket.c

@@ -182,6 +182,11 @@ do_scan_connection_options(struct cb_bucket_st *bucket, int argc, VALUE *argv)
             arg = rb_hash_aref(opts, cb_sym_hostname);
             if (arg != Qnil) {
                 bucket->hostname = rb_str_dup_frozen(StringValue(arg));
+            } else {
+                arg = rb_hash_aref(opts, cb_sym_host);
+                if (arg != Qnil) {
+                    bucket->hostname = rb_str_dup_frozen(StringValue(arg));
+                }
             }
             arg = rb_hash_aref(opts, cb_sym_pool);
             if (arg != Qnil) {
@@ -476,8 +481,8 @@ cb_bucket_alloc(VALUE klass)
  *     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 [String] :hostname ("localhost") the hostname or
+ *     IP address of the node
  *   @option options [Fixnum] :port (8091) the port of the managemenent API
  *   @option options [String] :pool ("default") the pool name
  *   @option options [String] :bucket ("default") the bucket name

data/ext/couchbase_ext/couchbase_ext.c

@@ -71,6 +71,7 @@ ID cb_sym_forced;
 ID cb_sym_format;
 ID cb_sym_found;
 ID cb_sym_get;
+ID cb_sym_host;
 ID cb_sym_hostname;
 ID cb_sym_http;
 ID cb_sym_http_request;
@@ -1318,6 +1319,7 @@ Init_couchbase_ext(void)
     cb_sym_format = ID2SYM(rb_intern("format"));
     cb_sym_found = ID2SYM(rb_intern("found"));
     cb_sym_get = ID2SYM(rb_intern("get"));
+    cb_sym_host = ID2SYM(rb_intern("host"));
     cb_sym_hostname = ID2SYM(rb_intern("hostname"));
     cb_sym_http = ID2SYM(rb_intern("http"));
     cb_sym_http_request = ID2SYM(rb_intern("http_request"));

data/ext/couchbase_ext/couchbase_ext.h

@@ -233,6 +233,7 @@ extern ID cb_sym_forced;
 extern ID cb_sym_format;
 extern ID cb_sym_found;
 extern ID cb_sym_get;
+extern ID cb_sym_host;
 extern ID cb_sym_hostname;
 extern ID cb_sym_http;
 extern ID cb_sym_http_request;

data/ext/couchbase_ext/eventmachine_plugin.c

@@ -20,7 +20,7 @@
 #ifndef _WIN32
 #ifdef BUILD_EVENTMACHINE_PLUGIN
 
-#include <libcouchbase/bsdio-inl.c>
+#include "libcouchbase/bsdio-inl.c"
 
 VALUE cb_mEm;
 VALUE cb_cEmSocket;

data/ext/couchbase_ext/extconf.rb

@@ -82,7 +82,7 @@ else
   ]
 
   # For people using homebrew
-  brew_prefix = `brew --prefix libevent 2> /dev/null`.chomp
+  brew_prefix = `brew --prefix libcouchbase 2> /dev/null`.chomp
   unless brew_prefix.empty?
     LIB_DIRS.unshift File.join(brew_prefix, 'lib')
     HEADER_DIRS.unshift File.join(brew_prefix, 'include')

data/ext/couchbase_ext/libcouchbase/bsdio-inl.c

@@ -0,0 +1,223 @@
+/**
+ * Inline routines for common 'BSD'-style I/O for plugins.
+ *
+ * Include this file in your plugin and then call wire_lcb_bsd_impl on the
+ * plugin instance.
+ */
+
+static void
+wire_lcb_bsd_impl(lcb_io_opt_t io);
+
+#ifdef _WIN32
+#include "wsaerr-inl.c"
+static int
+get_wserr(lcb_socket_t sock)
+{
+    DWORD error = WSAGetLastError();
+    int ext = 0;
+    int len = sizeof(ext);
+
+    /* Retrieves extended error status and clear */
+    getsockopt(sock, SOL_SOCKET, SO_ERROR, (char *)&ext, &len);
+    return wsaerr_map_impl(error);
+}
+
+static lcb_ssize_t
+recvv_impl(lcb_io_opt_t iops, lcb_socket_t sock,
+           struct lcb_iovec_st *iov, lcb_size_t niov)
+{
+    DWORD flags = 0, nr;
+    WSABUF *bufptr = (WSABUF *)iov;
+
+    if (WSARecv(sock, bufptr, niov, &nr, &flags, NULL, NULL) == SOCKET_ERROR) {
+        iops->v.v0.error = get_wserr(sock);
+        if (iops->v.v0.error == ECONNRESET) {
+            return 0;
+        }
+        return -1;
+    }
+
+    (void)iops;
+    return (lcb_ssize_t)nr;
+}
+
+static lcb_ssize_t
+recv_impl(lcb_io_opt_t iops, lcb_socket_t sock, void *buf, lcb_size_t nbuf,
+          int fl_unused)
+{
+    WSABUF iov;
+    iov.len = nbuf;
+    iov.buf = buf;
+    (void)fl_unused;
+    return recvv_impl(iops, sock, (struct lcb_iovec_st *)&iov, 1);
+}
+
+static lcb_ssize_t
+sendv_impl(lcb_io_opt_t iops, lcb_socket_t sock, struct lcb_iovec_st *iov,
+           lcb_size_t niov)
+{
+    DWORD nw, fl = 0;
+    WSABUF *bufptr = (WSABUF *)iov;
+    if (WSASend(sock, bufptr, niov, &nw, fl, NULL, NULL) == SOCKET_ERROR) {
+        iops->v.v0.error = get_wserr(sock);
+        return -1;
+    }
+    return (lcb_ssize_t)nw;
+}
+
+static lcb_ssize_t
+send_impl(lcb_io_opt_t iops, lcb_socket_t sock, const void *buf, lcb_size_t nbuf,
+          int flags)
+{
+    WSABUF iov;
+    iov.buf = (void *)buf;
+    iov.len = nbuf;
+    (void)flags;
+    return sendv_impl(iops, sock, (struct lcb_iovec_st *)&iov, 1);
+}
+
+#else
+static lcb_ssize_t
+recvv_impl(lcb_io_opt_t iops, lcb_socket_t sock, struct lcb_iovec_st *iov,
+           lcb_size_t niov)
+{
+    struct msghdr mh;
+    lcb_ssize_t ret;
+
+    memset(&mh, 0, sizeof(mh));
+    mh.msg_iov = (struct iovec *)iov;
+    mh.msg_iovlen = niov;
+    ret = recvmsg(sock, &mh, 0);
+    if (ret < 0) {
+        iops->v.v0.error = errno;
+    }
+    return ret;
+}
+
+static lcb_ssize_t
+recv_impl(lcb_io_opt_t iops, lcb_socket_t sock, void *buf, lcb_size_t nbuf,
+          int flags)
+{
+    lcb_ssize_t ret = recv(sock, buf, nbuf, flags);
+    if (ret < 0) {
+        iops->v.v0.error = errno;
+    }
+    return ret;
+}
+
+static lcb_ssize_t
+sendv_impl(lcb_io_opt_t iops, lcb_socket_t sock, struct lcb_iovec_st *iov,
+           lcb_size_t niov)
+{
+    struct msghdr mh;
+    lcb_ssize_t ret;
+
+    memset(&mh, 0, sizeof(mh));
+    mh.msg_iov = (struct iovec *)iov;
+    mh.msg_iovlen = niov;
+    ret = sendmsg(sock, &mh, 0);
+    if (ret < 0) {
+        iops->v.v0.error = errno;
+    }
+    return ret;
+}
+
+static lcb_ssize_t
+send_impl(lcb_io_opt_t iops, lcb_socket_t sock, const void *buf, lcb_size_t nbuf,
+          int flags)
+{
+    lcb_ssize_t ret = send(sock, buf, nbuf, flags);
+    if (ret < 0) {
+        iops->v.v0.error = errno;
+    }
+    return ret;
+}
+
+#endif
+
+static int make_socket_nonblocking(lcb_socket_t sock)
+{
+#ifdef _WIN32
+    u_long nonblocking = 1;
+    if (ioctlsocket(sock, FIONBIO, &nonblocking) == SOCKET_ERROR) {
+        return -1;
+    }
+#else
+    int flags;
+    if ((flags = fcntl(sock, F_GETFL, NULL)) < 0) {
+        return -1;
+    }
+    if (fcntl(sock, F_SETFL, flags | O_NONBLOCK) == -1) {
+        return -1;
+    }
+#endif
+    return 0;
+}
+
+static lcb_socket_t
+socket_impl(lcb_io_opt_t iops, int domain, int type, int protocol)
+{
+    lcb_socket_t sock;
+#ifdef _WIN32
+    sock = (lcb_socket_t)WSASocket(domain, type, protocol, NULL, 0, 0);
+#else
+    sock = socket(domain, type, protocol);
+#endif
+    if (sock == INVALID_SOCKET) {
+        iops->v.v0.error = errno;
+    } else {
+        if (make_socket_nonblocking(sock) != 0) {
+#ifdef _WIN32
+            iops->v.v0.error = get_wserr(sock);
+#else
+            iops->v.v0.error = errno;
+#endif
+            iops->v.v0.close(iops, sock);
+            sock = INVALID_SOCKET;
+        }
+    }
+    return sock;
+}
+
+static void
+close_impl(lcb_io_opt_t iops, lcb_socket_t sock)
+{
+    (void)iops;
+#ifdef _WIN32
+    closesocket(sock);
+#else
+    close(sock);
+#endif
+}
+
+static int
+connect_impl(lcb_io_opt_t iops, lcb_socket_t sock, const struct sockaddr *name,
+             unsigned int namelen)
+{
+    int ret;
+
+#ifdef _WIN32
+    ret = WSAConnect(sock, name, (int)namelen, NULL, NULL, NULL, NULL);
+    if (ret == SOCKET_ERROR) {
+        iops->v.v0.error = get_wserr(sock);
+    }
+#else
+    ret = connect(sock, name, (socklen_t)namelen);
+    if (ret < 0) {
+        iops->v.v0.error = errno;
+    }
+#endif
+    return ret;
+}
+
+static void
+wire_lcb_bsd_impl(lcb_io_opt_t io)
+{
+    io->v.v0.recv = recv_impl;
+    io->v.v0.recvv = recvv_impl;
+    io->v.v0.send = send_impl;
+    io->v.v0.sendv = sendv_impl;
+    io->v.v0.socket = socket_impl;
+    io->v.v0.connect = connect_impl;
+    io->v.v0.close = close_impl;
+}

data/ext/couchbase_ext/multithread_plugin.c

@@ -27,7 +27,7 @@
 #include <poll.h>
 #endif
 
-#include <libcouchbase/bsdio-inl.c>
+#include "libcouchbase/bsdio-inl.c"
 
 /* events sorted array */
 typedef struct rb_mt_event rb_mt_event;

data/lib/couchbase/version.rb

@@ -17,5 +17,5 @@
 
 # Couchbase ruby client
 module Couchbase
-  VERSION = "1.3.9"
+  VERSION = "1.3.10"
 end

data/test/test_bucket.rb

@@ -285,4 +285,15 @@ class TestBucket < MiniTest::Test
       assert double.connected?, "duplicate connection should be alive"
     end
   end
+
+  def test_it_accepts_both_hostname_and_host_options
+    with_mock do |mock|
+      connection = Couchbase.new(:hostname => mock.host, :port => mock.port)
+      assert_equal mock.host, connection.hostname
+
+      connection = Couchbase.new(:host => mock.host, :port => mock.port)
+      assert_equal mock.host, connection.hostname
+    end
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: couchbase
 version: !ruby/object:Gem::Version
-  version: 1.3.9
+  version: 1.3.10
 platform: ruby
 authors:
 - Couchbase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-26 00:00:00.000000000 Z
+date: 2014-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yaji
@@ -244,6 +244,7 @@ files:
 - ext/couchbase_ext/get.c
 - ext/couchbase_ext/gethrtime.c
 - ext/couchbase_ext/http.c
+- ext/couchbase_ext/libcouchbase/bsdio-inl.c
 - ext/couchbase_ext/multithread_plugin.c
 - ext/couchbase_ext/observe.c
 - ext/couchbase_ext/result.c