couchbase 1.3.3-x86-mingw32 → 1.3.4-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64c92cbfdb47cf90b52c5a3ddf6817b0b2f47824
-  data.tar.gz: 52b91ab4cad3bd75ca351b24f34a7cf3b68b7344
+  metadata.gz: 221f1d443a518cad70e8ead8d41d7c608dbb908e
+  data.tar.gz: 86524a93db4d704a9a63b7ef242dbb5f904901b3
 SHA512:
-  metadata.gz: 1cc2d6eaf5fff25fa40b9d0ac9e389bd2cbc3561c6e98355d138c746db7004614d01e3e47ef5c1f2990657cfb68571bba12a19182c091c8c70f045320232fb66
-  data.tar.gz: db81527b9c87d8522e5b4e0c9712fbef06b53628d388757e0f5c60d12e9403afd71b10b4c8311073fbf178f79397b6c86775da28e02c6fb1f961e26dbaf3bfb6
+  metadata.gz: 04ba277b1f42d6f2fade8012c4d855ba8c4846d33087849e93748066d4adf10dd7403a6983f253cc848069c86b51ffba8a598004d8be6916cd4e31687b53472f
+  data.tar.gz: 019154be57677cf09f9ff39a30a1eba41a59757005c1850ec6e1fad91bb347cdd199e7b8a5368b47d13745d41775a62d58f0bef4a61004f9b6ff152603a604da

data/README.markdown

@@ -8,10 +8,11 @@ are related libraries available:
 
 ## SUPPORT
 
-If you found an issue, please file it in our [JIRA][1]. Also you are
-always welcome on `#libcouchbase` channel at [freenode.net IRC servers][2].
+If you find an issue, please file it in our [JIRA][1]. Also you are
+always welcome on the `#libcouchbase` channel at [freenode.net IRC servers][2].
 
