couchbase 1.0.0 → 1.1.0

data/test/test_stats.rb

@@ -28,26 +28,30 @@ class TestStats < MiniTest::Unit::TestCase
   end
 
   def test_trivial_stats_without_argument
-    connection = Couchbase.new(:port => @mock.port)
+    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port)
     stats = connection.stats
     assert stats.is_a?(Hash)
-    assert_equal 4, stats.size
-    node, info = stats.first
-    assert node.is_a?(String)
+    assert stats.has_key?("pid")
+    key, info = stats.first
+    assert key.is_a?(String)
     assert info.is_a?(Hash)
-    assert info["pid"]
+    assert_equal @mock.num_nodes, info.size
   end
 
   def test_stats_with_argument
-    connection = Couchbase.new(:port => @mock.port)
-    stats = connection.stats("pid")
-    assert stats.is_a?(Hash)
-    assert_equal 4, stats.size
-    node, info = stats.first
-    assert node.is_a?(String)
-    assert info.is_a?(Hash)
-    assert_equal 1, info.size
-    assert info["pid"]
+    if @mock.real?
+      connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port)
+      stats = connection.stats("memory")
+      assert stats.is_a?(Hash)
+      assert stats.has_key?("mem_used")
+      key, info = stats.first
+      assert key.is_a?(String)
+      assert info.is_a?(Hash)
+      assert_equal @mock.num_nodes, info.size
+    else
+      # FIXME
+      skip("make CouchbaseMock.jar STATS more real-life")
+    end
   end
 
 end

data/test/test_store.rb

@@ -28,66 +28,66 @@ class TestStore < MiniTest::Unit::TestCase
   end
 
   def test_trivial_set
-    connection = Couchbase.new(:port => @mock.port)
-    cas = connection.set(test_id, "bar")
+    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port)
+    cas = connection.set(uniq_id, "bar")
     assert(cas > 0)
   end
 
   def test_set_with_cas
-    connection = Couchbase.new(:port => @mock.port)
+    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port)
 
-    cas1 = connection.set(test_id, "bar1")
+    cas1 = connection.set(uniq_id, "bar1")
     assert cas1 > 0
 
     assert_raises(Couchbase::Error::KeyExists) do
-      connection.set(test_id, "bar2", :cas => cas1+1)
+      connection.set(uniq_id, "bar2", :cas => cas1+1)
     end
 
-    cas2 = connection.set(test_id, "bar2", :cas => cas1)
+    cas2 = connection.set(uniq_id, "bar2", :cas => cas1)
     assert cas2 > 0
     refute_equal cas2, cas1
 
-    cas3 = connection.set(test_id, "bar3")
+    cas3 = connection.set(uniq_id, "bar3")
     assert cas3 > 0
     refute_equal cas3, cas2
     refute_equal cas3, cas1
   end
 
   def test_add
-    connection = Couchbase.new(:port => @mock.port)
+    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port)
 
-    cas1 = connection.add(test_id, "bar")
+    cas1 = connection.add(uniq_id, "bar")
     assert cas1 > 0
 
     assert_raises(Couchbase::Error::KeyExists) do
-      connection.add(test_id, "bar")
+      connection.add(uniq_id, "bar")
     end
 
     assert_raises(Couchbase::Error::KeyExists) do
-      connection.add(test_id, "bar", :cas => cas1)
+      connection.add(uniq_id, "bar", :cas => cas1)
     end
   end
 
   def test_replace
-    connection = Couchbase.new(:port => @mock.port)
+    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port)
 
     assert_raises(Couchbase::Error::NotFound) do
-      connection.replace(test_id, "bar")
+      connection.replace(uniq_id, "bar")
     end
 
-    cas1 = connection.set(test_id, "bar")
+    cas1 = connection.set(uniq_id, "bar")
     assert cas1 > 0
 
-    connection.replace(test_id, "bar")
+    connection.replace(uniq_id, "bar")
   end
 
   def test_acceptable_keys
-    connection = Couchbase.new(:port => @mock.port)
+    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port)
 
-    cas = connection.set(test_id.to_sym, "bar")
+    cas = connection.set(uniq_id.to_sym, "bar")
     assert cas > 0
 
-    cas = connection.set(test_id.to_s, "bar")
+    cas = connection.set(uniq_id.to_s, "bar")
     assert cas > 0
 
     assert_raises(TypeError) do
