couchbase 1.3.8 → 1.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c07b8853e0e2f8a9e6870a3da0e2892695c790ea
-  data.tar.gz: 8262898fcb8515ef54b8a2033941dd52724fcce1
+  metadata.gz: 69ecaed7fa9c71eaeff099185a4327f5283dfe26
+  data.tar.gz: 329a826abafec646d68c4b536fd7eb10b8be210b
 SHA512:
-  metadata.gz: 5173ee5ea159c65a0c5f97febc65282c4bf993355e64b59f7733432e7dc920a6f56330fa10503f774f728ed0c1060623a35ca6f59b8d26dc3fd9c9fd870ddf97
-  data.tar.gz: 22743c2fb37df082080e6fde59ae040460c828b998ebe4782ed54398a775b1a512603c27391d5f0227dbca0ae57a051db17dc8bdfc77fa2e50b35b0f8c8a7475
+  metadata.gz: 863b71ca2200c3eebc125ee94d89709dcb741e7f60e7696ae27995b7a9ac01f5ce5856bc0df2abda47acab1e9e1397921cbc145dd92ce4a056f9bbc5b10b122f
+  data.tar.gz: b9e0f4702eaffc50ab78a37eef07d7c500f92f7019ad9006ff60714e86b00506d49e635167def6defc6cbfd5c73c1b7dff62da3315abc92dda56c08823709d15

data/README.markdown

@@ -29,6 +29,25 @@ 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:
+
+    $ brew install rbenv ruby-build
+
+Add the following line to the end of your .bashrc:
+
+    if which rbenv > /dev/null; then eval "$(rbenv init -)"; fi
+
+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:
+
+    $ gem install couchbase
+
 ### Debian (Ubuntu)
 
 Add the appropriate line to `/etc/apt/sources.list.d/couchbase.list` for
@@ -649,7 +668,7 @@ task and you will find all artifacts in `pkg/` directory:
     pkg/couchbase-1.3.4-x86-mingw32.gem
 
 
-[api]: http://www.couchbase.com/autodocs/couchbase-ruby-client-1.3.4/index.html
+[api]: http://www.couchbase.com/autodocs/couchbase-ruby-client-latest/index.html
 [overview]: http://docs.couchbase.com/couchbase-sdk-ruby-1.3/index.html
 [1]: http://couchbase.com/issues/browse/RCBC
 [2]: http://freenode.net/irc_servers.shtml
@@ -662,4 +681,4 @@ task and you will find all artifacts in `pkg/` directory:
 [9]: http://rubygems.org/gems/eventmachine
 [10]: https://github.com/couchbase/couchbase-ruby-client/blob/master/CONTRIBUTING.markdown
 [11]: https://github.com/luislavena/rake-compiler
-
+[rbenv]: https://github.com/sstephenson/rbenv#homebrew-on-mac-os-x

data/RELEASE_NOTES.markdown

@@ -3,11 +3,15 @@
 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.9 (2014-08-26)
+
+* [major] Updates regarding libcouchbase 2.4.0. Deprecations cleanup
+
 ## 1.3.8 (2014-06-11)
 
 * [major] RCBC-176 Known Issue: When the couchbase client is used in
   an 'em-synchrony' context, it is possible that connection errors may
-  not be propagated to the client. This leads to runtime assertion in 
+  not be propagated to the client. This leads to runtime assertion in
   eventmachine.
 
 * [minor] Update runtime (connection_pool) and build (libcouchbase)

data/ext/couchbase_ext/bucket.c

@@ -36,12 +36,12 @@ trigger_on_connect_callback(VALUE self)
 }
 
     static void
-error_callback(lcb_t handle, lcb_error_t error, const char *errinfo)
+bootstrap_callback(lcb_t handle, lcb_error_t error)
 {
     struct cb_bucket_st *bucket = (struct cb_bucket_st *)lcb_get_cookie(handle);
 
     lcb_breakout(handle);
-    bucket->exception = cb_check_error(error, errinfo, Qnil);
+    bucket->exception = cb_check_error(error, "bootstrap error", Qnil);
     if (bucket->async && !bucket->connected) {
         (void)trigger_on_connect_callback(bucket->self);
     }
@@ -407,7 +407,7 @@ do_connect(struct cb_bucket_st *bucket)
         rb_exc_raise(cb_check_error(err, "failed to create libcouchbase instance", Qnil));
     }
     lcb_set_cookie(bucket->handle, bucket);
