couchbase 1.2.1 → 1.2.2

data/tasks/compile.rake

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

@@ -250,4 +250,67 @@ class TestAsync < MiniTest::Unit::TestCase
     end
   end
 
+  def test_asynchronous_connection
+    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port, :async => true)
+    refute connection.connected?, "new asynchronous connection must be disconnected"
+    connection.on_connect do |res|
+      assert res.success?, "on_connect called with error #{res.error.inspect}"
+      assert_same connection, res.bucket
+    end
+    connection.run {}
+    assert connection.connected?, "it should be connected after first run"
+  end
+
+  def test_it_calls_callback_immediately_if_connected_sync
+    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port)
+    assert connection.connected?, "connection wasn't established in sync mode"
+    called = false
+    connection.on_connect do |res|
+      assert res.success?, "on_connect called with error #{res.error.inspect}"
+      called = true
+    end
+    assert called, "the callback hasn't been called on set"
+    called = false
+    connection.on_connect do |res|
+      assert res.success?, "on_connect called with error #{res.error.inspect}"
+      called = true
+    end
+    refute called, "the callback must not be called on subsequent sets"
+  end
+
+  def test_it_calls_callback_immediately_if_connected_async
+    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port, :async => true)
+    refute connection.connected?, "new asynchronous connection must be disconnected"
+    called = false
+    connection.run {}
+    assert connection.connected?, "the connection must be established"
+    connection.run do
+      connection.on_connect do |res|
+        assert res.success?, "on_connect called with error #{res.error.inspect}"
+        called = true
+      end
+    end
+    assert called, "the callback hasn't been called on set"
+    called = false
+    connection.run do
+      connection.on_connect do |res|
+        assert res.success?, "on_connect called with error #{res.error.inspect}"
+        called = true
+      end
+    end
+    refute called, "the callback must not be called on subsequent sets"
+  end
+
+  def test_it_returns_error_if_user_start_work_on_disconnected_instance_outside_on_connect_callback
+    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port, :async => true)
+    refute connection.connected?, "new asynchronous connection must be disconnected"
+    error = nil
+    connection.on_error do |ex|
+      error = ex
+    end
+    connection.run do |c|
+      c.set("foo", "bar")
+    end
+    assert_instance_of(Couchbase::Error::Connect, error)
+  end
 end

data/test/test_eventmachine.rb

@@ -0,0 +1,70 @@
+# Author:: Couchbase <info@couchbase.com>
+# Copyright:: 2011, 2012 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 'eventmachine'
+
+class TestEventmachine < MiniTest::Unit::TestCase
+
+  def setup
+    @mock = start_mock
+  end
+
+  def teardown
+    stop_mock(@mock)
+  end
+
+  if RUBY_VERSION.to_f >= 1.9
+
+    def test_trivial_set
+      EM.run do
+        conn = Couchbase.new(:hostname => @mock.host, :port => @mock.port,
+                             :engine => :eventmachine, :async => true)
+        conn.on_connect do |res|
+          assert res.success?, "connection must be successful"
+          conn.set(uniq_id, "bar") do |res|
+            assert res.success?, "the operation must be successful"
+            assert res.cas > 0, "the CAS value must be non-zero"
+            EM.stop
+          end
+        end
+      end
+    end
+
+    def test_trivial_get
+      EM.run do
+        conn = Couchbase.new(:hostname => @mock.host, :port => @mock.port,
+                             :engine => :eventmachine, :async => true)
+        conn.on_connect do |res|
+          assert res.success?, "connection must be successful"
+          conn.set(uniq_id, "bar") do |res|
+            assert res.success?, "the set operation must be successful"
+            cas = res.cas
+            conn.get(uniq_id) do |res|
+              assert res.success?, "the get operation must be successful"
+              assert_equal "bar", res.value
+              assert_equal cas, res.cas
+              EM.stop
+            end
+          end
+        end
+      end
+    end
+
+  end
+
+end

metadata

@@ -1,195 +1,167 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: couchbase
-version: !ruby/object:Gem::Version 
-  hash: 29
+version: !ruby/object:Gem::Version
+  version: 1.2.2
   prerelease: 
