couchbase 1.2.0.z.beta3-x86-mingw32 → 1.2.0.z.beta4-x86-mingw32

data/.travis.yml

@@ -9,7 +9,7 @@ before_install:
   - wget -O- http://packages.couchbase.com/ubuntu/couchbase.key | sudo apt-key add -
   - echo deb http://packages.couchbase.com/snapshot/ubuntu oneiric oneiric/main | sudo tee /etc/apt/sources.list.d/couchbase.list
   - sudo apt-get update
-  - sudo apt-get -y install libevent-dev libvbucket-dev libcouchbase-dev
+  - sudo apt-get -y install libcouchbase2-dev
 
 rvm:
   - 1.8.7

data/HISTORY.markdown

@@ -1,3 +1,24 @@
+## 1.2.0.z.beta4 / 2012-11-21
+
+* Do not hide ValueFormat reason
+* Adjust version check for MultiJson monkeypatch
+* Update error codes
+* Remove mentions of LCB_LIBEVENT_ERROR in utils.c
+* Add Makefile for easier build with repo layout
+* Check HTTP error code when building exception object
+* Remove debug output in tests
+* Make rack session store adapter quiet
+* RCBC-90 Update documentation about session store
+* Protect against non string values in :plain mode
+* RCBC-89 Fetch documents using binary protocol by default
+* Deserialize Base64 value from view
+* Remove all_docs mentions
+* RCBC-92 Use more portable version of rb_sprintf()
+* Do not expose docs embedded in HTTP response
+* RCBC-94 Reset global exception after usage
+* Fix number of arguments to Kernel#sprintf
+* Increase default connection timeout
+
 ## 1.2.0.z.beta3 / 2012-10-12
 
 * Update view API

data/Makefile

@@ -0,0 +1,3 @@
+all:
+	$(MAKE) -C../.. ruby-client
+

data/README.markdown

@@ -443,7 +443,6 @@ store a couple of posts using memcached API:
     c['hello-world'] = {:title => 'Hello World',
                         :body => 'Well hello and welcome to my new blog...',
                         :date => '2009/01/15 15:52:20'}
-    c.all_docs.count    #=> 3
 
 Now let's create design doc with sample view and save it in file
 'blog.json':
@@ -493,7 +492,7 @@ You can also use Enumerator to iterate view results
 
     require 'date'
     posts_by_date = Hash.new{|h,k| h[k] = []}
-    enum = c.all_docs(:include_docs => true).each  # request hasn't issued yet
+    enum = c.recent_posts(:include_docs => true).each  # request hasn't issued yet
     enum.inject(posts_by_date) do |acc, doc|
       acc[date] = Date.strptime(doc['date'], '%Y/%m/%d')
       acc

data/ext/couchbase_ext/arguments.c