-    (void)lcb_set_error_callback(bucket->handle, error_callback);
+    (void)lcb_set_bootstrap_callback(bucket->handle, bootstrap_callback);
     (void)lcb_set_store_callback(bucket->handle, cb_storage_callback);
     (void)lcb_set_get_callback(bucket->handle, cb_get_callback);
     (void)lcb_set_touch_callback(bucket->handle, cb_touch_callback);
@@ -421,11 +421,8 @@ do_connect(struct cb_bucket_st *bucket)
     (void)lcb_set_unlock_callback(bucket->handle, cb_unlock_callback);
     (void)lcb_set_configuration_callback(bucket->handle, configuration_callback);
 
-    if (bucket->timeout > 0) {
-        lcb_set_timeout(bucket->handle, bucket->timeout);
-    } else {
-        bucket->timeout = lcb_get_timeout(bucket->handle);
-    }
+    lcb_cntl(bucket->handle, (bucket->timeout > 0) ? LCB_CNTL_SET : LCB_CNTL_GET,
+             LCB_CNTL_OP_TIMEOUT, &bucket->timeout);
     err = lcb_connect(bucket->handle);
     if (err != LCB_SUCCESS) {
         cb_bucket_disconnect(bucket->self);
@@ -930,7 +927,7 @@ cb_bucket_timeout_set(VALUE self, VALUE val)
     VALUE tmval;
 
     bucket->timeout = (uint32_t)NUM2ULONG(val);
-    lcb_set_timeout(bucket->handle, bucket->timeout);
+    lcb_cntl(bucket->handle, LCB_CNTL_SET, LCB_CNTL_OP_TIMEOUT, &bucket->timeout);
     tmval = ULONG2NUM(bucket->timeout);
 
     return tmval;
@@ -984,10 +981,15 @@ cb_bucket_key_prefix_set(VALUE self, VALUE val)
 cb_bucket_hostname_get(VALUE self)
 {
     struct cb_bucket_st *bucket = DATA_PTR(self);
-
     if (bucket->handle) {
-        const char * host = lcb_get_host(bucket->handle);
-        unsigned long len = RSTRING_LEN(bucket->hostname);
+        const char *host;
+        char *colon;
+        unsigned long len;
+        host = lcb_get_node(bucket->handle, LCB_NODE_HTCONFIG | LCB_NODE_NEVERNULL, 0);
+        if (host != NULL && (colon = strstr(host, ":"))  != NULL) {
+            *colon = '\0';
+        }
+        len = RSTRING_LEN(bucket->hostname);
         if (len != strlen(host) || strncmp(RSTRING_PTR(bucket->hostname), host, len) != 0) {
             bucket->hostname = STR_NEW_CSTR(host);
             rb_str_freeze(bucket->hostname);
@@ -1007,7 +1009,12 @@ cb_bucket_port_get(VALUE self)
 {
     struct cb_bucket_st *bucket = DATA_PTR(self);
     if (bucket->handle) {
-        bucket->port = atoi(lcb_get_port(bucket->handle));
+        const char *port;
+        port = lcb_get_node(bucket->handle, LCB_NODE_HTCONFIG | LCB_NODE_NEVERNULL, 0);
+        if (port && (port = strstr(port, ":"))) {
+            port++;
+        }
+        bucket->port = atoi(port);
     }
     return UINT2NUM(bucket->port);
 }
@@ -1433,5 +1440,3 @@ cb_bucket_disconnect(VALUE self)
         return Qfalse;
     }
 }
-
-

data/ext/couchbase_ext/couchbase_ext.h

@@ -38,7 +38,20 @@ typedef uint64_t hrtime_t;
 extern hrtime_t gethrtime(void);
 #endif
 
-#include <stdint.h>
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
+#ifdef HAVE_ERRNO_H
+#include <errno.h>
+#endif
+
+#ifndef INVALID_SOCKET
+#define INVALID_SOCKET -1
+#endif
+
 #include <libcouchbase/couchbase.h>
 
 #ifdef HAVE_RUBY_ENCODING_H
@@ -645,4 +658,3 @@ rb_funcall_2(VALUE self, ID method, VALUE arg1, VALUE arg2)
 }
 
 #endif
-

data/ext/couchbase_ext/eventmachine_plugin.c

@@ -20,7 +20,7 @@
 #ifndef _WIN32
 #ifdef BUILD_EVENTMACHINE_PLUGIN
 
-#include <errno.h>
+#include <libcouchbase/bsdio-inl.c>
 
 VALUE cb_mEm;
 VALUE cb_cEmSocket;
@@ -433,13 +433,7 @@ cb_create_ruby_em_io_opts(int version, lcb_io_opt_t *io, void *arg)
     /* consider that struct isn't allocated by the library,
      * `need_cleanup' flag might be set in lcb_create() */
     ret->v.v0.need_cleanup = 0;
-    ret->v.v0.recv = cb_io_recv;
-    ret->v.v0.send = cb_io_send;
-    ret->v.v0.recvv = cb_io_recvv;
-    ret->v.v0.sendv = cb_io_sendv;
-    ret->v.v0.socket = cb_io_socket;
-    ret->v.v0.close = cb_io_close;
-    ret->v.v0.connect = cb_io_connect;
+    wire_lcb_bsd_impl(ret);
     ret->v.v0.delete_event = lcb_io_delete_event;
     ret->v.v0.destroy_event = lcb_io_destroy_event;
     ret->v.v0.create_event = lcb_io_create_event;

data/ext/couchbase_ext/extconf.rb

@@ -132,7 +132,7 @@ def die(message)
   abort
 end
 
-install_notice = "You must install libcouchbase >= 2.3.0\nSee http://www.couchbase.com/communities/c/ for more details"
+install_notice = "You must install libcouchbase >= 2.4.0\nSee http://www.couchbase.com/communities/c/ for more details"
 
 unless try_compile(<<-SRC)
   #include <libcouchbase/couchbase.h>
@@ -146,12 +146,39 @@ unless try_compile(<<-SRC)
   die(install_notice)
 end
 
+unless 'foo()'.respond_to?(:funcall_style)
+  class String
+    def funcall_style
+      /\)\z/ =~ self ? dup : "#{self}()"
+    end
+  end
+
+  def try_func(func, libs, headers = nil, &b)
+    headers = cpp_include(headers)
+    try_link(<<"SRC", libs, &b) or try_link(<<"SRC", libs, &b)
+#{COMMON_HEADERS}
+#{headers}
+/*top*/
+int main() { return 0; }
+int t() { void ((*volatile p)()); p = (void ((*)()))#{func}; return 0; }
+SRC
+#{headers}
+/*top*/
+int main() { return 0; }
+int t() { #{func.funcall_style}; return 0; }
+SRC
+  end
+end
+
 # just to add -lcouchbase properly
-have_library("couchbase", "lcb_verify_compiler_setup", "libcouchbase/couchbase.h") or die(install_notice)
+have_library("couchbase", "lcb_set_bootstrap_callback(NULL, NULL)", "libcouchbase/couchbase.h") or die(install_notice)
 have_header("mach/mach_time.h")
 have_header("stdint.h") or die("Failed to locate stdint.h")
 have_header("sys/time.h")
 have_header("fcntl.h")
+have_header("sys/socket.h")
+have_header("errno.h")
+
 have_type("st_index_t")
 have_func("clock_gettime")
 have_func("gettimeofday")

data/ext/couchbase_ext/multithread_plugin.c

@@ -17,7 +17,6 @@
 
 #include "couchbase_ext.h"
 
-
 #ifndef _WIN32
 
 #ifndef HAVE_RB_THREAD_BLOCKING_REGION
@@ -28,6 +27,8 @@
 #include <poll.h>
 #endif
 
+#include <libcouchbase/bsdio-inl.c>
+
 /* events sorted array */
 typedef struct rb_mt_event rb_mt_event;
 struct rb_mt_event {
@@ -1058,13 +1059,7 @@ cb_create_ruby_mt_io_opts(int version, lcb_io_opt_t *io, void *arg)
     /* consider that struct isn't allocated by the library,
      * `need_cleanup' flag might be set in lcb_create() */
     ret->v.v0.need_cleanup = 0;
-    ret->v.v0.recv = cb_io_recv;
-    ret->v.v0.send = cb_io_send;
-    ret->v.v0.recvv = cb_io_recvv;
-    ret->v.v0.sendv = cb_io_sendv;
-    ret->v.v0.socket = cb_io_socket;
-    ret->v.v0.close = cb_io_close;
-    ret->v.v0.connect = cb_io_connect;
+    wire_lcb_bsd_impl(ret);
     ret->v.v0.delete_event = lcb_io_delete_event;
     ret->v.v0.destroy_event = lcb_io_destroy_event;
     ret->v.v0.create_event = lcb_io_create_event;

data/ext/couchbase_ext/utils.c

@@ -272,6 +272,13 @@ cb_check_error_with_status(lcb_error_t rc, const char *msg, VALUE key,
     }
 
     str = rb_str_buf_new2(msg ? msg : "");
+    if (msg) {
+        str = rb_str_buf_new2(msg);
+        rb_str_buf_cat2(str, ", ");
+    } else {
+        str = rb_str_buf_new2("");
+    }
+    rb_str_buf_cat2(str, lcb_strerror(NULL, rc));
     rb_str_buf_cat2(str, " (");
     if (key != Qnil) {
         snprintf(buf, 300, "key=\"%s\", ", RSTRING_PTR(key));

data/lib/couchbase/version.rb

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

data/tasks/compile.rake

@@ -137,12 +137,13 @@ 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.3.1")
+    recipe = MiniPortile.new("libcouchbase", "2.4.0_21_g879b4cd")
     recipe.host = platform.host
     recipe.files << "http://packages.couchbase.com/clients/c/libcouchbase-#{recipe.version}.tar.gz"
     recipe.configure_options.push("--disable-debug",
                                   "--disable-dependency-tracking",
                                   "--disable-couchbasemock",
+                                  "--enable-ssl=no",
                                   "--disable-cxx",
                                   "--disable-plugins",
                                   "--disable-examples",

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-20120726.220757-19.jar"
+  jar_path = "0.8-SNAPSHOT/CouchbaseMock-0.8-20140621.030439-1.jar"
   sh %{wget -q -O test/CouchbaseMock.jar http://files.couchbase.com/maven2/org/couchbase/mock/CouchbaseMock/#{jar_path}}
 end
 

data/test/test_bucket.rb

@@ -76,7 +76,7 @@ class TestBucket < MiniTest::Test
 
   def test_it_raises_network_error_if_server_not_found
     refute(`netstat -tnl` =~ /12345/)
-    assert_raises Couchbase::Error::Connect do
+    assert_raises Couchbase::Error::Network do
       Couchbase.new(:port => 12345)
     end
   end
@@ -123,7 +123,7 @@ class TestBucket < MiniTest::Test
                       :port => mock.port,
                       :bucket => 'default',
                       :password => 'wrong_password')
-      end
+      end if mock.real?
       assert_raises Couchbase::Error::InvalidUsername do
         Couchbase.new(:hostname => mock.host,
                       :port => mock.port,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: couchbase
 version: !ruby/object:Gem::Version
-  version: 1.3.8
+  version: 1.3.9
 platform: ruby
 authors:
 - Couchbase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-11 00:00:00.000000000 Z
+date: 2014-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yaji
@@ -246,7 +246,6 @@ files:
 - ext/couchbase_ext/http.c
 - ext/couchbase_ext/multithread_plugin.c
 - ext/couchbase_ext/observe.c
-- ext/couchbase_ext/plugin_common.c
 - ext/couchbase_ext/result.c
 - ext/couchbase_ext/stats.c
 - ext/couchbase_ext/store.c
@@ -318,7 +317,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.3.0
 signing_key: 
 specification_version: 4
 summary: Couchbase ruby driver

data/ext/couchbase_ext/plugin_common.c

@@ -1,171 +0,0 @@
-/* vim: ft=c et ts=8 sts=4 sw=4 cino=
- *
- *   Copyright 2012 Couchbase, Inc.
- *
- * 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.
- */
-
-#include "couchbase_ext.h"
-
-#ifndef _WIN32
-
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#ifndef RUBY_WIN32_H
-#  include <unistd.h>
-#ifdef HAVE_FCNTL_H
-#  include <fcntl.h>
-#endif
-#define INVALID_SOCKET (-1)
-#else /* RUBY_WIN32_h */
-static st_table *socket_2_fd = NULL;
-#endif
-
-/* Copied from libev plugin */
-    lcb_ssize_t
-cb_io_recv(struct lcb_io_opt_st *iops, lcb_socket_t sock,
-        void *buffer, lcb_size_t len, int flags)
-{
-    lcb_ssize_t ret = recv(sock, buffer, len, flags);
-    if (ret < 0) {
-        iops->v.v0.error = errno;
-    }
-    return ret;
-}
-
-    lcb_ssize_t
-cb_io_recvv(struct lcb_io_opt_st *iops, lcb_socket_t sock,
-        struct lcb_iovec_st *iov, lcb_size_t niov)
-{
-    struct msghdr msg;
-    struct iovec vec[2];
-    lcb_ssize_t ret;
-
-    if (niov != 2) {
-        return -1;
-    }
-    memset(&msg, 0, sizeof(msg));
-    msg.msg_iov = vec;
-    msg.msg_iovlen = iov[1].iov_len ? (lcb_size_t)2 : (lcb_size_t)1;
-    msg.msg_iov[0].iov_base = iov[0].iov_base;
-    msg.msg_iov[0].iov_len = iov[0].iov_len;
-    msg.msg_iov[1].iov_base = iov[1].iov_base;
-    msg.msg_iov[1].iov_len = iov[1].iov_len;
-    ret = recvmsg(sock, &msg, 0);
-
-    if (ret < 0) {
-        iops->v.v0.error = errno;
-    }
-
-    return ret;
-}
-
-    lcb_ssize_t
-cb_io_send(struct lcb_io_opt_st *iops, lcb_socket_t sock,
-        const void *msg, lcb_size_t len, int flags)
-{
-    lcb_ssize_t ret = send(sock, msg, len, flags);
-    if (ret < 0) {
-        iops->v.v0.error = errno;
-    }
-    return ret;
-}
-
-    lcb_ssize_t
-cb_io_sendv(struct lcb_io_opt_st *iops, lcb_socket_t sock,
-        struct lcb_iovec_st *iov, lcb_size_t niov)
-{
-    struct msghdr msg;
-    struct iovec vec[2];
-    lcb_ssize_t ret;
-
-    if (niov != 2) {
-        return -1;
-    }
-    memset(&msg, 0, sizeof(msg));
-    msg.msg_iov = vec;
-    msg.msg_iovlen = iov[1].iov_len ? (lcb_size_t)2 : (lcb_size_t)1;
-    msg.msg_iov[0].iov_base = iov[0].iov_base;
-    msg.msg_iov[0].iov_len = iov[0].iov_len;
-    msg.msg_iov[1].iov_base = iov[1].iov_base;
-    msg.msg_iov[1].iov_len = iov[1].iov_len;
-    ret = sendmsg(sock, &msg, 0);
-
-    if (ret < 0) {
-        iops->v.v0.error = errno;
-    }
-    return ret;
-}
-
-    static int
-make_socket_nonblocking(lcb_socket_t sock)
-{
-    int flags = 0;
-#ifdef F_GETFL
-    if ((flags = fcntl(sock, F_GETFL, NULL)) < 0) {
-        return -1;
-    }
-#endif
-    if (fcntl(sock, F_SETFL, flags | O_NONBLOCK) == -1) {
-        return -1;
-    }
-
-    return 0;
-}
-
-    static int
-close_socket(lcb_socket_t sock)
-{
-    return close(sock);
-}
-
-    lcb_socket_t
-cb_io_socket(struct lcb_io_opt_st *iops, int domain, int type,
-        int protocol)
-{
-    lcb_socket_t sock = socket(domain, type, protocol);
-    if (sock == INVALID_SOCKET) {
-        iops->v.v0.error = errno;
-    } else {
-        if (make_socket_nonblocking(sock) != 0) {
-            int error = errno;
-            iops->v.v0.close(iops, sock);
-            iops->v.v0.error = error;
-            sock = INVALID_SOCKET;
-        }
-    }
-
-    return sock;
-}
-
-    void
-cb_io_close(struct lcb_io_opt_st *iops, lcb_socket_t sock)
-{
-    close_socket(sock);
-    (void)iops;
-}
-
-    int
-cb_io_connect(struct lcb_io_opt_st *iops, lcb_socket_t sock,
-        const struct sockaddr *name, unsigned int namelen)
-{
-    int ret = connect(sock, name, (socklen_t)namelen);
-    if (ret < 0) {
-        iops->v.v0.error = errno;
-    }
-    return ret;
-}
-
-#endif