couchbase 1.2.3-x86-mingw32 → 1.3.0-x86-mingw32

data/lib/couchbase.rb

@@ -16,10 +16,9 @@
 #
 
 require 'couchbase/version'
-require 'multi_json'
-require 'ext/multi_json_fix'
 require 'yaji'
 require 'uri'
+require 'couchbase/transcoder'
 require 'couchbase_ext'
 require 'couchbase/constants'
 require 'couchbase/utils'
@@ -29,9 +28,12 @@ require 'couchbase/view'
 require 'couchbase/result'
 require 'couchbase/cluster'
 
+
 # Couchbase ruby client
 module Couchbase
 
+  autoload(:ConnectionPool, 'couchbase/connection_pool')
+
   class << self
     # The method +connect+ initializes new Bucket instance with all arguments passed.
     #

data/lib/couchbase/connection_pool.rb

@@ -0,0 +1,55 @@
+# Author:: Couchbase <info@couchbase.com>
+# Copyright:: 2013 Couchbase, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'connection_pool'
+
+module Couchbase
+  class ConnectionPool
+
+    def initialize(pool_size = 5, *args)
+      @pool = ::ConnectionPool.new(:size => pool_size) { ::Couchbase::Bucket.new(*args) }
+    end
+
+    def with
+      yield @pool.checkout
+    ensure
+      @pool.checkin
+    end
+
+    def respond_to?(id, *args)
+      super || @pool.with { |c| c.respond_to?(id, *args) }
+    end
+
+    def method_missing(name, *args, &block)
+      define_proxy_method(name)
+      send(name, *args, &block)
+    end
+
+    protected
+
+    def define_proxy_method(name)
+      self.class.class_eval <<-RUBY
+        def #{name}(*args, &block)
+          @pool.with do |connection|
+            connection.send(#{name.inspect}, *args, &block)
+          end
+        end
+      RUBY
+    end
+
+  end
+end

data/lib/couchbase/transcoder.rb

@@ -0,0 +1,120 @@
+# Author:: Couchbase <info@couchbase.com>
+# Copyright:: 2013 Couchbase, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'multi_json'
+require 'ext/multi_json_fix'
+
+module Couchbase
+
+  module Transcoder
+
+    module Compat
+      def self.enable!
+        @disabled = false
+      end
+
+      def self.disable!
+        @disabled = true
+      end
+
+      def self.enabled?
+        !@disabled
+      end
+
+      def self.guess_and_load(blob, flags, options = {})
+        case flags & Bucket::FMT_MASK
+        when Bucket::FMT_DOCUMENT
+          MultiJson.load(blob)
+        when Bucket::FMT_MARSHAL
+          ::Marshal.load(blob)
+        when Bucket::FMT_PLAIN
+          blob
+        else
+          raise ArgumentError, "unexpected flags (0x%02x)" % flags
+        end
+      end
+    end
+
+    module Document
+      def self.dump(obj, flags, options = {})
+        [
+          MultiJson.dump(obj),
+          (flags & ~Bucket::FMT_MASK) | Bucket::FMT_DOCUMENT
+        ]
+      end
+
+      def self.load(blob, flags, options = {})
+        if (flags & Bucket::FMT_MASK) == Bucket::FMT_DOCUMENT || options[:forced]
+          MultiJson.load(blob)
+        else
+          if Compat.enabled?
+            return Compat.guess_and_load(blob, flags, options)
+          else
+            raise ArgumentError,
+              "unexpected flags (0x%02x instead of 0x%02x)" % [flags, Bucket::FMT_DOCUMENT]
+          end
+        end
+      end
+    end
+
+    module Marshal
+      def self.dump(obj, flags, options = {})
+        [
+          ::Marshal.dump(obj),
+          (flags & ~Bucket::FMT_MASK) | Bucket::FMT_MARSHAL
+        ]
+      end
+
+      def self.load(blob, flags, options = {})
+        if (flags & Bucket::FMT_MASK) == Bucket::FMT_MARSHAL || options[:forced]
+          ::Marshal.load(blob)
+        else
+          if Compat.enabled?
+            return Compat.guess_and_load(blob, flags, options)
+          else
+            raise ArgumentError,
+              "unexpected flags (0x%02x instead of 0x%02x)" % [flags, Bucket::FMT_MARSHAL]
+          end
+        end
+      end
+    end
+
+    module Plain
+      def self.dump(obj, flags, options = {})
+        [
+          obj,
+          (flags & ~Bucket::FMT_MASK) | Bucket::FMT_PLAIN
+        ]
+      end
+
+      def self.load(blob, flags, options = {})
+        if (flags & Bucket::FMT_MASK) == Bucket::FMT_PLAIN || options[:forced]
+          blob
+        else
+          if Compat.enabled?
+            return Compat.guess_and_load(blob, flags, options)
+          else
+            raise ArgumentError,
+              "unexpected flags (0x%02x instead of 0x%02x)" % [flags, Bucket::FMT_PLAIN]
+          end
+        end
+      end
+    end
+
+  end
+
+end

data/lib/couchbase/version.rb

@@ -17,5 +17,5 @@
 
 # Couchbase ruby client
 module Couchbase
-  VERSION = "1.2.3"
+  VERSION = "1.3.0"
 end

data/tasks/compile.rake

@@ -84,7 +84,7 @@ namespace :ports do
   directory "ports"
 
   task :libcouchbase => ["ports"] do
-    recipe = MiniPortile.new "libcouchbase", "2.0.3"
+    recipe = MiniPortile.new "libcouchbase", "2.0.6"
     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_bucket.rb

@@ -128,7 +128,7 @@ class TestBucket < MiniTest::Unit::TestCase
     end
   end
 
-  def test_it_unable_to_connect_to_protected_buckets_with_wrond_credentials
+  def test_it_unable_to_connect_to_protected_buckets_with_wrong_credentials
     with_mock(:buckets_spec => 'protected:secret') do |mock|
       assert_raises Couchbase::Error::Auth do
         Couchbase.new(:hostname => mock.host,

data/test/test_couchbase_connection_pool.rb

@@ -0,0 +1,73 @@
+# Author:: Couchbase <info@couchbase.com>
+# Copyright:: 2013 Couchbase, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require File.join(File.dirname(__FILE__), 'setup')
+require 'couchbase/connection_pool'
+
+class TestCouchbaseConnectionPool < MiniTest::Unit::TestCase
+
+  def setup
+    @mock = start_mock
+    @pool = ::Couchbase::ConnectionPool.new(5, :hostname => @mock.host, :port => @mock.port)
+  end
+
+  def teardown
+    stop_mock(@mock)
+  end
+
+  def test_basic_multithreaded_usage
+    @pool.set('foo', 'bar')
+
+    threads = []
+    15.times do
+      threads << Thread.new do
+        @pool.get('foo')
+      end
+    end
+
+    result = threads.map(&:value)
+    result.each do |val|
+      assert_equal 'bar', val
+    end
+  end
+
+  def test_set_and_get
+    @pool.set('fiz', 'buzz')
+    assert_equal 'buzz', @pool.get('fiz')
+  end
+
+  def test_set_and_delete
+    @pool.set('baz', 'bar')
+    @pool.delete('baz')
+    assert_raises Couchbase::Error::NotFound do
+      @pool.get('baz')
+    end
+  end
+
+  def test_incr
+    @pool.set('counter', 0)
+    @pool.incr('counter', 1)
+    assert_equal 1, @pool.get('counter')
+  end
+
+  def test_decr
+    @pool.set('counter', 1)
+    @pool.decr('counter', 1)
+    assert_equal 0, @pool.get('counter')
+  end
+
+end

data/test/test_couchbase_rails_cache_store.rb

@@ -37,6 +37,12 @@ class TestCouchbaseRailsCacheStore < MiniTest::Unit::TestCase
                                                         :port => @mock.port)
   end
 
+  def pool_store
+    @pool_store ||= ActiveSupport::Cache::CouchbaseStore.new(:hostname => @mock.host,
+                                                             :port => @mock.port,
+                                                             :connection_pool => 5)
+  end
+
   def test_it_supported_methods
     supported_methods = store.public_methods(false).map(&:to_sym)
     assert supported_methods.include?(:fetch)
@@ -78,18 +84,17 @@ class TestCouchbaseRailsCacheStore < MiniTest::Unit::TestCase
     end
   end
 
-  if RUBY_VERSION.match /1\.9/
-    def test_it_reads_raw_data
-      store.write uniq_id, @foo
-      assert_equal "\x04\bU:\x0FOpenStruct{\x06:\fpayloadI\"\bfoo\x06:\x06EF",
-        store.read(uniq_id, :raw => true)
-    end
-  else
-    def test_it_reads_raw_data
-      store.write uniq_id, @foo
-      assert_equal "\004\bU:\017OpenStruct{\006:\fpayload\"\bfoo",
-        store.read(uniq_id, :raw => true)
-    end
+  def test_it_reads_raw_data
+    store.write uniq_id, @foo
+    expected = case RUBY_VERSION
+               when /^2\.0/
+                 "\x04\bU:\x0FOpenStruct{\x06:\fpayloadI\"\bfoo\x06:\x06ET"
+               when /^1\.9/
+                 "\x04\bU:\x0FOpenStruct{\x06:\fpayloadI\"\bfoo\x06:\x06EF"
+               else
+                 "\004\bU:\017OpenStruct{\006:\fpayload\"\bfoo"
+               end
+    assert_equal expected, store.read(uniq_id, :raw => true)
   end
 
   def test_it_writes_raw_data
@@ -303,6 +308,25 @@ class TestCouchbaseRailsCacheStore < MiniTest::Unit::TestCase
     workers.each { |w| w.join }
   end
 
+  def test_it_can_use_connection_pool_for_thread_safety
+    workers = []
+
+    10.times do
+      workers << Thread.new do
+        100.times do
+          pool_store.write('a', 9)
+          pool_store.write('b', 11)
+          assert_equal 9, pool_store.read('a')
+          assert_equal({ 'a' => 9, 'b' => 11 }, pool_store.read_multi('a', 'b'))
+          assert_equal 11, pool_store.read('b')
+          assert_equal %w(a b), pool_store.read_multi('a', 'b', 'c').keys.sort
+        end
+      end
+    end
+
+    workers.each { |w| w.join }
+  end
+
   private
 
   def collect_notifications

data/test/test_format.rb

@@ -78,7 +78,7 @@ class TestFormat < MiniTest::Unit::TestCase
     connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port)
     connection.set(uniq_id, orig_doc, :format => :marshal)
     doc, flags, cas = connection.get(uniq_id, :extended => true)