@@ -108,76 +108,76 @@ class TestStore < MiniTest::Unit::TestCase
   end
 
   def test_asynchronous_set
-    connection = Couchbase.new(:port => @mock.port)
+    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port)
     ret = nil
     connection.run do |conn|
-      conn.set(test_id("1"), "foo1") {|res| ret = res}
-      conn.set(test_id("2"), "foo2") # ignore result
+      conn.set(uniq_id("1"), "foo1") {|res| ret = res}
+      conn.set(uniq_id("2"), "foo2") # ignore result
       assert_equal 2, conn.seqno
     end
     assert ret.is_a?(Couchbase::Result)
     assert ret.success?
-    assert_equal test_id("1"), ret.key
+    assert_equal uniq_id("1"), ret.key
     assert_equal :set, ret.operation
     assert ret.cas.is_a?(Numeric)
   end
 
   def test_it_raises_error_when_appending_or_prepending_to_missing_key
-    connection = Couchbase.new(:port => @mock.port)
+    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port)
 
     assert_raises(Couchbase::Error::NotStored) do
-      connection.append(test_id(:missing), "foo")
+      connection.append(uniq_id(:missing), "foo")
     end
 
     assert_raises(Couchbase::Error::NotStored) do
-      connection.prepend(test_id(:missing), "foo")
+      connection.prepend(uniq_id(:missing), "foo")
     end
   end
 
   def test_append
-    connection = Couchbase.new(:port => @mock.port, :default_format => :plain)
+    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port, :default_format => :plain)
 
-    cas1 = connection.set(test_id, "foo")
+    cas1 = connection.set(uniq_id, "foo")
     assert cas1 > 0
-    cas2 = connection.append(test_id, "bar")
+    cas2 = connection.append(uniq_id, "bar")
     assert cas2 > 0
     refute_equal cas2, cas1
 
-    val = connection.get(test_id)
+    val = connection.get(uniq_id)
     assert_equal "foobar", val
   end
 
   def test_prepend
-    connection = Couchbase.new(:port => @mock.port, :default_format => :plain)
+    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port, :default_format => :plain)
 
-    cas1 = connection.set(test_id, "foo")
+    cas1 = connection.set(uniq_id, "foo")
     assert cas1 > 0
-    cas2 = connection.prepend(test_id, "bar")
+    cas2 = connection.prepend(uniq_id, "bar")
     assert cas2 > 0
     refute_equal cas2, cas1
 
-    val = connection.get(test_id)
+    val = connection.get(uniq_id)
     assert_equal "barfoo", val
   end
 
   ArbitraryData = Struct.new(:baz)
 
   def test_set_using_brackets
-    connection = Couchbase.new(:port => @mock.port)
+    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port)
 
-    connection[test_id(1)] = "foo"
-    val = connection.get(test_id(1))
+    connection[uniq_id(1)] = "foo"
+    val = connection.get(uniq_id(1))
     assert_equal "foo", val
 
     if RUBY_VERSION =~ /^1\.9/
       eval <<-EOC
-      connection[test_id(2), :flags => 0x1100] = "bar"
-      val, flags = connection.get(test_id(2), :extended => true)
+      connection[uniq_id(2), :flags => 0x1100] = "bar"
+      val, flags = connection.get(uniq_id(2), :extended => true)
       assert_equal "bar", val
       assert_equal 0x1100, flags
 
-      connection[test_id(3), :format => :marshal] = ArbitraryData.new("thing")
-      val = connection.get(test_id(3))
+      connection[uniq_id(3), :format => :marshal] = ArbitraryData.new("thing")
+      val = connection.get(uniq_id(3))
       assert val.is_a?(ArbitraryData)
       assert_equal "thing", val.baz
       EOC

data/test/test_touch.rb

@@ -28,30 +28,42 @@ class TestTouch < MiniTest::Unit::TestCase
   end
 
   def test_trivial_touch
-    connection = Couchbase.new(:port => @mock.port)
-    connection.set(test_id, "bar", :ttl => 1)
-    connection.touch(test_id, :ttl => 2)
-    sleep(1)
-    assert connection.get(test_id)
+    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port)
+    connection.set(uniq_id, "bar", :ttl => 1)
+    connection.touch(uniq_id, :ttl => 2)
     sleep(1)