-Documentation: [http://rdoc.info/gems/couchbase](http://rdoc.info/gems/couchbase)
+Documentation: [http://docs.couchbase.com/couchbase-sdk-ruby-1.3/](http://docs.couchbase.com/couchbase-sdk-ruby-1.3/)
+API Documentation: [http://www.couchbase.com/autodocs/](http://www.couchbase.com/autodocs/)
 
 ## INSTALL
 
@@ -39,7 +40,7 @@ your OS release:
     # Ubuntu 10.04 Lucid Lynx (Debian stable or testing)
     deb http://packages.couchbase.com/ubuntu lucid lucid/main
 
-Import Couchbase PGP key:
+Import the Couchbase PGP key:
 
     wget -O- http://packages.couchbase.com/ubuntu/couchbase.key | sudo apt-key add -
 
@@ -47,7 +48,7 @@ Then install them
 
     $ sudo apt-get update && sudo apt-get install libcouchbase-dev
 
-Again, if you need preview versions, just use another repositories in
+Again, if you need a preview of a future version, just use another repository in
 your `couchbase.list`
 
     # Ubuntu 11.10 Oneiric Ocelot (Debian unstable)
@@ -72,8 +73,8 @@ Then to install libcouchbase itself, run:
 
     $ sudo yum update && sudo yum install libcouchbase-devel
 
-We have preview repositories for RPMs too, use them if you need to try
-fresh version of couchbase gem:
+We have preview repositories for RPMs too, use them if you want to try
+the latest version of libcouchbase:
 
     [couchbase]
     name = Couchbase package repository
@@ -85,8 +86,8 @@ fresh version of couchbase gem:
 
 ### Windows
 
-There no additional dependencies for Windows systems. The gem carry
-prebuilt binary for it.
+There are no additional dependencies for Windows systems. The gem carries
+a prebuilt binary for it.
 
 ### Couchbase gem
 
@@ -96,12 +97,12 @@ Now install the couchbase gem itself
 
 ## USAGE
 
-First of all you need to load library:
+First, you need to load the library:
 
     require 'couchbase'
 
-There are several ways to establish new connection to Couchbase Server.
-By default it uses the `http://localhost:8091/pools/default/buckets/default`
+There are several ways to establish a new connection to Couchbase Server.
+By default it uses `http://localhost:8091/pools/default/buckets/default`
 as the endpoint. The client will automatically adjust configuration when
 the cluster will rebalance its nodes when nodes are added or deleted
 therefore this client is "smart".
@@ -122,13 +123,13 @@ The hash parameters take precedence on string URL.
 If you worry about state of your nodes or not sure what node is alive,
 you can pass the list of nodes and the library will iterate over it
 until finds the working one. From that moment it won't use **your**
-list, because node list from cluster config is more actual.
+list, because node list from cluster config carries more detail.
 
     c = Couchbase.connect(:bucket => "mybucket",
                           :node_list => ['example.com:8091', example.net'])
 
-There is also handy method `Couchbase.bucket` which uses thread local
-storage to keep the reference to default connection. You can set the
+There is also a handy method `Couchbase.bucket` which uses thread local
+storage to keep a reference to a connection. You can set the
 connection options via `Couchbase.connection_options`:
 
     Couchbase.connection_options = {:bucket => 'blog'}
@@ -137,9 +138,9 @@ connection options via `Couchbase.connection_options`:
 
 The library supports both synchronous and asynchronous mode. In
 asynchronous mode all operations will return control to caller
-without blocking current thread. You can pass the block to method and it
+without blocking current thread. You can pass a block to the method and it
 will be called with result when the operation will be completed. You
-need to run event loop when you scheduled your operations:
+need to run the event loop once you've scheduled your operations:
 
     c = Couchbase.connect
     c.run do |conn|
@@ -155,7 +156,7 @@ The handlers could be nested
       end
     end
 
-The asynchronous callback receives instance of `Couchbase::Result` which
+The asynchronous callback receives an instance of `Couchbase::Result` which
 responds to several methods to figure out what was happened:
 
   * `success?`. Returns `true` if operation succed.
@@ -171,7 +172,7 @@ responds to several methods to figure out what was happened:
 
   * `cas`. The CAS version tag.
 
-  * `node`. Node address. It is used in flush and stats commands.
+  * `node`. Node address. This is used in the flush and stats commands.
 
   * `operation`. The symbol, representing an operation.
 
@@ -186,14 +187,14 @@ used. It can be set in following fashions:
     handler = lambda {|opcode, key, exc| }
     c.on_error = handler
 
-By default connection uses `:quiet` mode. This mean it won't raise
-exceptions when the given key is not exists:
+By default connections use `:quiet` mode. This mean it won't raise
+exceptions when the given key does not exist:
 
     c.get("missing-key")            #=> nil
 
 It could be useful when you are trying to make you code a bit efficient
 by avoiding exception handling. (See `#add` and `#replace` operations).
-You can turn on these exception by passing `:quiet => false` when you
+You can turn on these exceptions by passing `:quiet => false` when you
 are instantiating the connection or change corresponding attribute:
 
     c.quiet = false
@@ -278,7 +279,7 @@ Hash-like syntax
 
 ### Add
 
-Add command will fail if the key already exists. It accepts the same
+The add command will fail if the key already exists. It accepts the same
 options as set command above.
 
     c.add("foo", "bar")
@@ -338,8 +339,10 @@ Couchbase::Error::DeltaBadval if the delta or value is not a number.
     c.incr("missing2", :create => true)     #=> 0
     c.incr("missing2", :create => true)     #=> 1
 
-Note that it isn't the same as increment/decrement in ruby, which is
-performed on client side with following `set` operation:
+Note that it isn't the same as increment/decrement in ruby. A
+Couchbase increment is atomic on a distributed system.  The
+Ruby incement could ovewrite intermediate values with multiple
+clients, as shown with following `set` operation:
 
     c["foo"] = 10
     c["foo"] -= 20                  #=> -10
@@ -469,9 +472,9 @@ To execute view you need to fetch it from design document `_design/blog`:
     blog.views                    #=> ["recent_posts"]
     blog.recent_posts             #=> [#<Couchbase::ViewRow:9855800 @id="hello-world" @key="2009/01/15 15:52:20" @value="Hello World" @doc=nil @meta={} @views=[]>, ...]
 
-Gem uses streaming parser to access view results so you can iterate them
-easily and if your code won't keep links to the documents GC might free
-them as soon as it decide they are unreachable, because parser doesn't
+The gem uses a streaming parser to access view results so you can iterate them
+easily. If your code doesn't keep links to the documents the GC might free
+them as soon as it decides they are unreachable, because the parser doesn't
 store global JSON tree.
 
     blog.recent_posts.each do |doc|
@@ -499,7 +502,7 @@ You can also use Enumerator to iterate view results
       acc
     end
 
-The Couchbase server could generate errors during view execution with
+Couchbase Server could generate errors during view execution with
 `200 OK` and partial results. By default the library raises exception as
 soon as errors detected in the result stream, but you can define the
 callback `on_error` to intercept these errors and do something more
@@ -569,6 +572,69 @@ choose from several asynchronous IO options:
           end
         end
 
+## HACKING
+
+Clone the repository. For starters, you can use github mirror, but
+make sure you have read and understand [CONTRIBUTING.markdown][10] if
+you are going to send us patches.
+
+    $ git clone git://github.com/couchbase/couchbase-ruby-client.git
+    $ cd couchbase-ruby-client
+
+Install all development dependencies. You can use any ruby version
+since 1.8.7, but make sure your changes work at least on major
+releases (1.8.7, 1.9.3, 2.0.0 and 2.1.0 at the moment):
+
+    $ gem install bundler
+    $ bundle install
+
+Don't forget to write the tests. You can find examples in the `tests/`
+directory. To run tests with a mock just compile extension and run the
+`test` task, it will download a test mock of couchbase cluster as a
+part of the process (the mock is generally slower, but easier to
+setup):
+
+    $ rake compile test
+
+If you have real Couchbase server installed somewhere, you can pass
+its address using environment variable `COUCHBASE_SERVER` like this:
+
+    $ COUCHBASE_SERVER=localhost:8091 rake compile test
+
+And finally, you can package the gem with your awesome changes. For
+UNIX-like systems a regular source-based package will be enough, so the
+command below will produce `pkg/couchbase-VERSION.gem`, where
+`VERSION` is the current version from file `lib/couchbase/version.rb`:
+
+    $ rake package
+
+The Windows operating system usually doesn't have a build environment
+installed. This is why we are cross-compiling blobs for Windows from
+UNIX-like boxes. To do it you need to install mingw and the
+[rake-compiler][11] and then build a variety of ruby versions currently
+supported on Windows. An example config looks like this:
+
+    $ rake-compiler update-config
+    Updating /home/avsej/.rake-compiler/config.yml
+    Found Ruby version 1.8.7 for platform i386-mingw32 (/home/avsej/.rake-compiler/ruby/i686-w64-mingw32/ruby-1.8.7-p374/lib/ruby/1.8/i386-mingw32/rbconfig.rb)
+    Found Ruby version 1.9.3 for platform i386-mingw32 (/home/avsej/.rake-compiler/ruby/i686-w64-mingw32/ruby-1.9.3-p448/lib/ruby/1.9.1/i386-mingw32/rbconfig.rb)
+    Found Ruby version 2.0.0 for platform i386-mingw32 (/home/avsej/.rake-compiler/ruby/i686-w64-mingw32/ruby-2.0.0-p247/lib/ruby/2.0.0/i386-mingw32/rbconfig.rb)
+    Found Ruby version 2.1.0 for platform i386-mingw32 (/home/avsej/.rake-compiler/ruby/i686-w64-mingw32/ruby-2.1.0/lib/ruby/2.1.0/i386-mingw32/rbconfig.rb)
+    Found Ruby version 1.9.3 for platform x64-mingw32 (/home/avsej/.rake-compiler/ruby/x86_64-w64-mingw32/ruby-1.9.3-p448/lib/ruby/1.9.1/x64-mingw32/rbconfig.rb)
+    Found Ruby version 2.0.0 for platform x64-mingw32 (/home/avsej/.rake-compiler/ruby/x86_64-w64-mingw32/ruby-2.0.0-p247/lib/ruby/2.0.0/x64-mingw32/rbconfig.rb)
+    Found Ruby version 2.1.0 for platform x64-mingw32 (/home/avsej/.rake-compiler/ruby/x86_64-w64-mingw32/ruby-2.1.0/lib/ruby/2.1.0/x64-mingw32/rbconfig.rb)
+
+Before you build, check relevant ruby and libcouchbase versions in
+`tasks/compile.rake`. After that you can run the `package:windows`
+task and you will find all artifacts in `pkg/` directory:
+
+    $ rake package:windows
+    $ ls -1 pkg/*.gem
+    pkg/couchbase-1.3.4.gem
+    pkg/couchbase-1.3.4-x64-mingw32.gem
+    pkg/couchbase-1.3.4-x86-mingw32.gem
+
+
 [1]: http://couchbase.com/issues/browse/RCBC
 [2]: http://freenode.net/irc_servers.shtml
 [3]: http://www.couchbase.com/develop/c/current
@@ -578,4 +644,6 @@ choose from several asynchronous IO options:
 [7]: https://github.com/couchbase/couchbase-ruby-model
 [8]: http://www.couchbase.com/develop/c/current
 [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
 

data/RELEASE_NOTES.markdown

@@ -3,6 +3,32 @@
 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.4 (2014-01-08)
+
+* [major] Build 64-bit versions of the extensions for Windows
+  platform. Also support ruby 2.0 and 2.1.
+
+* [minor] Update hacking section in README
+
+* [minor] Fix gemspec warnings regarding versions of the dependencies.
+  Now it honours semantic versioning and doesn't use strict versions.
+
+* [major] RCBC-151 Return CAS in extended mode for incr/decr
+
+* [minor] RCBC-150 Update list of options on `Cluster.create_bucket`.
+  Added new options: `:replica_index`, `:flush_enabled`,
+  `:parallel_db_and_view_compaction`.
+
+* [major] Allow retries on Couchbase::Bucket#cas collisions.  Now it
+  takes a `:retry` Fixnum option that specifies the maximum number of
+  times the method should retry the entire get/update/set operation
+  when a `Couchbase::Error::KeyExists` error is encountered due to a
+  concurrent update from another writer between its `#get` and `#set`
+  calls.
+
+* [major] MD5 and truncate ActiveSupport::Cache keys that are longer
+  than 250 characters.
+
 ## 1.3.3 (2013-09-12)
 
 * [major] RCBC-134 Allow application to use several connections with

data/Rakefile

@@ -15,8 +15,6 @@
 # limitations under the License.
 #
 
-require 'bundler/gem_tasks'
-
 Dir['tasks/*.rake'].sort.each { |f| load f }
 
 task :default => [:clobber, :compile, :test]

data/couchbase.gemspec

@@ -35,15 +35,15 @@ Gem::Specification.new do |s|
   s.extensions    = `git ls-files -- ext/**/extconf.rb`.split("\n")
   s.require_paths = ['lib']
 
-  s.add_runtime_dependency 'yaji', '~> 0.3.2'
+  s.add_runtime_dependency 'yaji', '~> 0.3', '>= 0.3.2'
   s.add_runtime_dependency 'multi_json', '~> 1.0'
-  s.add_runtime_dependency 'connection_pool', '~> 1.0.0'
+  s.add_runtime_dependency 'connection_pool', '~> 1.0', '>= 1.0.0'
 
   s.add_development_dependency 'rake'
-  s.add_development_dependency 'minitest', '~> 5.0.4'
-  s.add_development_dependency 'rake-compiler', '>= 0.7.5'
-  s.add_development_dependency 'mini_portile'
-  s.add_development_dependency 'yajl-ruby', '~> 1.1.0'
+  s.add_development_dependency 'minitest', '~> 5.0', '>= 5.0.4'
+  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 'eventmachine'
 end

data/ext/couchbase_ext/arithmetic.c

@@ -89,6 +89,7 @@ cb_bucket_arithmetic(int sign, int argc, VALUE *argv, VALUE self)
     params.cmd.arith.sign = sign;
     cb_params_build(&params);
     ctx = cb_context_alloc_common(bucket, proc, params.cmd.arith.num);
+    ctx->extended = params.cmd.arith.extended;
     err = lcb_arithmetic(bucket->handle, (const void *)ctx,
             params.cmd.arith.num, params.cmd.arith.ptr);
     cb_params_destroy(&params);

data/ext/couchbase_ext/extconf.rb

@@ -46,8 +46,12 @@ end
 $CFLAGS << ' -std=c99 -Wall -Wextra '
 if ENV['DEBUG']
   $CFLAGS << ' -O0 -ggdb3 -pedantic '
+else
+  $CFLAGS << ' -O2'
+  $LDFLAGS << ' -Wl,--strip-debug' if RbConfig::CONFIG['target_os'] =~ /mingw32/
 end
 
+
 if RbConfig::CONFIG['target_os'] =~ /mingw32/
   dir_config("libcouchbase")
 else
@@ -97,6 +101,7 @@ else
   dir_config("libcouchbase", HEADER_DIRS, LIB_DIRS)
 end
 
+
 if COMMON_HEADERS !~ /"ruby\.h"/
   (COMMON_HEADERS ||= "") << %(\n#include "ruby.h"\n)
 end
@@ -126,6 +131,8 @@ def die(message)
   abort
 end
 
+install_notice = "You must install libcouchbase >= 2.1.3\nSee http://www.couchbase.com/communities/c/ for more details"
+
 unless try_compile(<<-SRC)
   #include <libcouchbase/couchbase.h>
   #include <stdio.h>
@@ -135,10 +142,11 @@ unless try_compile(<<-SRC)
     return 0;
   }
   SRC
-  die("You must install libcouchbase >= 2.1.3\nSee http://www.couchbase.com/communities/c/ for more details")
+  die(install_notice)
 end
 
-have_library("couchbase", "lcb_verify_compiler_setup", "libcouchbase/couchbase.h") # just to add -lcouchbase properly
+# just to add -lcouchbase properly
+have_library("couchbase", "lcb_verify_compiler_setup", "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")

data/ext/couchbase_ext/multithread_plugin.c

@@ -550,7 +550,7 @@ typedef fd_set rb_fdset_t;
 
 typedef struct loop_select_arg {
     rb_mt_loop *loop;
-    rb_fdset_t in, out;
+    rb_fdset_t in, out, exc;
 } ls_arg;
 
     static void
@@ -574,7 +574,7 @@ loop_run_select(VALUE argp)
 {
     ls_arg *args = (ls_arg*) argp;
     rb_mt_loop *loop = args->loop;
-    rb_fdset_t *in = NULL, *out = NULL;
+    rb_fdset_t *in = NULL, *out = NULL, *exc = NULL;
     struct timeval timeout;
     struct timeval *timeoutp = NULL;
     int result, max = 0;
@@ -598,21 +598,26 @@ loop_run_select(VALUE argp)
         uint32_t i;
         rb_fd_init(&args->in);
         rb_fd_init(&args->out);
+        rb_fd_init(&args->exc);
         for(i = 0; i < loop->events.count; i++) {
             rb_mt_socket_list *list = &loop->events.sockets[i];
-            if (list->flags & LCB_READ_EVENT) {
-                in = &args->in;
-                rb_fd_set(list->socket, in);
-            }
-            if (list->flags & LCB_WRITE_EVENT) {
-                out = &args->out;
-                rb_fd_set(list->socket, out);
+            if (list->flags != 0) {
+                if (list->flags & LCB_READ_EVENT) {
+                    in = &args->in;
+                    rb_fd_set(list->socket, in);
+                }
+                if (list->flags & LCB_WRITE_EVENT) {
+                    out = &args->out;
+                    rb_fd_set(list->socket, out);
+                }
+                exc = &args->exc;
+                rb_fd_set(list->socket, exc);
             }
         }
         max = events_max_fd(&loop->events) + 1;
     }
 
-    result = rb_thread_fd_select(max, in, out, NULL, timeoutp);
+    result = rb_thread_fd_select(max, in, out, exc, timeoutp);
 
     if (result < 0) {
         rb_sys_fail("rb_thread_fd_select");
@@ -636,6 +641,10 @@ loop_run_select(VALUE argp)
                 flags |= LCB_WRITE_EVENT;
                 result--;
             }
+            if (exc && rb_fd_isset(list->socket, exc)) {
+                flags = LCB_ERROR_EVENT | LCB_WRITE_EVENT;
+                result--;
+            }
             if (flags) {
                 loop_enque_events(&loop->callbacks, sock, flags);
             }

data/lib/active_support/cache/couchbase_store.rb

@@ -55,6 +55,7 @@ module ActiveSupport
         options[:default_ttl] ||= options.delete(:expires_in)
         options[:default_format] ||= :marshal
         options[:key_prefix] ||= options.delete(:namespace)
+        @key_prefix = options[:key_prefix]
         options[:connection_pool] ||= options.delete(:connection_pool)
         args.push(options)
 
@@ -348,7 +349,7 @@ module ActiveSupport
       # object responds to +cache_key+. Otherwise, to_param method will be
       # called. If the key is a Hash, then keys will be sorted alphabetically.
       def expanded_key(key) # :nodoc:
-        return key.cache_key.to_s if key.respond_to?(:cache_key)
+        return validate_key(key.cache_key.to_s) if key.respond_to?(:cache_key)
 
         case key
         when Array
@@ -361,7 +362,22 @@ module ActiveSupport
           key = key.sort_by { |k,_| k.to_s }.collect{|k,v| "#{k}=#{v}"}
         end
 
-        key.respond_to?(:to_param) ? key.to_param : key
+        validate_key(key.respond_to?(:to_param) ? key.to_param : key)
+      end
+
+      def validate_key(key)
+        if key_with_prefix(key).length > 250
+          key = "#{key[0, max_length_before_prefix]}:md5:#{Digest::MD5.hexdigest(key)}"
+        end
+        return key
+      end
+
+      def key_with_prefix(key)
+        (ns = @key_prefix) ? "#{ns}#{key}" : key
+      end
+
+      def max_length_before_prefix
+        @max_length_before_prefix ||= 212 - (@key_prefix || '').size
       end
 
       module Threadsafe

data/lib/couchbase/bucket.rb

@@ -35,12 +35,23 @@ module Couchbase
     #
     # @see http://couchbase.com/docs/memcached-api/memcached-api-protocol-text_cas.html
     #
+    # Setting the +:retry+ option to a positive number will cause this method
+    # to rescue the {Couchbase::Error::KeyExists} error that happens when
+    # an update collision is detected, and automatically get a fresh copy
+    # of the value and retry the block. This will repeat as long as there
+    # continues to be conflicts, up to the maximum number of retries specified.
+    # For asynchronous mode, this means the block will be yielded once for
+    # the initial {Bucket#get}, once for the final {Bucket#set} (successful
+    # or last failure), and zero or more additional {Bucket#get} retries
+    # in between, up to the maximum allowed by the +:retry+ option.
+    #
     # @param [String, Symbol] key
     #
     # @param [Hash] options the options for "swap" part
     # @option options [Fixnum] :ttl (self.default_ttl) the time to live of this key
     # @option options [Symbol] :format (self.default_format) format of the value
     # @option options [Fixnum] :flags (self.default_flags) flags for this key
+    # @option options [Fixnum] :retry (0) maximum number of times to autmatically retry upon update collision
     #
     # @yieldparam [Object, Result] value old value in synchronous mode and
     #   +Result+ object in asynchronous mode.
@@ -80,16 +91,32 @@ module Couchbase
     #
     # @return [Fixnum] the CAS of new value
     def cas(key, options = {})
+      retries_remaining = options.delete(:retry) || 0
       if async?
         block = Proc.new
         get(key) do |ret|
           val = block.call(ret) # get new value from caller
-          set(ret.key, val, options.merge(:cas => ret.cas, :flags => ret.flags), &block)
+          set(ret.key, val, options.merge(:cas => ret.cas, :flags => ret.flags)) do |set_ret|
+            if set_ret.error.is_a?(Couchbase::Error::KeyExists) && (retries_remaining > 0)
+              cas(key, options.merge(:retry => retries_remaining - 1), &block)
+            else
+              block.call(set_ret)
+            end
+          end
         end
       else
-        val, flags, ver = get(key, :extended => true)
-        val = yield(val) # get new value from caller
-        set(key, val, options.merge(:cas => ver, :flags => flags))
+        begin
+          val, flags, ver = get(key, :extended => true)
+          val = yield(val) # get new value from caller
+          set(key, val, options.merge(:cas => ver, :flags => flags))
+        rescue Couchbase::Error::KeyExists
+          if retries_remaining > 0
+            retries_remaining -= 1
+            retry
+          else
+            raise
+          end
+        end
       end
     end
     alias :compare_and_swap :cas

data/lib/couchbase/cluster.rb

@@ -42,11 +42,19 @@ module Couchbase
     #   bucket. Possible values are "memcached" and "couchbase".
     # @option options [Fixnum] :ram_quota (100) The RAM quota in megabytes.
     # @option options [Fixnum] :replica_number (1) The number of replicas of
-    #   each document
+    #   each document. Minimum 0, maximum 3.
     # @option options [String] :auth_type ("sasl") The authentication type.
     #   Possible values are "sasl" and "none". Note you should specify free
     #   port for "none"
     # @option options [Fixnum] :proxy_port The port for moxi
+    # @option options [true, false] :replica_index (true) Disable or
+    #   enable indexes for bucket replicas
+    # @option options [true, false] :flush_enabled (false) Enables the
+    #   'flush all' functionality on the specified bucket.
+    # @option options [true, false] :parallel_db_and_view_compaction (false)
+    #   Indicates whether database and view files on disk can be
+    #   compacted simultaneously
+    #
     def create_bucket(name, options = {})
       defaults = {
         :type => "couchbase",
@@ -54,7 +62,10 @@ module Couchbase
         :replica_number => 1,
         :auth_type => "sasl",
         :sasl_password => "",
-        :proxy_port => nil
+        :proxy_port => nil,
+        :flush_enabled => false,
+        :replica_index => true,
+        :parallel_db_and_view_compaction => false
       }
       options = defaults.merge(options)
       params = {"name" => name}
@@ -64,6 +75,9 @@ module Couchbase
       params["authType"] = options[:auth_type]
       params["saslPassword"] = options[:sasl_password]
       params["proxyPort"] = options[:proxy_port]
+      params["flushEnabled"] = !!options[:flush_enabled]
+      params["replicaIndex"] = !!options[:replica_index]
+      params["parallelDBAndViewCompaction"] = !!options[:parallel_db_and_view_compaction]
       payload = Utils.encode_params(params.reject!{|k, v| v.nil?})
       request = @connection.make_http_request("/pools/default/buckets",
                                               :content_type => "application/x-www-form-urlencoded",

data/lib/couchbase/version.rb

@@ -17,5 +17,5 @@
 
 # Couchbase ruby client
 module Couchbase
-  VERSION = "1.3.3"
+  VERSION = "1.3.4"
 end

data/tasks/compile.rake

@@ -30,6 +30,36 @@ version_router = lambda do |t|
   end
 end
 
+class Platform
+  attr_reader :name, :host, :versions
+
+  def initialize(params)
+    @name = params[:name]
+    @host = params[:host]
+    @versions = params[:versions]
+  end
+
+  def each_version
+    @versions.each do |v|
+      yield(v, v[/\d\.\d\.\d/])
+    end
+  end
+
+  def short_versions
+    res = []
+    each_version do |long, short|
+      res << short
+    end
+    res
+  end
+end
+
+recent = "2.0.0-p353"
+CROSS_PLATFORMS = [
+  Platform.new(:name => 'x64-mingw32', :host => 'x86_64-w64-mingw32', :versions => %w(1.9.3-p484 2.0.0-p353 2.1.0)),
+  Platform.new(:name => 'x86-mingw32', :host => 'i686-w64-mingw32', :versions => %w(1.8.7-p374 1.9.3-p484 2.0.0-p353 2.1.0)),
+]
+
 # Setup compile tasks.  Configuration can be passed via ENV.
 # Example:
 #  rake compile with_libcouchbase_include=/opt/couchbase/include
@@ -41,13 +71,14 @@ end
 #
 Rake::ExtensionTask.new("couchbase_ext", gemspec) do |ext|
   ext.cross_compile = true
-  ext.cross_platform = ENV['HOST'] || "i386-mingw32"
+  ext.cross_platform = ENV['TARGET']
   if ENV['RUBY_CC_VERSION']
     ext.lib_dir = "lib/couchbase"
   end
   ext.cross_compiling do |spec|
     spec.files.delete("lib/couchbase/couchbase_ext.so")
-    spec.files.push("lib/couchbase_ext.rb", Dir["lib/couchbase/1.{8,9}/couchbase_ext.so"])
+    spec.files.push("lib/couchbase_ext.rb", Dir["lib/couchbase/*/couchbase_ext.so"])
+    spec.files.push(Dir["lib/couchbase/*/couchbase_ext.so"])
     file "#{ext.tmp_dir}/#{ext.cross_platform}/stage/lib/couchbase_ext.rb", &version_router
   end
 
@@ -66,19 +97,13 @@ end
 
 require 'rubygems/package_task'
 Gem::PackageTask.new(gemspec) do |pkg|
-  pkg.need_tar = true
+  pkg.need_tar = pkg.need_zip = false
 end
 
 require 'mini_portile'
 require 'rake/extensioncompiler'
 
 class MiniPortile
-  alias :initialize_with_default_host :initialize
-  def initialize(name, version)
-    initialize_with_default_host(name, version)
-    @host = ENV['HOST'] || Rake::ExtensionCompiler.mingw_host
-  end
-
   alias :cook_without_checkpoint :cook
   def cook
     checkpoint = "ports/.#{name}-#{version}-#{host}.installed"
@@ -89,13 +114,30 @@ class MiniPortile
   end
 end
 
-namespace :ports do
-  directory "ports"
+file "lib/couchbase_ext.rb", &version_router
 
-  task :libcouchbase => ["ports"] do
-    recipe = MiniPortile.new "libcouchbase", "2.1.3"
+desc "Package gem for windows"
+task "package:windows" => ["package", "lib/couchbase_ext.rb"] do
+  vars = [
+    'CC',
+    'CFLAGS',
+    'CPATH',
+    'CPP',
+    'CPPFLAGS',
+    'LDFLAGS',
+    'LIBRARY_PATH',
+    'PATH'
+  ].reduce({}) do |h, v|
+    h[v] = ENV[v]
+    h
+  end
+  CROSS_PLATFORMS.each do |platform|
+    ENV['TARGET'] = platform.name
+    rm_rf("tmp/ ports/")
+    mkdir_p("ports")
+    recipe = MiniPortile.new("libcouchbase", "2.2.0_30_gc87bec4")
+    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",
@@ -105,16 +147,12 @@ namespace :ports do
                                   "--disable-tools")
     recipe.cook
     recipe.activate
+    platform.each_version do |long, short|
+      sh("env RUBY_CC_VERSION=#{short} RBENV_VERSION=#{long} rbenv exec rake cross compile")
+    end
+    vars.each do |k, v|
+      ENV[k] = v
+    end
+    sh("env RUBY_CC_VERSION=#{platform.short_versions.join(":")} RBENV_VERSION=#{recent} rbenv exec rake cross native gem")
   end
 end
-
-file "lib/couchbase_ext.rb", &version_router
-task :cross => ["lib/couchbase_ext.rb", "ports:libcouchbase"]
-
-desc "Package gem for windows"
-task "package:windows" => :package do
-  sh("env RUBY_CC_VERSION=1.8.7 RBENV_VERSION=1.8.7-p370 rbenv exec bundle exec rake cross compile")
-  sh("env RUBY_CC_VERSION=1.9.2 RBENV_VERSION=1.9.2-p320 rbenv exec bundle exec rake cross compile")
-  sh("env RUBY_CC_VERSION=2.0.0 RBENV_VERSION=2.0.0-p247 rbenv exec bundle exec rake cross compile")
-  sh("env RUBY_CC_VERSION=1.8.7:1.9.2:2.0.0 RBENV_VERSION=1.9.2-p320 rbenv exec bundle exec rake cross native gem")
-end

data/test/test_arithmetic.rb

@@ -173,4 +173,13 @@ class TestArithmetic < MiniTest::Test
     assert_equal [2, 2],   connection.decr(uniq_id(:foo), uniq_id(:bar), :delta => 10).values.sort
     assert_equal [1, 1],   connection.decr(uniq_id(:foo), uniq_id(:bar)).values.sort
   end
+
+  def test_it_returns_cas_value_in_extended_mode
+    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port)
+    orig_cas = connection.set(uniq_id(:foo), 1)
+    val, cas = connection.incr(uniq_id(:foo), :extended => true)
+    assert_equal 2, val
+    assert cas.is_a?(Numeric), "CAS should be numeric value: #{cas.inspect}"
+    refute_equal orig_cas, cas
+  end
 end

data/test/test_cas.rb

@@ -40,6 +40,69 @@ class TestCas < MiniTest::Test
     assert_equal expected, val
   end
 
+  def test_compare_and_swap_collision
+    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port,
+                               :default_format => :document)
+    connection.set(uniq_id, {"bar" => 1})
+    assert_raises(Couchbase::Error::KeyExists) do
+      connection.cas(uniq_id) do |val|
+        # Simulate collision with a separate writer. This will
+        # change the CAS value to be different than what #cas just loaded.
+        connection.set(uniq_id, {"bar" => 2})
+
+        # Complete the modification we desire, which should fail when set.
+        val["baz"] = 3
+        val
+      end
+    end
+  end
+
+  def test_compare_and_swap_retry
+    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port,
+                               :default_format => :document)
+    connection.set(uniq_id, {"bar" => 1})
+    calls = 0
+    connection.cas(uniq_id, :retry => 1) do |val|
+      calls += 1
+      if calls == 1
+        # Simulate collision with a separate writer. This will
+        # change the CAS value to be different than what #cas just loaded.
+        # Only do this the first time this block is executed.
+        connection.set(uniq_id, {"bar" => 2})
+      end
+
+      # Complete the modification we desire, which should fail when set.
+      val["baz"] = 3
+      val
+    end
+    assert_equal 2, calls
+    val = connection.get(uniq_id)
+    expected = {"bar" => 2, "baz" => 3}
+    assert_equal expected, val
+  end
+
+  def test_compare_and_swap_too_many_retries
+    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port,
+                               :default_format => :document)
+    connection.set(uniq_id, {"bar" => 0})
+    calls = 0
+    assert_raises(Couchbase::Error::KeyExists) do
+      connection.cas(uniq_id, :retry => 10) do |val|
+        calls += 1
+
+        # Simulate collision with a separate writer. This will
+        # change the CAS value to be different than what #cas just loaded.
+        # Do it every time so we just keep retrying and failing.
+        connection.set(uniq_id, {"bar" => calls})
+
+        # Complete the modification we desire, which should fail when set.
+        val["baz"] = 3
+        val
+      end
+    end
+    assert_equal 11, calls
+  end
+
   def test_compare_and_swap_async
     connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port,
                                :default_format => :document)
@@ -66,6 +129,101 @@ class TestCas < MiniTest::Test
     assert_equal expected, val
   end
 
+  def test_compare_and_swap_async_collision
+    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port,
+                               :default_format => :document)
+    connection.set(uniq_id, {"bar" => 1})
+    calls = 0
+    connection.run do |conn|
+      conn.cas(uniq_id) do |ret|
+        calls += 1
+        case ret.operation
+        when :get
+          new_val = ret.value
+
+          # Simulate collision with a separate writer. This will
+          # change the CAS value to be different than what #cas just loaded.
+          connection.set(uniq_id, {"bar" => 2})
+
+
+          # Complete the modification we desire, which should fail when set.
+          new_val["baz"] = 3
+          new_val
+        when :set
+          assert ret.error.is_a? Couchbase::Error::KeyExists
+        else
+          flunk "Unexpected operation: #{ret.operation.inspect}"
+        end
+      end
+    end
+    assert_equal 2, calls
+  end
+
+  def test_compare_and_swap_async_retry
+    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port,
+                               :default_format => :document)
+    connection.set(uniq_id, {"bar" => 1})
+    calls = 0
+    connection.run do |conn|
+      conn.cas(uniq_id, :retry => 1) do |ret|
+        calls += 1
+        case ret.operation
+        when :get
+          new_val = ret.value
+
+          if calls == 1
+            # Simulate collision with a separate writer. This will
+            # change the CAS value to be different than what #cas just loaded.
+            # Only do this the first time this block is executed.
+            connection.set(uniq_id, {"bar" => 2})
+          end
+
+          # Complete the modification we desire, which should fail when set.
+          new_val["baz"] = 3
+          new_val
+        when :set
+          assert ret.success?
+        else
+          flunk "Unexpected operation: #{ret.operation.inspect}"
+        end
+      end
+    end
+    assert_equal 3, calls
+    val = connection.get(uniq_id)
+    expected = {"bar" => 2, "baz" => 3}
+    assert_equal expected, val
+  end
+
+  def test_compare_and_swap_async_too_many_retries
+    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port,
+                               :default_format => :document)
+    connection.set(uniq_id, {"bar" => 0})
+    calls = 0
+    connection.run do |conn|
+      conn.cas(uniq_id, :retry => 10) do |ret|
+        calls += 1
+        case ret.operation
+        when :get
+          new_val = ret.value
+
+          # Simulate collision with a separate writer. This will
+          # change the CAS value to be different than what #cas just loaded.
+          # Do it every time so we just keep retrying and failing.
+          connection.set(uniq_id, {"bar" => calls})
+
+          # Complete the modification we desire, which should fail when set.
+          new_val["baz"] = 3
+          new_val
+        when :set
+          assert ret.error.is_a? Couchbase::Error::KeyExists
+        else
+          flunk "Unexpected operation: #{ret.operation.inspect}"
+        end
+      end
+    end
+    assert_equal 12, calls
+  end
+
   def test_flags_replication
     connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port,
                                :default_format => :document)

data/test/test_couchbase_rails_cache_store.rb

@@ -43,6 +43,12 @@ class TestCouchbaseRailsCacheStore < MiniTest::Test
                                                              :connection_pool => 5)
   end
 
+  def prefixed_store
+    @prefixed_store ||= ActiveSupport::Cache::CouchbaseStore.new(:hostname => @mock.host,
+                                                                 :port => @mock.port,
+                                                                 :namespace => 'v1')
+  end
+
   def test_it_supported_methods
     supported_methods = store.public_methods(false).map(&:to_sym)
     assert supported_methods.include?(:fetch)
@@ -327,6 +333,20 @@ class TestCouchbaseRailsCacheStore < MiniTest::Test
     workers.each { |w| w.join }
   end
 
+  # These tests are only relevant against a real server,
+  # CouchbaseMock seems to accept long keys.
+  def test_it_can_handle_keys_longer_than_250_characters
+    long_key = 'a' * 260
+    assert store.write(long_key, 123)
+    assert_equal 123, store.read(long_key)
+  end
+
+  def test_it_can_handle_keys_longer_than_250_characters_with_a_prefix
+    long_key = 'a' * 249
+    assert prefixed_store.write(long_key, 123)
+    assert_equal 123, prefixed_store.read(long_key)
+  end
+
   private
 
   def collect_notifications

data/test/test_format.rb

@@ -153,7 +153,12 @@ class TestFormat < MiniTest::Test
     assert_equal(ZlibTranscoder::FMT_ZLIB|Couchbase::Bucket::FMT_DOCUMENT, flags)
     connection.transcoder = nil
     doc = connection.get(uniq_id)
-    assert_equal "x\x01\xABVJ\xCB\xCFW\xB2RJJ,R\xAA\x05\0\x1Dz\x044", doc
+    case RUBY_VERSION
+    when /^1\.8/
+      assert_equal "x\x01\xABVJ\xCB\xCFW\xB2RJJ,R\xAA\x05\0\x1Dz\x044", doc
+    else
+      assert_equal "x\u0001\xABVJ\xCB\xCFW\xB2RJJ,R\xAA\u0005\u0000\u001Dz\u00044", doc
+    end
   end
 
 end

metadata

@@ -1,20 +1,23 @@
 --- !ruby/object:Gem::Specification
 name: couchbase
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.3.4
 platform: x86-mingw32
 authors:
 - Couchbase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-17 00:00:00.000000000 Z
+date: 2014-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yaji
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.3'
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.3.2
   type: :runtime
@@ -22,6 +25,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.3'
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.3.2
 - !ruby/object:Gem::Dependency
@@ -43,6 +49,9 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
@@ -50,20 +59,23 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   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'
 - !ruby/object:Gem::Dependency
@@ -71,6 +83,9 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
+      - !ruby/object:Gem::Version
+        version: '5.0'
+    - - '>='
       - !ruby/object:Gem::Version
         version: 5.0.4
   type: :development
@@ -78,41 +93,59 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
+      - !ruby/object:Gem::Version
+        version: '5.0'
+    - - '>='
       - !ruby/object:Gem::Version
         version: 5.0.4
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.7'
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.7.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.7'
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.7.5
 - !ruby/object:Gem::Dependency
   name: mini_portile
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.5'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.5.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.5'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.5.2
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.1.0
   type: :development
@@ -120,34 +153,37 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: active_support
   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'
 - !ruby/object:Gem::Dependency
   name: eventmachine
   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.
@@ -249,6 +285,7 @@ files:
 - lib/couchbase/1.8/couchbase_ext.so
 - lib/couchbase/1.9/couchbase_ext.so
 - lib/couchbase/2.0/couchbase_ext.so
+- lib/couchbase/2.1/couchbase_ext.so
 - lib/couchbase_ext.rb
 homepage: http://couchbase.org
 licenses:
@@ -260,18 +297,41 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 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_connection_pool.rb
+- test/test_couchbase_rails_cache_store.rb
+- test/test_delete.rb
+- test/test_errors.rb
+- test/test_eventmachine.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