-  segments: 
-  - 1
-  - 2
-  - 1
-  version: 1.2.1
 platform: ruby
-authors: 
+authors:
 - Couchbase
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-12-28 00:00:00 +03:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2013-02-11 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: yaji
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 0
-        - 3
-        - 2
+      - !ruby/object:Gem::Version
         version: 0.3.2
-  name: yaji
-  version_requirements: *id001
-  prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :runtime
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+      - !ruby/object:Gem::Version
+        version: 0.3.2
+- !ruby/object:Gem::Dependency
   name: multi_json
-  version_requirements: *id002
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 49
-        segments: 
-        - 0
-        - 8
-        - 7
-        version: 0.8.7
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
   name: rake
-  version_requirements: *id003
-  prerelease: false
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: minitest
-  version_requirements: *id004
-  prerelease: false
-- !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 0
-        - 7
-        - 5
-        version: 0.7.5
-  name: rake-compiler
-  version_requirements: *id005
-  prerelease: false
-- !ruby/object:Gem::Dependency 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: rdiscount
-  version_requirements: *id006
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: yard
-  version_requirements: *id007
-  prerelease: false
-- !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id008 !ruby/object:Gem::Requirement 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake-compiler
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: yard-xml
-  version_requirements: *id008
-  prerelease: false
-- !ruby/object:Gem::Dependency 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.7.5
   type: :development
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.7.5
+- !ruby/object:Gem::Dependency
   name: mini_portile
-  version_requirements: *id009
-  prerelease: false
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: yajl-ruby
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 1
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.1.0
-  name: yajl-ruby
-  version_requirements: *id010
-  prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+- !ruby/object:Gem::Dependency
   name: active_support
-  version_requirements: *id011
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: eventmachine
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: The official client library for use with Couchbase Server.
 email: support@couchbase.com
 executables: []
-
-extensions: 
+extensions:
 - ext/couchbase_ext/extconf.rb
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .travis.yml
 - .yardopts
@@ -200,19 +172,25 @@ files:
 - RELEASE_NOTES.markdown
 - Rakefile
 - couchbase.gemspec
+- examples/chat-em/Gemfile
+- examples/chat-em/README.markdown
+- examples/chat-em/server.rb
 - ext/couchbase_ext/.gitignore
 - ext/couchbase_ext/arguments.c
 - ext/couchbase_ext/arithmetic.c
 - ext/couchbase_ext/bucket.c
+- ext/couchbase_ext/context.c
 - ext/couchbase_ext/couchbase_ext.c
 - ext/couchbase_ext/couchbase_ext.h
 - ext/couchbase_ext/delete.c
+- ext/couchbase_ext/eventmachine_plugin.c
 - ext/couchbase_ext/extconf.rb
 - ext/couchbase_ext/get.c
 - ext/couchbase_ext/gethrtime.c
 - ext/couchbase_ext/http.c
 - ext/couchbase_ext/multithread_plugin.c
 - ext/couchbase_ext/observe.c
+- ext/couchbase_ext/plugin_common.c
 - ext/couchbase_ext/result.c
 - ext/couchbase_ext/stats.c
 - ext/couchbase_ext/store.c
@@ -226,6 +204,7 @@ files:
 - lib/couchbase.rb
 - lib/couchbase/bucket.rb
 - lib/couchbase/cluster.rb
+- lib/couchbase/constants.rb
 - lib/couchbase/result.rb
 - lib/couchbase/utils.rb
 - lib/couchbase/version.rb
@@ -235,7 +214,6 @@ files:
 - lib/rack/session/couchbase.rb
 - tasks/benchmark.rake
 - tasks/compile.rake
-- tasks/doc.rake
 - tasks/test.rake
 - tasks/util.rake
 - test/profile/.gitignore
@@ -250,6 +228,7 @@ files:
 - 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
@@ -259,39 +238,29 @@ files:
 - test/test_unlock.rb
 - test/test_utils.rb
 - test/test_version.rb
-has_rdoc: true
 homepage: http://couchbase.org
-licenses: 
+licenses:
 - ASL-2
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Couchbase ruby driver
 test_files: []
-