couchbase 1.0.0 → 1.1.0

data/test/test_cas.rb

@@ -28,30 +28,30 @@ class TestCas < MiniTest::Unit::TestCase
   end
 
   def test_compare_and_swap
-    connection = Couchbase.new(:port => @mock.port,
+    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port,
                                :default_format => :document)
-    connection.set(test_id, {"bar" => 1})
-    connection.cas(test_id) do |val|
+    connection.set(uniq_id, {"bar" => 1})
+    connection.cas(uniq_id) do |val|
       val["baz"] = 2
       val
     end
-    val = connection.get(test_id)
+    val = connection.get(uniq_id)
     expected = {"bar" => 1, "baz" => 2}
     assert_equal expected, val
   end
 
   def test_compare_and_swap_async
-    connection = Couchbase.new(:port => @mock.port,
+    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port,
                                :default_format => :document)
-    connection.set(test_id, {"bar" => 1})
+    connection.set(uniq_id, {"bar" => 1})
     connection.run do |conn|
-      conn.cas(test_id) do |ret|
+      conn.cas(uniq_id) do |ret|
         new_val = ret.value
         new_val["baz"] = 2
         new_val
       end
     end
-    val = connection.get(test_id)
+    val = connection.get(uniq_id)
     expected = {"bar" => 1, "baz" => 2}
     assert_equal expected, val
   end

data/test/test_couchbase.rb

@@ -21,7 +21,7 @@ class TestCouchbase < MiniTest::Unit::TestCase
 
   def test_that_it_create_instance_of_bucket
     with_mock do |mock|
-      assert_instance_of Couchbase::Bucket, Couchbase.new("http://localhost:#{mock.port}/pools/default")
+      assert_instance_of Couchbase::Bucket, Couchbase.new("http://#{mock.host}:#{mock.port}/pools/default")
     end
   end
 

data/test/test_delete.rb

@@ -28,36 +28,36 @@ class TestStore < MiniTest::Unit::TestCase
   end
 
   def test_trivial_delete
-    connection = Couchbase.new(:port => @mock.port)
-    connection.set(test_id, "bar")
-    assert connection.delete(test_id)
-    refute connection.delete(test_id)
+    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port)
+    connection.set(uniq_id, "bar")
+    assert connection.delete(uniq_id)
+    refute connection.delete(uniq_id)
   end
 
   def test_delete_missing
-    connection = Couchbase.new(:port => @mock.port)
-    refute connection.delete(test_id(:missing))
+    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port)
+    refute connection.delete(uniq_id(:missing))
     connection.quiet = false
     assert_raises(Couchbase::Error::NotFound) do
-      connection.delete(test_id(:missing))
+      connection.delete(uniq_id(:missing))
     end
-    refute connection.delete(test_id(:missing), :quiet => true)
+    refute connection.delete(uniq_id(:missing), :quiet => true)
   end
 
   def test_delete_with_cas
-    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")
     missing_cas = cas - 1
     assert_raises(Couchbase::Error::KeyExists) do
-      connection.delete(test_id, :cas => missing_cas)
+      connection.delete(uniq_id, :cas => missing_cas)
     end
-    assert connection.delete(test_id, :cas => cas)
+    assert connection.delete(uniq_id, :cas => cas)
   end
 
   def test_allow_fixnum_as_cas_parameter
-    connection = Couchbase.new(:port => @mock.port)
-    cas = connection.set(test_id, "bar")
-    assert connection.delete(test_id, cas)
+    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port)
+    cas = connection.set(uniq_id, "bar")
+    assert connection.delete(uniq_id, cas)
   end
 
 end

data/test/test_errors.rb

@@ -34,11 +34,11 @@ class TestErrors < MiniTest::Unit::TestCase
   end
 
   def test_graceful_add_with_collision
-    connection = Couchbase.new(:port => @mock.port)
+    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port)
     msg1 = {"author" => "foo", "message" => "hi all", "time" => "2012-01-12 11:29:09"}
-    key1 = test_id(genkey(msg1))
+    key1 = uniq_id(genkey(msg1))
     msg2 = {"author" => "foo", "message" => "hi all", "time" => "2012-01-12 11:29:30"}
-    key2 = test_id(genkey(msg2))
+    key2 = uniq_id(genkey(msg2))
 
     connection.add(key1, msg1)
     begin
@@ -58,12 +58,12 @@ class TestErrors < MiniTest::Unit::TestCase
 
     msg3 = {"author" => "foo", "message" => "hi all",
                 "time" => ["2012-01-12 11:29:09", "2012-01-12 11:29:30"]}
-    key3 = test_id(genkey(msg3))
+    key3 = uniq_id(genkey(msg3))
     assert_equal msg3, connection.get(key3)
 
     connection.run do |conn|
       msg4 = {"author" => "foo", "message" => "hi all", "time" => "2012-01-12 11:45:34"}
-      key4 = test_id(genkey(msg4))
+      key4 = uniq_id(genkey(msg4))
 
       connection.add(key4, msg4) do |ret|
         assert_equal :add, ret.operation
@@ -75,7 +75,7 @@ class TestErrors < MiniTest::Unit::TestCase
 
     msg5 = {"author" => "foo", "message" => "hi all",
                 "time" => ["2012-01-12 11:29:09", "2012-01-12 11:29:30", "2012-01-12 11:45:34"]}
-    key5 = test_id(genkey(msg5))
+    key5 = uniq_id(genkey(msg5))
     assert_equal msg5, connection.get(key5)
   end
 

data/test/test_flush.rb

@@ -28,18 +28,18 @@ class TestFlush < MiniTest::Unit::TestCase
   end
 
   def test_trivial_flush
-    connection = Couchbase.new(:port => @mock.port)
+    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port)
     assert connection.flush
   end
 
   def test_flush_with_block
-    connection = Couchbase.new(:port => @mock.port)
+    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port)
     flushed = {}
     on_node_flush = lambda{|res| flushed[res.node] = res.success?}
     connection.run do |conn|
       conn.flush(&on_node_flush)
     end
-    assert_equal 7, flushed.size
+    assert_equal @mock.num_nodes, flushed.size
     flushed.each do |node, res|
       assert node.is_a?(String)
       assert res

data/test/test_format.rb

@@ -35,10 +35,10 @@ class TestFormat < MiniTest::Unit::TestCase
 
   def test_default_document_format
     orig_doc = {'name' => 'Twoflower', 'role' => 'The tourist'}
-    connection = Couchbase.new(:port => @mock.port)
+    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port)
     assert_equal :document, connection.default_format
-    connection.set(test_id, orig_doc)
-    doc, flags, cas = connection.get(test_id, :extended => true)
+    connection.set(uniq_id, orig_doc)
+    doc, flags, cas = connection.get(uniq_id, :extended => true)
     assert_equal 0x00, flags & 0x11
     assert doc.is_a?(Hash)
     assert_equal 'Twoflower', doc['name']
@@ -50,9 +50,9 @@ class TestFormat < MiniTest::Unit::TestCase
     refute orig_doc.respond_to?(:to_s)
     refute orig_doc.respond_to?(:to_json)
 
-    connection = Couchbase.new(:port => @mock.port, :default_format => :document)
+    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port, :default_format => :document)
     assert_raises(Couchbase::Error::ValueFormat) do
-      connection.set(test_id, orig_doc)
+      connection.set(uniq_id, orig_doc)
     end
 
     class << orig_doc
@@ -60,7 +60,7 @@ class TestFormat < MiniTest::Unit::TestCase
         JSON.dump(:name => name, :role => role)
       end
     end
-    connection.set(test_id, orig_doc) # OK
+    connection.set(uniq_id, orig_doc) # OK
 
     class << orig_doc
       undef to_json
@@ -68,14 +68,14 @@ class TestFormat < MiniTest::Unit::TestCase
         JSON.dump(:name => name, :role => role)
       end
     end
-    connection.set(test_id, orig_doc) # OK
+    connection.set(uniq_id, orig_doc) # OK
   end
 
   def test_it_could_dump_arbitrary_class_using_marshal_format
     orig_doc = ArbitraryClass.new("Twoflower", "The tourist")
-    connection = Couchbase.new(:port => @mock.port)
-    connection.set(test_id, orig_doc, :format => :marshal)
-    doc, flags, cas = connection.get(test_id, :extended => true)
+    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 doc.is_a?(ArbitraryClass)
     assert_equal 'Twoflower', doc.name
@@ -83,15 +83,15 @@ class TestFormat < MiniTest::Unit::TestCase
   end
 
   def test_it_accepts_only_string_in_plain_mode
-    connection = Couchbase.new(:port => @mock.port, :default_format => :plain)
-    connection.set(test_id, "1")
+    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port, :default_format => :plain)
+    connection.set(uniq_id, "1")
 
     assert_raises(Couchbase::Error::ValueFormat) do
-      connection.set(test_id, 1)
+      connection.set(uniq_id, 1)
     end
 
     assert_raises(Couchbase::Error::ValueFormat) do
-      connection.set(test_id, {:foo => "bar"})
+      connection.set(uniq_id, {:foo => "bar"})
     end
   end
 

data/test/test_get.rb

@@ -28,112 +28,147 @@ class TestGet < MiniTest::Unit::TestCase
   end
 
   def test_trivial_get
-    connection = Couchbase.new(:port => @mock.port)
-    connection.set(test_id, "bar")
-    val = connection.get(test_id)
+    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port)
+    connection.set(uniq_id, "bar")
+    val = connection.get(uniq_id)
     assert_equal "bar", val
   end
 
   def test_extended_get
-    connection = Couchbase.new(:port => @mock.port)
+    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port)
 
-    orig_cas = connection.set(test_id, "bar")
-    val, flags, cas = connection.get(test_id, :extended => true)
+    orig_cas = connection.set(uniq_id, "bar")
+    val, flags, cas = connection.get(uniq_id, :extended => true)
     assert_equal "bar", val
     assert_equal 0x0, flags
     assert_equal orig_cas, cas
 
-    orig_cas = connection.set(test_id, "bar", :flags => 0x1000)
-    val, flags, cas = connection.get(test_id, :extended => true)
+    orig_cas = connection.set(uniq_id, "bar", :flags => 0x1000)
+    val, flags, cas = connection.get(uniq_id, :extended => true)
     assert_equal "bar", val
     assert_equal 0x1000, flags
     assert_equal orig_cas, cas
   end
 
   def test_multi_get
-    connection = Couchbase.new(:port => @mock.port)
+    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port)
 
-    connection.set(test_id(1), "foo1")
-    connection.set(test_id(2), "foo2")
+    connection.set(uniq_id(1), "foo1")
+    connection.set(uniq_id(2), "foo2")
 
-    val1, val2 = connection.get(test_id(1), test_id(2))
+    val1, val2 = connection.get(uniq_id(1), uniq_id(2))
     assert_equal "foo1", val1
     assert_equal "foo2", val2
   end
 
   def test_multi_get_extended
-    connection = Couchbase.new(:port => @mock.port)
+    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port)
 
-    cas1 = connection.set(test_id(1), "foo1")
-    cas2 = connection.set(test_id(2), "foo2")
+    cas1 = connection.set(uniq_id(1), "foo1")
+    cas2 = connection.set(uniq_id(2), "foo2")
 
-    results = connection.get(test_id(1), test_id(2), :extended => true)
-    assert_equal ["foo1", 0x0, cas1], results[test_id(1)]
-    assert_equal ["foo2", 0x0, cas2], results[test_id(2)]
+    results = connection.get(uniq_id(1), uniq_id(2), :extended => true)
+    assert_equal ["foo1", 0x0, cas1], results[uniq_id(1)]
+    assert_equal ["foo2", 0x0, cas2], results[uniq_id(2)]
+  end
+
+  def test_multi_get_and_touch
+    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port)
+    connection.set(uniq_id(1), "foo1")
+    connection.set(uniq_id(2), "foo2")
+
+    results = connection.get(uniq_id(1) => 1, uniq_id(2) => 1)
+    assert results.is_a?(Hash)
+    assert_equal "foo1", results[uniq_id(1)]
+    assert_equal "foo2", results[uniq_id(2)]
+    sleep(2)
+    assert connection.get(uniq_id(1), uniq_id(2)).compact.empty?
+  end
+
+  def test_multi_get_and_touch_extended
+    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port)
+
+    cas1 = connection.set(uniq_id(1), "foo1")
+    cas2 = connection.set(uniq_id(2), "foo2")
+
+    results = connection.get({uniq_id(1) => 1, uniq_id(2) => 1}, :extended => true)
+    assert_equal ["foo1", 0x0, cas1], results[uniq_id(1)]
+    assert_equal ["foo2", 0x0, cas2], results[uniq_id(2)]
+  end
+
+  def test_multi_get_and_touch_with_single_key
+    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port)
+    connection.set(uniq_id, "foo1")
+
+    results = connection.get(uniq_id => 1)
+    assert results.is_a?(Hash)
+    assert_equal "foo1", results[uniq_id]
+    sleep(2)
+    refute = connection.get(uniq_id)
   end
 
   def test_missing_in_quiet_mode
-    connection = Couchbase.new(:port => @mock.port)
-    cas1 = connection.set(test_id(1), "foo1")
-    cas2 = connection.set(test_id(2), "foo2")
+    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port)
+    cas1 = connection.set(uniq_id(1), "foo1")
+    cas2 = connection.set(uniq_id(2), "foo2")
 
-    val = connection.get(test_id(:missing))
+    val = connection.get(uniq_id(:missing))
     refute(val)
-    val = connection.get(test_id(:missing), :extended => true)
+    val = connection.get(uniq_id(:missing), :extended => true)
     refute(val)
 
-    val1, missing, val2  = connection.get(test_id(1), test_id(:missing), test_id(2))
+    val1, missing, val2  = connection.get(uniq_id(1), uniq_id(:missing), uniq_id(2))
     assert_equal "foo1", val1
     refute missing
     assert_equal "foo2", val2
 
-    results = connection.get(test_id(1), test_id(:missing), test_id(2), :extended => true)
-    assert_equal ["foo1", 0x0, cas1], results[test_id(1)]
-    refute results[test_id(:missing)]
-    assert_equal ["foo2", 0x0, cas2], results[test_id(2)]
+    results = connection.get(uniq_id(1), uniq_id(:missing), uniq_id(2), :extended => true)
+    assert_equal ["foo1", 0x0, cas1], results[uniq_id(1)]
+    refute results[uniq_id(:missing)]
+    assert_equal ["foo2", 0x0, cas2], results[uniq_id(2)]
   end
 
   def test_it_allows_temporary_quiet_flag
-    connection = Couchbase.new(:port => @mock.port, :quiet => false)
+    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port, :quiet => false)
     assert_raises(Couchbase::Error::NotFound) do
-      connection.get(test_id(:missing))
+      connection.get(uniq_id(:missing))
     end
-    refute connection.get(test_id(:missing), :quiet => true)
+    refute connection.get(uniq_id(:missing), :quiet => true)
   end
 
   def test_missing_in_verbose_mode
-    connection = Couchbase.new(:port => @mock.port, :quiet => false)
-    connection.set(test_id(1), "foo1")
-    connection.set(test_id(2), "foo2")
+    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port, :quiet => false)
+    connection.set(uniq_id(1), "foo1")
+    connection.set(uniq_id(2), "foo2")
 
     assert_raises(Couchbase::Error::NotFound) do
-      connection.get(test_id(:missing))
+      connection.get(uniq_id(:missing))
     end
 
     assert_raises(Couchbase::Error::NotFound) do
-      connection.get(test_id(:missing), :extended => true)
+      connection.get(uniq_id(:missing), :extended => true)
     end
 
     assert_raises(Couchbase::Error::NotFound) do
-      connection.get(test_id(1), test_id(:missing), test_id(2))
+      connection.get(uniq_id(1), uniq_id(:missing), uniq_id(2))
     end
 
     assert_raises(Couchbase::Error::NotFound) do
-      connection.get(test_id(1), test_id(:missing), test_id(2), :extended => true)
+      connection.get(uniq_id(1), uniq_id(:missing), uniq_id(2), :extended => true)
     end
   end
 
   def test_asynchronous_get
-    connection = Couchbase.new(:port => @mock.port)
-    cas = connection.set(test_id, "foo", :flags => 0x6660)
+    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port)
+    cas = connection.set(uniq_id, "foo", :flags => 0x6660)
     res = []
 
     suite = lambda do |conn|
       res.clear
-      conn.get(test_id) # ignore result
-      conn.get(test_id) {|ret| res << ret}
+      conn.get(uniq_id) # ignore result
+      conn.get(uniq_id) {|ret| res << ret}
       handler = lambda {|ret| res << ret}
-      conn.get(test_id, &handler)
+      conn.get(uniq_id, &handler)
       assert_equal 3, conn.seqno
     end
 
@@ -141,7 +176,7 @@ class TestGet < MiniTest::Unit::TestCase
       res.each do |r|
         assert r.is_a?(Couchbase::Result)
         assert r.success?
-        assert_equal test_id, r.key
+        assert_equal uniq_id, r.key
         assert_equal "foo", r.value
         assert_equal 0x6660, r.flags
         assert_equal cas, r.cas
@@ -156,25 +191,25 @@ class TestGet < MiniTest::Unit::TestCase
   end
 
   def test_asynchronous_multi_get
-    connection = Couchbase.new(:port => @mock.port)
-    connection.set(test_id(1), "foo")
-    connection.set(test_id(2), "bar")
+    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port)
+    connection.set(uniq_id(1), "foo")
+    connection.set(uniq_id(2), "bar")
 
     res = {}
     connection.run do |conn|
-      conn.get(test_id(1), test_id(2)) {|ret| res[ret.key] = ret.value}
+      conn.get(uniq_id(1), uniq_id(2)) {|ret| res[ret.key] = ret.value}
       assert_equal 2, conn.seqno
     end
 
-    assert res[test_id(1)]
-    assert_equal "foo", res[test_id(1)]
-    assert res[test_id(2)]
-    assert_equal "bar", res[test_id(2)]
+    assert res[uniq_id(1)]
+    assert_equal "foo", res[uniq_id(1)]
+    assert res[uniq_id(2)]
+    assert_equal "bar", res[uniq_id(2)]
   end
 
   def test_asynchronous_get_missing
-    connection = Couchbase.new(:port => @mock.port)
-    connection.set(test_id, "foo")
+    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port)
+    connection.set(uniq_id, "foo")
     res = {}
     missing = []
 
@@ -194,43 +229,83 @@ class TestGet < MiniTest::Unit::TestCase
     suite = lambda do |conn|
       res.clear
       missing.clear
-      conn.get(test_id(:missing1), &get_handler)
-      conn.get(test_id, test_id(:missing2), &get_handler)
+      conn.get(uniq_id(:missing1), &get_handler)
+      conn.get(uniq_id, uniq_id(:missing2), &get_handler)
       assert 3, conn.seqno
     end
 
     connection.run(&suite)
-    assert_equal "foo", res[test_id]
-    assert res.has_key?(test_id(:missing1)) # handler was called with nil
-    refute res[test_id(:missing1)]
-    assert res.has_key?(test_id(:missing2))
-    refute res[test_id(:missing2)]
+    assert_equal "foo", res[uniq_id]
+    assert res.has_key?(uniq_id(:missing1)) # handler was called with nil
+    refute res[uniq_id(:missing1)]
+    assert res.has_key?(uniq_id(:missing2))
+    refute res[uniq_id(:missing2)]
     assert_empty missing
 
     connection.quiet = false
 
     connection.run(&suite)
-    refute res.has_key?(test_id(:missing1))
-    refute res.has_key?(test_id(:missing2))
-    assert_equal [test_id(:missing1), test_id(:missing2)], missing.sort
-    assert_equal "foo", res[test_id]
+    refute res.has_key?(uniq_id(:missing1))
+    refute res.has_key?(uniq_id(:missing2))
+    assert_equal [uniq_id(:missing1), uniq_id(:missing2)], missing.sort
+    assert_equal "foo", res[uniq_id]
   end
 
   def test_get_using_brackets
-    connection = Couchbase.new(:port => @mock.port)
+    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port)
 
-    orig_cas = connection.set(test_id, "foo", :flags => 0x1100)
+    orig_cas = connection.set(uniq_id, "foo", :flags => 0x1100)
 
-    val = connection[test_id]
+    val = connection[uniq_id]
     assert_equal "foo", val
 
     if RUBY_VERSION =~ /^1\.9/
       eval <<-EOC
-      val, flags, cas = connection[test_id, :extended => true]
+      val, flags, cas = connection[uniq_id, :extended => true]
       assert_equal "foo", val
       assert_equal 0x1100, flags
       assert_equal orig_cas, cas
       EOC
     end
   end
+
+  def test_it_allows_to_store_nil
+    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port)
+
+    orig_cas = connection.set(uniq_id, nil)
+    assert orig_cas.is_a?(Numeric)
+
+    refute connection.get(uniq_id)
+    # doesn't raise NotFound exception
+    refute connection.get(uniq_id, :quiet => false)
+    # returns CAS
+    value, flags, cas = connection.get(uniq_id, :extended => true)
+    refute value
+    assert_equal 0x00, flags
+    assert_equal orig_cas, cas
+  end
+
+  def test_zero_length_string_is_not_nil
+    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port)
+
+    connection.set(uniq_id, "", :format => :document)
+    assert_equal "", connection.get(uniq_id)
+
+    connection.set(uniq_id, "", :format => :plain)
+    assert_equal "", connection.get(uniq_id)
+
+    connection.set(uniq_id, "", :format => :marshal)
+    assert_equal "", connection.get(uniq_id)
+
+    connection.set(uniq_id, nil, :format => :document)
+    assert_equal nil, connection.get(uniq_id, :quiet => false)
+
+    assert_raises Couchbase::Error::ValueFormat do
+      connection.set(uniq_id, nil, :format => :plain)
+    end
+
+    connection.set(uniq_id, nil, :format => :marshal)
+    assert_equal nil, connection.get(uniq_id, :quiet => false)
+  end
+
 end