@@ -237,8 +237,18 @@ cb_params_store_init_item(struct params_st *params, lcb_size_t idx,
 {
     key_obj = unify_key(params->bucket, key_obj, 1);
     value_obj = encode_value(value_obj, params->cmd.store.flags);
-    if (value_obj == Qundef) {
-        rb_raise(eValueFormatError, "unable to convert value for key '%s'", RSTRING_PTR(key_obj));
+    if (rb_obj_is_kind_of(value_obj, rb_eStandardError)) {
+        VALUE exc_str = rb_funcall(value_obj, id_to_s, 0);
+        VALUE msg = rb_funcall(rb_mKernel, id_sprintf, 3,
+                rb_str_new2("unable to convert value for key '%s': %s"), key_obj, exc_str);
+        VALUE exc = rb_exc_new3(eValueFormatError, msg);
+        rb_ivar_set(exc, id_iv_inner_exception, value_obj);
+        rb_exc_raise(exc);
+    }
+    /* the value must be string after conversion */
+    if (TYPE(value_obj) != T_STRING) {
+        VALUE val = rb_any_to_s(value_obj);
+        rb_raise(eValueFormatError, "unable to convert value for key '%s' to string: %s", RSTRING_PTR(key_obj), RSTRING_PTR(val));
     }
     params->cmd.store.items[idx].v.v0.datatype = params->cmd.store.datatype;
     params->cmd.store.items[idx].v.v0.operation = params->cmd.store.operation;

data/ext/couchbase_ext/couchbase_ext.c

@@ -108,6 +108,7 @@ ID id_iv_error;
 ID id_iv_flags;
 ID id_iv_from_master;
 ID id_iv_headers;
+ID id_iv_inner_exception;
 ID id_iv_key;
 ID id_iv_node;
 ID id_iv_operation;
@@ -123,6 +124,7 @@ ID id_password;
 ID id_path;
 ID id_port;
 ID id_scheme;
+ID id_sprintf;
 ID id_to_s;
 ID id_user;
 ID id_verify_observe_options;
@@ -130,6 +132,8 @@ ID id_verify_observe_options;
 /* Errors */
 VALUE eBaseError;
 VALUE eValueFormatError;
+VALUE eHTTPError;
+
                                 /* LCB_SUCCESS = 0x00         */
                                 /* LCB_AUTH_CONTINUE = 0x01   */
 VALUE eAuthError;               /* LCB_AUTH_ERROR = 0x02      */
@@ -144,20 +148,21 @@ VALUE eLibcouchbaseError;       /* LCB_ERROR = 0x0a           */
 VALUE eTmpFailError;            /* LCB_ETMPFAIL = 0x0b        */
 VALUE eKeyExistsError;          /* LCB_KEY_EEXISTS = 0x0c     */
 VALUE eNotFoundError;           /* LCB_KEY_ENOENT = 0x0d      */
-VALUE eLibeventError;           /* LCB_LIBEVENT_ERROR = 0x0e  */
-VALUE eNetworkError;            /* LCB_NETWORK_ERROR = 0x0f   */
-VALUE eNotMyVbucketError;       /* LCB_NOT_MY_VBUCKET = 0x10  */
-VALUE eNotStoredError;          /* LCB_NOT_STORED = 0x11      */
-VALUE eNotSupportedError;       /* LCB_NOT_SUPPORTED = 0x12   */
-VALUE eUnknownCommandError;     /* LCB_UNKNOWN_COMMAND = 0x13 */
-VALUE eUnknownHostError;        /* LCB_UNKNOWN_HOST = 0x14    */
-VALUE eProtocolError;           /* LCB_PROTOCOL_ERROR = 0x15  */
-VALUE eTimeoutError;            /* LCB_ETIMEDOUT = 0x16       */
-VALUE eConnectError;            /* LCB_CONNECT_ERROR = 0x17   */
-VALUE eBucketNotFoundError;     /* LCB_BUCKET_ENOENT = 0x18   */
-VALUE eClientNoMemoryError;     /* LCB_CLIENT_ENOMEM = 0x19   */
-VALUE eClientTmpFailError;      /* LCB_CLIENT_ETMPFAIL = 0x20 */
-VALUE eBadHandleError;          /* LCB_EBADHANDLE = 0x21      */
+VALUE eDlopenFailedError;       /* LCB_DLOPEN_FAILED = 0x0e   */
+VALUE eDlsymFailedError;        /* LCB_DLSYM_FAILED = 0x0f    */
+VALUE eNetworkError;            /* LCB_NETWORK_ERROR = 0x10   */
+VALUE eNotMyVbucketError;       /* LCB_NOT_MY_VBUCKET = 0x11  */
+VALUE eNotStoredError;          /* LCB_NOT_STORED = 0x12      */
+VALUE eNotSupportedError;       /* LCB_NOT_SUPPORTED = 0x13   */
+VALUE eUnknownCommandError;     /* LCB_UNKNOWN_COMMAND = 0x14 */
+VALUE eUnknownHostError;        /* LCB_UNKNOWN_HOST = 0x15    */
+VALUE eProtocolError;           /* LCB_PROTOCOL_ERROR = 0x16  */
+VALUE eTimeoutError;            /* LCB_ETIMEDOUT = 0x17       */
+VALUE eConnectError;            /* LCB_CONNECT_ERROR = 0x18   */
+VALUE eBucketNotFoundError;     /* LCB_BUCKET_ENOENT = 0x19   */
+VALUE eClientNoMemoryError;     /* LCB_CLIENT_ENOMEM = 0x1a   */
+VALUE eClientTmpFailError;      /* LCB_CLIENT_ETMPFAIL = 0x1b */
+VALUE eBadHandleError;          /* LCB_EBADHANDLE = 0x1c      */
 
 
 /* Ruby Extension initializer */
@@ -179,17 +184,24 @@ Init_couchbase_ext(void)
     /* Document-class: Couchbase::Error::Auth
      * Authentication error
      *
+     * You provided an invalid username/password combination.
+     *
      * @since 1.0.0
      */
     eAuthError = rb_define_class_under(mError, "Auth", eBaseError);
     /* Document-class: Couchbase::Error::BucketNotFound
-     * The given bucket not found in the cluster
+     * Bucket not found
+     *
+     * The requested bucket not found in the cluster
      *
      * @since 1.0.0
      */
     eBucketNotFoundError = rb_define_class_under(mError, "BucketNotFound", eBaseError);
     /* Document-class: Couchbase::Error::Busy
-     * The cluster is too busy now. Try again later
+     * The cluster is too busy
+     *
+     * The server is too busy to handle your request right now.
+     * please back off and try again at a later time.
      *
      * @since 1.0.0
      */
@@ -203,6 +215,9 @@ Init_couchbase_ext(void)
     /* Document-class: Couchbase::Error::Internal
      * Internal error
      *
+     * Internal error inside the library. You would have
+     * to destroy the instance and create a new one to recover.
+     *
      * @since 1.0.0
      */
     eInternalError = rb_define_class_under(mError, "Internal", eBaseError);
@@ -215,6 +230,8 @@ Init_couchbase_ext(void)
     /* Document-class: Couchbase::Error::KeyExists
      * Key already exists
      *
+     * The key already exists (with another CAS value)
+     *
      * @since 1.0.0
      */
     eKeyExistsError = rb_define_class_under(mError, "KeyExists", eBaseError);
@@ -224,21 +241,20 @@ Init_couchbase_ext(void)
      * @since 1.0.0
      */
     eLibcouchbaseError = rb_define_class_under(mError, "Libcouchbase", eBaseError);
-    /* Document-class: Couchbase::Error::Libevent
-     * Problem using libevent
-     *
-     * @since 1.0.0
-     */
-    eLibeventError = rb_define_class_under(mError, "Libevent", eBaseError);
     /* Document-class: Couchbase::Error::Network
      * Network error
      *
+     * A network related problem occured (name lookup, read/write/connect
+     * etc)
+     *
      * @since 1.0.0
      */
     eNetworkError = rb_define_class_under(mError, "Network", eBaseError);
     /* Document-class: Couchbase::Error::NoMemory
      * Out of memory error (on Server)
      *
+     * The client ran out of memory
+     *
      * @since 1.0.0
      */
     eNoMemoryError = rb_define_class_under(mError, "NoMemory", eBaseError);
@@ -257,29 +273,44 @@ Init_couchbase_ext(void)
     /* Document-class: Couchbase::Error::NotMyVbucket
      * The vbucket is not located on this server
      *
+     * The server who received the request is not responsible for the
+     * object anymore. (This happens during changes in the cluster
+     * topology)
+     *
      * @since 1.0.0
      */
     eNotMyVbucketError = rb_define_class_under(mError, "NotMyVbucket", eBaseError);
     /* Document-class: Couchbase::Error::NotStored
      * Not stored
      *
+     * The object was not stored on the server
+     *
      * @since 1.0.0
      */
     eNotStoredError = rb_define_class_under(mError, "NotStored", eBaseError);
     /* Document-class: Couchbase::Error::NotSupported
      * Not supported
      *
+     * The server doesn't support the requested command. This error differs
+     * from {Couchbase::Error::UnknownCommand} by that the server knows
+     * about the command, but for some reason decided to not support it.
+     *
      * @since 1.0.0
      */
     eNotSupportedError = rb_define_class_under(mError, "NotSupported", eBaseError);
     /* Document-class: Couchbase::Error::Range
      * Invalid range
      *
+     * An invalid range specified
+     *
      * @since 1.0.0
      */
     eRangeError = rb_define_class_under(mError, "Range", eBaseError);
     /* Document-class: Couchbase::Error::TemporaryFail
-     * Temporary failure. Try again later
+     * Temporary failure
+     *
+     * The server tried to perform the requested operation, but failed
+     * due to a temporary constraint. Retrying the operation may work.
      *
      * @since 1.0.0
      */
@@ -287,24 +318,33 @@ Init_couchbase_ext(void)
     /* Document-class: Couchbase::Error::ClientTemporaryFail
      * Temporary failure (on Client)
      *
+     * The client encountered a temporary error (retry might resolve
+     * the problem)
+     *
      * @since 1.2.0
      */
     eClientTmpFailError = rb_define_class_under(mError, "ClientTemporaryFail", eBaseError);
     /* Document-class: Couchbase::Error::TooBig
      * Object too big
      *
+     * The sever reported that this object is too big
+     *
      * @since 1.0.0
      */
     eTooBigError = rb_define_class_under(mError, "TooBig", eBaseError);
     /* Document-class: Couchbase::Error::UnknownCommand
      * Unknown command
      *
+     * The server doesn't know what that command is.
+     *
      * @since 1.0.0
      */
     eUnknownCommandError = rb_define_class_under(mError, "UnknownCommand", eBaseError);
     /* Document-class: Couchbase::Error::UnknownHost
      * Unknown host
      *
+     * The server failed to resolve the requested hostname
+     *
      * @since 1.0.0
      */
     eUnknownHostError = rb_define_class_under(mError, "UnknownHost", eBaseError);
@@ -317,12 +357,17 @@ Init_couchbase_ext(void)
     /* Document-class: Couchbase::Error::Protocol
      * Protocol error
      *
+     * There is something wrong with the datastream received from
+     * the server
+     *
      * @since 1.0.0
      */
     eProtocolError = rb_define_class_under(mError, "Protocol", eBaseError);
     /* Document-class: Couchbase::Error::Timeout
      * Timeout error
      *
+     * The operation timed out
+     *
      * @since 1.1.0
      */
     eTimeoutError = rb_define_class_under(mError, "Timeout", eBaseError);
@@ -341,6 +386,30 @@ Init_couchbase_ext(void)
      */
     eBadHandleError = rb_define_class_under(mError, "BadHandle", eBaseError);
 
+    /* Document-class: Couchbase::Error::DlopenFailed
+     * dlopen() failed
+     *
+     * Failed to open shared object
+     *
+     * @since 1.2.0
+     */
+    eDlopenFailedError = rb_define_class_under(mError, "DlopenFailed", eBaseError);
+
+    /* Document-class: Couchbase::Error::DlsymFailed
+     * dlsym() failed
+     *
+     * Failed to locate the requested symbol in the shared object
+     *
+     * @since 1.2.0
+     */
+    eDlsymFailedError = rb_define_class_under(mError, "DlsymFailed", eBaseError);
+
+    /* Document-class: Couchbase::Error::HTTP
+     * HTTP error with status code
+     *
+     * @since 1.2.0
+     */
+    eHTTPError = rb_define_class_under(mError, "HTTP", eBaseError);
     /* Document-method: error
      *
      * The underlying libcouchbase library could return one of the following
@@ -352,29 +421,31 @@ Init_couchbase_ext(void)
      * 0x02 :: LCB_AUTH_ERROR (Authentication error)
      * 0x03 :: LCB_DELTA_BADVAL (Not a number)
      * 0x04 :: LCB_E2BIG (Object too big)
-     * 0x05 :: LCB_EBUSY (Too busy. Try again later)
+     * 0x05 :: LCB_EBUSY (Too busy)
      * 0x06 :: LCB_EINTERNAL (Internal error)
      * 0x07 :: LCB_EINVAL (Invalid arguments)
      * 0x08 :: LCB_ENOMEM (Out of memory)
      * 0x09 :: LCB_ERANGE (Invalid range)
      * 0x0a :: LCB_ERROR (Generic error)
-     * 0x0b :: LCB_ETMPFAIL (Temporary failure. Try again later)
+     * 0x0b :: LCB_ETMPFAIL (Temporary failure)
      * 0x0c :: LCB_KEY_EEXISTS (Key exists (with a different CAS value))
      * 0x0d :: LCB_KEY_ENOENT (No such key)
-     * 0x0e :: LCB_LIBEVENT_ERROR (Problem using libevent)
-     * 0x0f :: LCB_NETWORK_ERROR (Network error)
-     * 0x10 :: LCB_NOT_MY_VBUCKET (The vbucket is not located on this server)
-     * 0x11 :: LCB_NOT_STORED (Not stored)
-     * 0x12 :: LCB_NOT_SUPPORTED (Not supported)
-     * 0x13 :: LCB_UNKNOWN_COMMAND (Unknown command)
-     * 0x14 :: LCB_UNKNOWN_HOST (Unknown host)
-     * 0x15 :: LCB_PROTOCOL_ERROR (Protocol error)
-     * 0x16 :: LCB_ETIMEDOUT (Operation timed out)
-     * 0x17 :: LCB_CONNECT_ERROR (Connection failure)
-     * 0x18 :: LCB_BUCKET_ENOENT (No such bucket)
-     * 0x19 :: LCB_CLIENT_ENOMEM (Out of memory on the client)
-     * 0x20 :: LCB_CLIENT_ETMPFAIL (Temporary failure on the client)
-     * 0x21 :: LCB_EBADHANDLE (Invalid handle type)
+     * 0x0e :: LCB_DLOPEN_FAILED (Failed to open shared object)
+     * 0x0f :: LCB_DLSYM_FAILED (Failed to locate the requested symbol in shared object)
+     * 0x10 :: LCB_NETWORK_ERROR (Network error)
+     * 0x11 :: LCB_NOT_MY_VBUCKET (The vbucket is not located on this server)
+     * 0x12 :: LCB_NOT_STORED (Not stored)
+     * 0x13 :: LCB_NOT_SUPPORTED (Not supported)
+     * 0x14 :: LCB_UNKNOWN_COMMAND (Unknown command)
+     * 0x15 :: LCB_UNKNOWN_HOST (Unknown host)
+     * 0x16 :: LCB_PROTOCOL_ERROR (Protocol error)
+     * 0x17 :: LCB_ETIMEDOUT (Operation timed out)
+     * 0x18 :: LCB_CONNECT_ERROR (Connection failure)
+     * 0x19 :: LCB_BUCKET_ENOENT (No such bucket)
+     * 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)
+     *
      *
      * @since 1.0.0
      *
@@ -410,6 +481,14 @@ Init_couchbase_ext(void)
      * @return [Symbol] the operation (+nil+ unless accessible) */
     rb_define_attr(eBaseError, "operation", 1, 0);
     id_iv_operation = rb_intern("@operation");
+    /* Document-method: inner_exception
+     *
+     * @since 1.2.0.beta4
+     *
+     * @return [Exception] the inner exception or +nil+. Some exceptions like
+     *      {Error::ValueFormat} wrap the original exception */
+    rb_define_attr(eBaseError, "inner_exception", 1, 0);
+    id_iv_inner_exception = rb_intern("@inner_exception");
 
     /* Document-class: Couchbase::Result
      *
@@ -910,6 +989,7 @@ Init_couchbase_ext(void)
     id_path = rb_intern("path");
     id_port = rb_intern("port");
     id_scheme = rb_intern("scheme");
+    id_sprintf = rb_intern("sprintf");
     id_to_s = rb_intern("to_s");
     id_user = rb_intern("user");
     id_verify_observe_options = rb_intern("verify_observe_options");

data/ext/couchbase_ext/couchbase_ext.h

@@ -228,6 +228,7 @@ extern ID id_iv_error;
 extern ID id_iv_flags;
 extern ID id_iv_from_master;
 extern ID id_iv_headers;
+extern ID id_iv_inner_exception;
 extern ID id_iv_key;
 extern ID id_iv_node;
 extern ID id_iv_operation;
@@ -243,6 +244,7 @@ extern ID id_password;
 extern ID id_path;
 extern ID id_port;
 extern ID id_scheme;
+extern ID id_sprintf;
 extern ID id_to_s;
 extern ID id_user;
 extern ID id_verify_observe_options;
@@ -250,6 +252,7 @@ extern ID id_verify_observe_options;
 /* Errors */
 extern VALUE eBaseError;
 extern VALUE eValueFormatError;
+extern VALUE eHTTPError;
                                        /* LCB_SUCCESS = 0x00         */
                                        /* LCB_AUTH_CONTINUE = 0x01   */
 extern VALUE eAuthError;               /* LCB_AUTH_ERROR = 0x02      */
@@ -264,20 +267,21 @@ extern VALUE eLibcouchbaseError;       /* LCB_ERROR = 0x0a           */
 extern VALUE eTmpFailError;            /* LCB_ETMPFAIL = 0x0b        */
 extern VALUE eKeyExistsError;          /* LCB_KEY_EEXISTS = 0x0c     */
 extern VALUE eNotFoundError;           /* LCB_KEY_ENOENT = 0x0d      */
-extern VALUE eLibeventError;           /* LCB_LIBEVENT_ERROR = 0x0e  */
-extern VALUE eNetworkError;            /* LCB_NETWORK_ERROR = 0x0f   */
-extern VALUE eNotMyVbucketError;       /* LCB_NOT_MY_VBUCKET = 0x10  */
-extern VALUE eNotStoredError;          /* LCB_NOT_STORED = 0x11      */
-extern VALUE eNotSupportedError;       /* LCB_NOT_SUPPORTED = 0x12   */
-extern VALUE eUnknownCommandError;     /* LCB_UNKNOWN_COMMAND = 0x13 */
-extern VALUE eUnknownHostError;        /* LCB_UNKNOWN_HOST = 0x14    */
-extern VALUE eProtocolError;           /* LCB_PROTOCOL_ERROR = 0x15  */
-extern VALUE eTimeoutError;            /* LCB_ETIMEDOUT = 0x16       */
-extern VALUE eConnectError;            /* LCB_CONNECT_ERROR = 0x17   */
-extern VALUE eBucketNotFoundError;     /* LCB_BUCKET_ENOENT = 0x18   */
-extern VALUE eClientNoMemoryError;     /* LCB_CLIENT_ENOMEM = 0x19   */
-extern VALUE eClientTmpFailError;      /* LCB_CLIENT_ETMPFAIL = 0x20 */
-extern VALUE eBadHandleError;          /* LCB_EBADHANDLE = 0x21      */
+extern VALUE eDlopenFailedError;       /* LCB_DLOPEN_FAILED = 0x0e   */
+extern VALUE eDlsymFailedError;        /* LCB_DLSYM_FAILED = 0x0f    */
+extern VALUE eNetworkError;            /* LCB_NETWORK_ERROR = 0x10   */
+extern VALUE eNotMyVbucketError;       /* LCB_NOT_MY_VBUCKET = 0x11  */
+extern VALUE eNotStoredError;          /* LCB_NOT_STORED = 0x12      */
+extern VALUE eNotSupportedError;       /* LCB_NOT_SUPPORTED = 0x13   */
+extern VALUE eUnknownCommandError;     /* LCB_UNKNOWN_COMMAND = 0x14 */
+extern VALUE eUnknownHostError;        /* LCB_UNKNOWN_HOST = 0x15    */
+extern VALUE eProtocolError;           /* LCB_PROTOCOL_ERROR = 0x16  */
+extern VALUE eTimeoutError;            /* LCB_ETIMEDOUT = 0x17       */
+extern VALUE eConnectError;            /* LCB_CONNECT_ERROR = 0x18   */
+extern VALUE eBucketNotFoundError;     /* LCB_BUCKET_ENOENT = 0x19   */
+extern VALUE eClientNoMemoryError;     /* LCB_CLIENT_ENOMEM = 0x1a   */
+extern VALUE eClientTmpFailError;      /* LCB_CLIENT_ETMPFAIL = 0x1b */
+extern VALUE eBadHandleError;          /* LCB_EBADHANDLE = 0x1c      */
 
 void strip_key_prefix(struct bucket_st *bucket, VALUE key);
 VALUE cb_check_error(lcb_error_t rc, const char *msg, VALUE key);

data/ext/couchbase_ext/delete.c

@@ -152,8 +152,10 @@ cb_bucket_delete(int argc, VALUE *argv, VALUE self)
         if (exc != Qnil) {
             rb_exc_raise(cb_gc_unprotect(bucket, exc));
         }
-        if (bucket->exception != Qnil) {
-            rb_exc_raise(bucket->exception);
+        exc = bucket->exception;
+        if (exc != Qnil) {
+            bucket->exception = Qnil;
+            rb_exc_raise(exc);
         }
         if (params.cmd.remove.num > 1) {
             return rv;  /* return as a hash {key => true, ...} */

data/ext/couchbase_ext/extconf.rb

@@ -119,7 +119,7 @@ if try_compile(<<-SRC)
   define("HAVE_STDARG_PROTOTYPES")
 end
 
-have_library("couchbase", "lcb_set_http_data_callback", "libcouchbase/couchbase.h") or abort "You should install libcouchbase >= 2.0.0beta2. See http://www.couchbase.com/develop/ for more details"
+have_library("couchbase", "lcb_verify_compiler_setup", "libcouchbase/couchbase.h") or abort "You should install libcouchbase >= 2.0.0beta3. See http://www.couchbase.com/develop/ for more details"
 have_header("mach/mach_time.h")
 have_header("stdint.h") or abort "Failed to locate stdint.h"
 have_header("sys/time.h")

data/ext/couchbase_ext/get.c

@@ -42,16 +42,21 @@ get_callback(lcb_t handle, const void *cookie, lcb_error_t error, const lcb_get_
     cas = ULL2NUM(resp->v.v0.cas);
     val = Qnil;
     if (resp->v.v0.nbytes != 0) {
-        val = decode_value(STR_NEW((const char*)resp->v.v0.bytes, resp->v.v0.nbytes),
-                resp->v.v0.flags, ctx->force_format);
-        if (val == Qundef) {
+        VALUE raw = STR_NEW((const char*)resp->v.v0.bytes, resp->v.v0.nbytes);
+        val = decode_value(raw, resp->v.v0.flags, ctx->force_format);
+        if (rb_obj_is_kind_of(val, rb_eStandardError)) {
+            VALUE exc_str = rb_funcall(val, id_to_s, 0);
+            VALUE msg = rb_funcall(rb_mKernel, id_sprintf, 3,
+                    rb_str_new2("unable to convert value for key '%s': %s"), key, exc_str);
             if (ctx->exception != Qnil) {
                 cb_gc_unprotect(bucket, ctx->exception);
             }
-            ctx->exception = rb_exc_new2(eValueFormatError, "unable to convert value");
+            ctx->exception = rb_exc_new3(eValueFormatError, msg);
             rb_ivar_set(ctx->exception, id_iv_operation, sym_get);
             rb_ivar_set(ctx->exception, id_iv_key, key);
+            rb_ivar_set(ctx->exception, id_iv_inner_exception, val);
             cb_gc_protect(bucket, ctx->exception);
+            val = raw;
         }
     } else if (flags_get_format(resp->v.v0.flags) == sym_plain) {
         val = STR_NEW_CSTR("");
@@ -275,8 +280,10 @@ cb_bucket_get(int argc, VALUE *argv, VALUE self)
             cb_gc_unprotect(bucket, exc);
             rb_exc_raise(exc);
         }
-        if (bucket->exception != Qnil) {
-            rb_exc_raise(bucket->exception);
+        exc = bucket->exception;
+        if (exc != Qnil) {
+            bucket->exception = Qnil;
+            rb_exc_raise(exc);
         }
         if (params.cmd.get.gat || params.cmd.get.assemble_hash ||
                 (params.cmd.get.extended && (params.cmd.get.num > 1 || params.cmd.get.array))) {

data/ext/couchbase_ext/observe.c

@@ -160,8 +160,10 @@ cb_bucket_observe(int argc, VALUE *argv, VALUE self)
             cb_gc_unprotect(bucket, exc);
             rb_exc_raise(exc);
         }
-        if (bucket->exception != Qnil) {
-            rb_exc_raise(bucket->exception);
+        exc = bucket->exception;
+        if (exc != Qnil) {
+            bucket->exception = Qnil;
+            rb_exc_raise(exc);
         }
         if (params.cmd.observe.num > 1 || params.cmd.observe.array) {
             return rv;  /* return as a hash {key => {}, ...} */

data/ext/couchbase_ext/stats.c

@@ -157,8 +157,10 @@ cb_bucket_stats(int argc, VALUE *argv, VALUE self)
             cb_gc_unprotect(bucket, exc);
             rb_exc_raise(exc);
         }
-        if (bucket->exception != Qnil) {
-            rb_exc_raise(bucket->exception);
+        exc = bucket->exception;
+        if (exc != Qnil) {
+            bucket->exception = Qnil;
+            rb_exc_raise(exc);
         }
         return rv;
     }

data/ext/couchbase_ext/store.c

@@ -161,8 +161,10 @@ cb_bucket_store(lcb_storage_t cmd, int argc, VALUE *argv, VALUE self)
             cb_gc_unprotect(bucket, exc);
             rb_exc_raise(exc);
         }
-        if (bucket->exception != Qnil) {
-            rb_exc_raise(bucket->exception);
+        exc = bucket->exception;
+        if (exc != Qnil) {
+            bucket->exception = Qnil;
+            rb_exc_raise(exc);
         }
         if (RTEST(obs)) {
             cb_gc_unprotect(bucket, obs);

data/ext/couchbase_ext/touch.c

@@ -174,8 +174,10 @@ cb_bucket_touch(int argc, VALUE *argv, VALUE self)
         if (exc != Qnil) {
             rb_exc_raise(cb_gc_unprotect(bucket, exc));
         }
-        if (bucket->exception != Qnil) {
-            rb_exc_raise(bucket->exception);
+        exc = bucket->exception;
+        if (exc != Qnil) {
+            bucket->exception = Qnil;
+            rb_exc_raise(exc);
         }
         if (params.cmd.touch.num > 1) {
             return rv;  /* return as a hash {key => true, ...} */

data/ext/couchbase_ext/unlock.c

@@ -164,8 +164,10 @@ cb_bucket_unlock(int argc, VALUE *argv, VALUE self)
         if (exc != Qnil) {
             rb_exc_raise(cb_gc_unprotect(bucket, exc));
         }
-        if (bucket->exception != Qnil) {
-            rb_exc_raise(bucket->exception);
+        exc = bucket->exception;
+        if (exc != Qnil) {
+            bucket->exception = Qnil;
+            rb_exc_raise(exc);
         }
         if (params.cmd.unlock.num > 1) {
             return rv;  /* return as a hash {key => true, ...} */

data/ext/couchbase_ext/utils.c

@@ -77,7 +77,8 @@ cb_check_error_with_status(lcb_error_t rc, const char *msg, VALUE key,
     VALUE klass, exc, str;
     char buf[300];
 
-    if (rc == LCB_SUCCESS || rc == LCB_AUTH_CONTINUE) {
+    if ((rc == LCB_SUCCESS && (status == 0 || status / 100 == 2)) ||
+            rc == LCB_AUTH_CONTINUE) {
         return Qnil;
     }
     switch (rc) {
@@ -114,8 +115,11 @@ cb_check_error_with_status(lcb_error_t rc, const char *msg, VALUE key,
         case LCB_KEY_ENOENT:
             klass = eNotFoundError;
             break;
-        case LCB_LIBEVENT_ERROR:
-            klass = eLibeventError;
+        case LCB_DLOPEN_FAILED:
+            klass = eDlopenFailedError;
+            break;
+        case LCB_DLSYM_FAILED:
+            klass = eDlsymFailedError;
             break;
         case LCB_NETWORK_ERROR:
             klass = eNetworkError;
@@ -170,6 +174,7 @@ cb_check_error_with_status(lcb_error_t rc, const char *msg, VALUE key,
     }
     if (status > 0) {
         const char *reason = NULL;
+        klass = eHTTPError;
         snprintf(buf, 300, "status=\"%d\"", status);
         rb_str_buf_cat2(str, buf);
         switch (status) {
@@ -367,9 +372,10 @@ do_decode(VALUE *args)
 }
 
     static VALUE
-coding_failed(void)
+coding_failed(VALUE unused, VALUE exc)
 {
-    return Qundef;
+    (void)unused;
+    return exc;
 }
 
     VALUE
@@ -379,13 +385,8 @@ encode_value(VALUE val, uint32_t flags)
 
     args[0] = val;
     args[1] = (VALUE)flags;
-    /* FIXME re-raise proper exception */
     blob = rb_rescue(do_encode, (VALUE)args, coding_failed, 0);
-    /* it must be bytestring after all */
-    if (TYPE(blob) != T_STRING) {
-        return Qundef;
-    }
-    return blob;
+    return blob; /* bytestring or exception object */
 }
 
     VALUE
@@ -401,7 +402,7 @@ decode_value(VALUE blob, uint32_t flags, VALUE force_format)
     args[1] = (VALUE)flags;
     args[2] = (VALUE)force_format;
     val = rb_rescue(do_decode, (VALUE)args, coding_failed, 0);
-    return val;
+    return val; /* the value or exception object */
 }
 
     void

data/ext/couchbase_ext/version.c

@@ -137,8 +137,10 @@ cb_bucket_version(int argc, VALUE *argv, VALUE self)
             cb_gc_unprotect(bucket, exc);
             rb_exc_raise(exc);
         }
-        if (bucket->exception != Qnil) {
-            rb_exc_raise(bucket->exception);
+        exc = bucket->exception;
+        if (exc != Qnil) {
+            bucket->exception = Qnil;
+            rb_exc_raise(exc);
         }
         return rv;
     }

data/lib/action_dispatch/middleware/session/couchbase_store.rb

@@ -16,7 +16,7 @@ module ActionDispatch
     # Or remove this file and add following line to your `config/application.rb`:
     #
     #   require 'action_dispatch/middleware/session/couchbase_store'
-    #   config.session_storage = :couchbase_store
+    #   config.session_store :couchbase_store
     #
     # You can also pass additional options:
     #
@@ -25,7 +25,7 @@ module ActionDispatch
     #     :expire_after => 5.minutes,
     #     :couchbase => {:bucket => "sessions", :default_format => :marshal}
     #   }
-    #   config.session_storage = :couchbase_store, session_options
+    #   config.session_store :couchbase_store, session_options
     #
     # By default sessions will be serialized to JSON, to allow analyse them
     # using Map/Reduce.

data/lib/couchbase/bucket.rb

@@ -106,6 +106,9 @@ module Couchbase
       req.on_body do |body|
         res = MultiJson.load(body.value)
         res["rows"].each do |obj|
+          if obj['doc']
+            obj['doc']['value'] = obj['doc'].delete('json')
+          end
           doc = ViewRow.wrap(self, obj)
           key = doc.id.sub(/^_design\//, '')
           next if self.environment == :production && key =~ /dev_/
@@ -117,17 +120,6 @@ module Couchbase
       async? ? nil : docmap
     end
 
-    # Fetch all documents from the bucket.
-    #
-    # @since 1.2.0
-    #
-    # @param [Hash] params Params for Couchbase +/_all_docs+ query
-    #
-    # @return [Couchbase::View] View object
-    def all_docs(params = {})
-      View.new(self, "_all_docs", params)
-    end
-
     # Update or create design doc with supplied views
     #
     # @since 1.2.0

data/lib/couchbase/version.rb

@@ -17,5 +17,5 @@
 
 # Couchbase ruby client
 module Couchbase
-  VERSION = "1.2.0.z.beta3"
+  VERSION = "1.2.0.z.beta4"
 end

data/lib/couchbase/view.rb

@@ -15,6 +15,8 @@
 # limitations under the License.
 #
 
+require 'base64'
+
 module Couchbase
 
   module Error
@@ -50,7 +52,7 @@ module Couchbase
     def initialize(bucket, endpoint, params = {})
       @bucket = bucket
       @endpoint = endpoint
-      @params = params
+      @params = {:connection_timeout => 75_000}.merge(params)
       @wrapper_class = params.delete(:wrapper_class) || ViewRow
       unless @wrapper_class.respond_to?(:wrap)
         raise ArgumentError, "wrapper class should reposond to :wrap, check the options"
@@ -142,8 +144,14 @@ module Couchbase
     #   the document and store them in {ViewRow#meta} hash.
     #
     # @param [Hash] params parameters for Couchbase query.
-    # @option params [true, false] :include_docs (false) Include the full
-    #   content of the documents in the return.
+    # @option params [true, false] :include_docs (false) Include the
+    #   full content of the documents in the return. Note that the document
+    #   is fetched from the in memory cache where it may have been changed
+    #   or even deleted. See also +:quiet+ parameter below to control error
+    #   reporting during fetch.
+    # @option params [true, false] :quiet (true) Do not raise error if
+    #   associated document not found in the memory. If the parameter +true+
+    #   will use +nil+ value instead.
     # @option params [true, false] :descending (false) Return the documents
     #   in descending by key order
     # @option params [String, Fixnum, Hash, Array] :key Return only
@@ -175,7 +183,7 @@ module Couchbase
     #               response stream.
     #   :stop::     Stop immediately when an error condition occurs. No
     #               further view information will be returned.
-    # @option params [Fixnum] :connection_timeout (60000) Timeout before the
+    # @option params [Fixnum] :connection_timeout (75000) Timeout before the
     #   view request is dropped (milliseconds)
     # @option params [true, false] :reduce (true) Use the reduction function
     # @option params [true, false] :group (false) Group the results using
@@ -236,6 +244,11 @@ module Couchbase
         body = MultiJson.dump(body) unless body.is_a?(String)
         options.update(:body => body, :method => params.delete(:method) || :post)
       end
+      include_docs = params.delete(:include_docs)
+      quiet = true
+      if params.has_key?(:quiet)
+        quiet = params.delete(:quiet)
+      end
       path = Utils.build_query(@endpoint, params)
       request = @bucket.make_http_request(path, options)
       res = []
@@ -260,6 +273,17 @@ module Couchbase
             raise Error::View.new(from, reason)
           end
         else
+          if include_docs
+            val, flags, cas = @bucket.get(obj['id'], :extended => true, :quiet => quiet)
+            obj['doc'] = {
+              'value' => val,
+              'meta' => {
+                'id' => obj['id'],
+                'flags' => flags,
+                'cas' => cas
+              }
+            }
+          end
           if block_given?
             yield @wrapper_class.wrap(@bucket, obj)
           else

data/lib/couchbase/view_row.rb

@@ -115,7 +115,7 @@ module Couchbase
       @value = data['value']
       if data['doc']
         @meta = data['doc']['meta']
-        @doc = data['doc']['json']
+        @doc = data['doc']['value']
       end
       @id = data['id'] || @meta && @meta['id']
       @views = []

data/lib/ext/multi_json_fix.rb

@@ -24,6 +24,16 @@ if MultiJson.respond_to?(:engine)
 else
   multi_json_engine = MultiJson.send(:adapter)
 end
+
+# Patch for MultiJson versions < 1.3.3
+require 'multi_json/version'
+if Gem::Version.new(MultiJson::VERSION) < Gem::Version.new('1.3.3')
+  class << MultiJson
+    alias :dump :encode
+    alias :load :decode
+  end
+end
+
 if multi_json_engine.name =~ /JsonGem$/
   class << multi_json_engine
     alias _load_object load
@@ -36,12 +46,3 @@ if multi_json_engine.name =~ /JsonGem$/
     end
   end
 end
-
-# Patch for MultiJson versions < 1.3.3
-if MultiJson.respond_to?(:decode) && MultiJson.respond_to?(:encode) &&
-  !MultiJson.respond_to?(:load) && !MultiJson.respond_to?(:dump)
-  class << MultiJson
-    alias :dump :encode
-    alias :load :decode
-  end
-end

data/lib/rack/session/couchbase.rb

@@ -42,7 +42,8 @@ module Rack
       attr_reader :mutex, :pool
 
       DEFAULT_OPTIONS = Abstract::ID::DEFAULT_OPTIONS.merge(
-        :couchbase => {:default_format => :document, :key_prefix => 'rack:session:'})
+        :couchbase => {:quiet => true, :default_format => :document,
+                       :key_prefix => 'rack:session:'})
 
       def initialize(app, options = {})
         # Support old :expires option
@@ -75,7 +76,7 @@ module Rack
 
       def set_session(env, session_id, new_session, options)
         with_lock(env, false) do
-          @pool.set session_id, new_session, options
+          @pool.set(session_id, new_session, options)
           session_id
         end
       end

data/tasks/compile.rake

@@ -84,7 +84,7 @@ namespace :ports do
   directory "ports"
 
   task :libcouchbase => ["ports"] do
-    recipe = MiniPortile.new "libcouchbase", "2.0.0beta2_1_gf60b9fe"
+    recipe = MiniPortile.new "libcouchbase", "2.0.0beta3"
     recipe.files << "http://packages.couchbase.com/clients/c/libcouchbase-#{recipe.version}.tar.gz"
     recipe.configure_options.push("--disable-debug",
                                   "--disable-dependency-tracking",

data/test/test_unlock.rb

@@ -71,7 +71,6 @@ class TestTouch < MiniTest::Unit::TestCase
       end
       ret = connection.unlock(uniq_id(1) => info[uniq_id(1)][2],
                               uniq_id(2) => info[uniq_id(2)][2])
-      puts ret.inspect
       assert ret[uniq_id(1)]
       assert ret[uniq_id(2)]
       connection.set(uniq_id(1), "bar")

data/test/test_utils.rb

@@ -19,8 +19,40 @@ require File.join(File.dirname(__FILE__), 'setup')
 
 class TestUtils < MiniTest::Unit::TestCase
 
+  def setup
+    @mock = start_mock
+  end
+
+  def teardown
+    stop_mock(@mock)
+  end
+
   def test_complex_startkey
     assert_equal "all_docs?startkey=%5B%22Deadmau5%22%2C%22%22%5D", Couchbase::Utils.build_query("all_docs", :startkey =>  ["Deadmau5", ""])
   end
 
+  def test_it_provides_enough_info_with_value_error
+    class << MultiJson
+      alias dump_good dump
+      def dump(obj)
+        raise ArgumentError, "cannot accept your object"
+      end
+    end
+    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port)
+    assert_raises(Couchbase::Error::ValueFormat) do
+      connection.set(uniq_id, "foo")
+    end
+    begin
+      connection.set(uniq_id, "foo")
+    rescue Couchbase::Error::ValueFormat => ex
+      assert_match /cannot accept your object/, ex.to_s
+      assert_instance_of ArgumentError, ex.inner_exception
+    end
+  ensure
+    class << MultiJson
+      undef dump
+      alias dump dump_good
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: couchbase
 version: !ruby/object:Gem::Version
-  version: 1.2.0.z.beta3
+  version: 1.2.0.z.beta4
   prerelease: 6
 platform: x86-mingw32
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-16 00:00:00.000000000 Z
+date: 2012-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yaji
@@ -215,6 +215,7 @@ files:
 - Gemfile
 - HISTORY.markdown
 - LICENSE
+- Makefile
 - README.markdown
 - Rakefile
 - couchbase.gemspec
@@ -294,7 +295,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2344661928388476453
+      hash: 1903080247241788551
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -307,4 +308,25 @@ rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Couchbase ruby driver
-test_files: []
+test_files:
+- test/profile/.gitignore
+- test/profile/Gemfile
+- test/profile/benchmark.rb
+- test/setup.rb
+- test/test_arithmetic.rb
+- test/test_async.rb
+- test/test_bucket.rb
+- test/test_cas.rb
+- test/test_couchbase.rb
+- test/test_couchbase_rails_cache_store.rb
+- test/test_delete.rb
+- test/test_errors.rb
+- test/test_format.rb
+- test/test_get.rb
+- test/test_stats.rb
+- test/test_store.rb
+- test/test_timer.rb
+- test/test_touch.rb
+- test/test_unlock.rb
+- test/test_utils.rb
+- test/test_version.rb