-    assert_equal 0x01, flags & 0x11
+    assert_equal Couchbase::Bucket::FMT_MARSHAL, flags & Couchbase::Bucket::FMT_MASK
     assert doc.is_a?(ArbitraryClass)
     assert_equal 'Twoflower', doc.name
     assert_equal 'The tourist', doc.role
@@ -106,4 +106,54 @@ class TestFormat < MiniTest::Unit::TestCase
     end
   end
 
+  def test_it_allows_to_turn_off_transcoder
+    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port, :transcoder => nil)
+    connection.set(uniq_id, "value", :flags => 0xffff_ffff)
+    doc, flags, _ = connection.get(uniq_id, :extended => true)
+    assert_equal "value", doc
+    assert_equal 0xffff_ffff, flags
+  end
+
+  require 'zlib'
+  # This class wraps any other transcoder and performs compression
+  # using zlib
+  class ZlibTranscoder
+    FMT_ZLIB = 0x04
+
+    def initialize(base)
+      @base = base
+    end
+
+    def dump(obj, flags, options = {})
+      obj, flags = @base.dump(obj, flags, options)
+      z = Zlib::Deflate.new(Zlib::BEST_SPEED)
+      buffer = z.deflate(obj, Zlib::FINISH)
+      z.close
+      [buffer, flags|FMT_ZLIB]
+    end
+
+    def load(blob, flags, options = {})
+      # decompress value only if Zlib flag set
+      if (flags & FMT_ZLIB) == FMT_ZLIB
+        z = Zlib::Inflate.new
+        blob = z.inflate(blob)
+        z.finish
+        z.close
+      end
+      @base.load(blob, flags, options)
+    end
+  end
+
+  def test_it_can_use_custom_transcoder
+    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port)
+    connection.transcoder = ZlibTranscoder.new(Couchbase::Transcoder::Document)
+    connection.set(uniq_id, {"foo" => "bar"})
+    doc, flags, _ = connection.get(uniq_id, :extended => true)
+    assert_equal({"foo" => "bar"}, doc)
+    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
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: couchbase
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.3.0
   prerelease: 
 platform: x86-mingw32
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-02 00:00:00.000000000 Z
+date: 2013-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yaji
@@ -43,6 +43,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: connection_pool
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -175,6 +191,16 @@ files:
 - examples/chat-em/Gemfile
 - examples/chat-em/README.markdown
 - examples/chat-em/server.rb
+- examples/chat-goliath-grape/Gemfile
+- examples/chat-goliath-grape/README.markdown
+- examples/chat-goliath-grape/app.rb
+- examples/chat-goliath-grape/config/app.rb
+- examples/transcoders/Gemfile
+- examples/transcoders/README.markdown
+- examples/transcoders/cb-zcat
+- examples/transcoders/cb-zcp
+- examples/transcoders/gzip_transcoder.rb
+- examples/transcoders/options.rb
 - ext/couchbase_ext/.gitignore
 - ext/couchbase_ext/arguments.c
 - ext/couchbase_ext/arithmetic.c
@@ -204,8 +230,10 @@ files:
 - lib/couchbase.rb
 - lib/couchbase/bucket.rb
 - lib/couchbase/cluster.rb
+- lib/couchbase/connection_pool.rb
 - lib/couchbase/constants.rb
 - lib/couchbase/result.rb
+- lib/couchbase/transcoder.rb
 - lib/couchbase/utils.rb
 - lib/couchbase/version.rb
 - lib/couchbase/view.rb
@@ -225,6 +253,7 @@ files:
 - 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
@@ -256,7 +285,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -322659644960790893
+      hash: 3514560369886917635
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -265,7 +294,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -322659644960790893
+      hash: 3514560369886917635
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23