couchbase 1.2.0.z.beta4 → 1.2.0.z.beta5

data/ext/couchbase_ext/version.c

@@ -18,16 +18,16 @@
 #include "couchbase_ext.h"
 
     void
-version_callback(lcb_t handle, const void *cookie, lcb_error_t error, const lcb_server_version_resp_t *resp)
+cb_version_callback(lcb_t handle, const void *cookie, lcb_error_t error, const lcb_server_version_resp_t *resp)
 {
-    struct context_st *ctx = (struct context_st *)cookie;
-    struct bucket_st *bucket = ctx->bucket;
+    struct cb_context_st *ctx = (struct cb_context_st *)cookie;
+    struct cb_bucket_st *bucket = ctx->bucket;
     VALUE node, val, *rv = ctx->rv, exc, res;
 
     node = resp->v.v0.server_endpoint ? STR_NEW_CSTR(resp->v.v0.server_endpoint) : Qnil;
     exc = cb_check_error(error, "failed to get version", node);
     if (exc != Qnil) {
-        rb_ivar_set(exc, id_iv_operation, sym_version);
+        rb_ivar_set(exc, cb_id_iv_operation, cb_sym_version);
         if (NIL_P(ctx->exception)) {
             ctx->exception = cb_gc_protect(bucket, exc);
         }
@@ -37,11 +37,11 @@ version_callback(lcb_t handle, const void *cookie, lcb_error_t error, const lcb_
         val = STR_NEW((const char*)resp->v.v0.vstring, resp->v.v0.nvstring);
         if (bucket->async) {    /* asynchronous */
             if (ctx->proc != Qnil) {
-                res = rb_class_new_instance(0, NULL, cResult);
-                rb_ivar_set(res, id_iv_error, exc);
-                rb_ivar_set(res, id_iv_operation, sym_version);
-                rb_ivar_set(res, id_iv_node, node);
-                rb_ivar_set(res, id_iv_value, val);
+                res = rb_class_new_instance(0, NULL, cb_cResult);
+                rb_ivar_set(res, cb_id_iv_error, exc);
+                rb_ivar_set(res, cb_id_iv_operation, cb_sym_version);
+                rb_ivar_set(res, cb_id_iv_node, node);
+                rb_ivar_set(res, cb_id_iv_value, val);
                 cb_proc_call(ctx->proc, 1, res);
             }
         } else {                /* synchronous */
@@ -52,6 +52,9 @@ version_callback(lcb_t handle, const void *cookie, lcb_error_t error, const lcb_
     } else {
         ctx->nqueries--;
         cb_gc_unprotect(bucket, ctx->proc);
+        if (bucket->async) {
+            xfree(ctx);
+        }
     }
 
     (void)handle;
@@ -87,26 +90,26 @@ version_callback(lcb_t handle, const void *cookie, lcb_error_t error, const lcb_
     VALUE
 cb_bucket_version(int argc, VALUE *argv, VALUE self)
 {
-    struct bucket_st *bucket = DATA_PTR(self);
-    struct context_st *ctx;
+    struct cb_bucket_st *bucket = DATA_PTR(self);
+    struct cb_context_st *ctx;
     VALUE rv, exc, args, proc;
     lcb_error_t err;
-    struct params_st params;
+    struct cb_params_st params;
 
     if (bucket->handle == NULL) {
-        rb_raise(eConnectError, "closed connection");
+        rb_raise(cb_eConnectError, "closed connection");
     }
     rb_scan_args(argc, argv, "0*&", &args, &proc);
     if (!bucket->async && proc != Qnil) {
         rb_raise(rb_eArgError, "synchronous mode doesn't support callbacks");
     }
-    memset(&params, 0, sizeof(struct params_st));
-    params.type = cmd_version;
+    memset(&params, 0, sizeof(struct cb_params_st));
+    params.type = cb_cmd_version;
     params.bucket = bucket;
     cb_params_build(&params, RARRAY_LEN(args), args);
-    ctx = xcalloc(1, sizeof(struct context_st));
+    ctx = xcalloc(1, sizeof(struct cb_context_st));
     if (ctx == NULL) {
-        rb_raise(eClientNoMemoryError, "failed to allocate memory for context");
+        rb_raise(cb_eClientNoMemoryError, "failed to allocate memory for context");
     }
     rv = rb_hash_new();
     ctx->rv = &rv;
@@ -124,7 +127,7 @@ cb_bucket_version(int argc, VALUE *argv, VALUE self)
     }
     bucket->nbytes += params.npayload;
     if (bucket->async) {
-        maybe_do_loop(bucket);
+        cb_maybe_do_loop(bucket);
         return Qnil;
     } else {
         if (ctx->nqueries > 0) {

data/lib/couchbase/version.rb

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

data/lib/couchbase/view.rb

@@ -29,6 +29,24 @@ module Couchbase
         super("#{prefix}#{from}: #{reason}")
       end
     end
+
+    class HTTP < Base
+      attr_reader :type, :reason
+
+      def parse_body!
+        if @body
+          hash = MultiJson.load(@body)
+          @type = hash["error"]
+          @reason = hash["reason"]
+        end
+      rescue MultiJson::DecodeError
+        @type = @reason = nil
+      end
+
+      def to_s
+        super.sub(/ \(/, ": #{@type}: #{@reason} (")
+      end
+    end
   end
 
   # This class implements Couchbase View execution

data/tasks/compile.rake

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

data/tasks/test.rake

@@ -48,47 +48,54 @@ end
 
 Rake::Task['test'].prerequisites.unshift('test/CouchbaseMock.jar')
 
-desc "Run the test suite under Valgrind."
+common_flags = %w[
+  --tool=memcheck
+  --error-limit=no
+  --undef-value-errors=no
+  --leak-check=full
+  --show-reachable=yes
+  --num-callers=50
+  --track-fds=yes
+  --workaround-gcc296-bugs=yes
+  --leak-resolution=med
+  --max-stackframe=7304328
+  --partial-loads-ok=yes
+]
+
+desc "Run the test suite under Valgrind memcheck."
 task "test:valgrind" do
-  ENV['RUBY_PREFIX'] = [
-    "valgrind",
-    "--num-callers=50",
-    "--error-limit=no",
-    "--partial-loads-ok=yes",
-    "--undef-value-errors=no",
-    "--track-fds=yes",
-    "--leak-check=full",
-    "--leak-resolution=med",
-  ].join(' ')
+  ENV['RUBY_PREFIX'] = "valgrind #{common_flags.join(' ')}"
   Rake::Task['test'].invoke
 end
 
-desc "Run the test suite under Valgrind with memory-fill."
+desc "Run the test suite under Valgrind memcheck with memory-fill."
 task "test:valgrind:mem_fill" do
-  ENV['RUBY_PREFIX'] = [
-    "valgrind",
-    "--num-callers=50",
-    "--error-limit=no",
-    "--partial-loads-ok=yes",
-    "--undef-value-errors=no",
-    "--freelist-vol=100000000",
-    "--malloc-fill=6D",
-    "--free-fill=66",
-  ].join(' ')
+  local_flags = %w[
+    --malloc-fill=6D
+    --freelist-vol=100000000
+    --free-fill=66
+  ]
+  ENV['RUBY_PREFIX'] = "valgrind #{common_flags.join(' ')} #{local_flags.join(' ')}"
   Rake::Task['test'].invoke
 end
 
-desc "Run the test suite under Valgrind with memory-zero."
+desc "Run the test suite under Valgrind memcheck with memory-zero."
 task "test:valgrind:mem_zero" do
-  ENV['RUBY_PREFIX'] = [
-    "valgrind",
-    "--num-callers=50",
-    "--error-limit=no",
-    "--partial-loads-ok=yes",
-    "--undef-value-errors=no",
-    "--freelist-vol=100000000",
-    "--malloc-fill=00",
-    "--free-fill=00",
-  ].join(' ')
+  local_flags = %w[
+    --freelist-vol=100000000
+    --malloc-fill=00
+    --free-fill=00
+  ]
+  ENV['RUBY_PREFIX'] = "valgrind #{common_flags.join(' ')} #{local_flags.join(' ')}"
+  Rake::Task['test'].invoke
+end
+
+desc "Run the test suite under Valgrind massif."
+task "test:valgrind:massif" do
+  local_flags = %w[
+    --tool=massif
+    --time-unit=B
+  ]
+  ENV['RUBY_PREFIX'] = "valgrind #{local_flags.join(' ')}"
   Rake::Task['test'].invoke
 end

data/test/setup.rb

@@ -168,4 +168,8 @@ class MiniTest::Unit::TestCase
   def uniq_id(*suffixes)
     [caller.first[/.*[` ](.*)'/, 1], suffixes].join("_")
   end
+
+  def after_teardown
+    GC.start
+  end
 end

data/test/test_arithmetic.rb

@@ -54,6 +54,43 @@ class TestArithmetic < MiniTest::Unit::TestCase
     end
   end
 
+  def test_it_allows_to_make_increments_less_verbose_by_forcing_create_by_default
+    connection = Couchbase.connect(:hostname => @mock.host, :port => @mock.port,
+                                   :default_arithmetic_init => true)
+    assert_raises(Couchbase::Error::NotFound) do
+      connection.get(uniq_id)
+    end
+    assert_equal 0, connection.incr(uniq_id), "return value"
+    assert_equal 0, connection.get(uniq_id), "via get command"
+  end
+
+  def test_it_allows_to_setup_initial_value_during_connection
+    connection = Couchbase.connect(:hostname => @mock.host, :port => @mock.port,
+                                   :default_arithmetic_init => 10)
+    assert_raises(Couchbase::Error::NotFound) do
+      connection.get(uniq_id)
+    end
+    assert_equal 10, connection.incr(uniq_id), "return value"
+    assert_equal 10, connection.get(uniq_id), "via get command"
+  end
+
+  def test_it_allows_to_change_default_initial_value_after_connection
+    connection = Couchbase.connect(:hostname => @mock.host, :port => @mock.port)
+
+    assert_equal 0, connection.default_arithmetic_init
+    assert_raises(Couchbase::Error::NotFound) do
+      connection.incr(uniq_id)
+    end
+
+    connection.default_arithmetic_init = 10
+    assert_equal 10, connection.default_arithmetic_init
+    assert_raises(Couchbase::Error::NotFound) do
+      connection.get(uniq_id)
+    end
+    assert_equal 10, connection.incr(uniq_id), "return value"
+    assert_equal 10, connection.get(uniq_id), "via get command"
+  end
+
   def test_it_creates_missing_key_when_initial_value_specified
     connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: couchbase
 version: !ruby/object:Gem::Version 
-  hash: 4727249961
+  hash: -6450534404
   prerelease: 6
   segments: 
   - 1
@@ -9,8 +9,8 @@ version: !ruby/object:Gem::Version
   - 0
   - z
   - beta
-  - 4
-  version: 1.2.0.z.beta4
+  - 5
+  version: 1.2.0.z.beta5
 platform: ruby
 authors: 
 - Couchbase
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-21 00:00:00 +03:00
+date: 2012-11-29 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -311,25 +311,5 @@ rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Couchbase ruby driver
-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
+test_files: []
+