-    refute connection.get(test_id)
+    assert connection.get(uniq_id)
+    sleep(2)
+    refute connection.get(uniq_id)
+  end
+
+  def test_multi_touch
+    connection = Couchbase.new(:port => @mock.port)
+    connection.set(uniq_id(1), "bar")
+    connection.set(uniq_id(2), "baz")
+    ret = connection.touch(uniq_id(1) => 1, uniq_id(2) => 1)
+    assert ret[uniq_id(1)]
+    assert ret[uniq_id(2)]
+    sleep(2)
+    refute connection.get(uniq_id(1))
+    refute connection.get(uniq_id(2))
   end
 
   def test_it_uses_default_ttl_for_touch
-    connection = Couchbase.new(:port => @mock.port, :default_ttl => 1)
-    connection.set(test_id, "bar", :ttl => 10)
-    connection.touch(test_id, :ttl => 1)
+    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port, :default_ttl => 1)
+    connection.set(uniq_id, "bar", :ttl => 10)
+    connection.touch(uniq_id)
     sleep(2)
-    refute connection.get(test_id)
+    refute connection.get(uniq_id)
   end
 
   def test_it_accepts_ttl_for_get_command
-    connection = Couchbase.new(:port => @mock.port)
-    connection.set(test_id, "bar", :ttl => 10)
-    val = connection.get(test_id, :ttl => 1)
+    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port)
+    connection.set(uniq_id, "bar", :ttl => 10)
+    val = connection.get(uniq_id, :ttl => 1)
     assert_equal "bar", val
     sleep(2)
-    refute connection.get(test_id)
+    refute connection.get(uniq_id)
   end
 
 end

data/test/test_version.rb

@@ -18,7 +18,35 @@
 require File.join(File.dirname(__FILE__), 'setup')
 
 class TestVersion < MiniTest::Unit::TestCase
-  def test_that_it_defines_version
-    assert_match /\d+\.\d+(\.\d*)/, Couchbase::VERSION
+
+  def setup
+    @mock = start_mock
+  end
+
+  def teardown
+    stop_mock(@mock)
+  end
+
+  def test_sync_version
+    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port)
+    ver = connection.version
+    assert ver.is_a?(Hash)
+    assert_equal @mock.num_nodes, ver.size
+  end
+
+  def test_async_version
+    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port)
+    ver = {}
+    connection.run do |conn|
+      conn.version do |ret|
+        assert ret.success?
+        ver[ret.node] = ret.value
+      end
+    end
+    assert_equal @mock.num_nodes, ver.size
+    ver.each do |node, v|
+      assert v.is_a?(String)
+    end
   end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: couchbase
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-23 00:00:00.000000000Z
+date: 2012-03-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &19677780 !ruby/object:Gem::Requirement
+  requirement: &12069760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *19677780
+  version_requirements: *12069760
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &19677000 !ruby/object:Gem::Requirement
+  requirement: &12068240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *19677000
+  version_requirements: *12068240
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &19676300 !ruby/object:Gem::Requirement
+  requirement: &12067280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19676300
+  version_requirements: *12067280
 - !ruby/object:Gem::Dependency
   name: rake-compiler
-  requirement: &19672900 !ruby/object:Gem::Requirement
+  requirement: &12056580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.7.5
   type: :development
   prerelease: false
-  version_requirements: *19672900
+  version_requirements: *12056580
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &19672400 !ruby/object:Gem::Requirement
+  requirement: &12055480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19672400
+  version_requirements: *12055480
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &19671780 !ruby/object:Gem::Requirement
+  requirement: &12054260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19671780
+  version_requirements: *12054260
+- !ruby/object:Gem::Dependency
+  name: mini_portile
+  requirement: &12053280 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *12053280
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &19671120 !ruby/object:Gem::Requirement
+  requirement: &12052340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19671120
+  version_requirements: *12052340
 description: The official client library for use with Couchbase Server.
 email: support@couchbase.com
 executables: []
@@ -96,6 +107,7 @@ extensions:
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - .yardopts
 - Gemfile
 - HISTORY.markdown
@@ -144,12 +156,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2404392778258139925
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2404392778258139925
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10
@@ -175,4 +193,3 @@ test_files:
 - test/test_store.rb
 - test/test_touch.rb
 - test/test_version.rb
-has_rdoc: