couchbase-jruby-client 0.1.8-java → 0.1.9-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c0ea141997ee6f37bc481a1c7eb4d62448440b5
-  data.tar.gz: 218d1e6e80321f9a7a6efc229fca2d8e0d2e4e76
+  metadata.gz: 1ff8556640816f6cb67c87afb0aaeb5fc7001f2f
+  data.tar.gz: 08314e3ea7bec37d1010bad128a106fb61c73127
 SHA512:
-  metadata.gz: 661cc5eec9882f541ad4441a20e9af2c4d92422a388b9dab2e6d1917d074ab47623a2e84beda34ed5f7bed1f775d0227bbc769d5dc3e910c33f2ecd1882c38e3
-  data.tar.gz: 35dadabf6e5238f9926c7b6ff52357253f3d8ccccc68026c89c6a70fabe0c30d6ec9d2ce5ab88183b344d9238164321b4cb60c6cfc93b4e8ce26d1be6ae9196e
+  metadata.gz: 1c6218643d51c032b95aad0cb00944c617eb79c753fe095a4ae8f909be2ceb83e838aa629f9da3751a97862c9e1b18b645fd017bd88f9297f529aed6e74141ad
+  data.tar.gz: 46970dc0dcf1342ff99982058d5b768c28f3d57b66b4bd93d8f1732b5bf96146b094d13914bd06222b6d6e3507a34d27483c875f9a5b280c1dccac8a17b109d1

data/lib/couchbase/query.rb

@@ -69,22 +69,6 @@ module Couchbase
         end
       end
 
-
-      # @option params [true, false] :quiet (true) Do not raise error if
-      #   associated document not found in the memory. If the parameter +true+
-      #   will use +nil+ value instead.
-      # @option params [String, Symbol] :on_error (:continue) Sets the
-      #   response in the event of an error. Supported values:
-      #   :continue:: Continue to generate view information in the event of an
-      #               error, including the error information in the view
-      #               response stream.
-      #   :stop::     Stop immediately when an error condition occurs. No
-      #               further view information will be returned.
-      # @option params [Fixnum] :connection_timeout (75000) Timeout before the
-      #   view request is dropped (milliseconds)
-
-
-      # @option params [Hash] :body
       query
     end
 

data/lib/couchbase/version.rb

@@ -16,5 +16,5 @@
 #
 
 module Couchbase
-  VERSION = '0.1.8'
+  VERSION = '0.1.9'
 end

data/lib/couchbase/view_row.rb

@@ -27,7 +27,9 @@ module Couchbase
 
     def doc
       {
-        'meta'  => nil,
+        'meta'  => {
+          'id'    => self['id']
+        },
         'value' => document
       }
     end

data/test/setup.rb

@@ -65,7 +65,7 @@ end
 
 $mock = start_mock
 
-Dir.glob('test/test_store.rb').each { |test| require test }
+Dir.glob('test/test_*.rb').each { |test| require test }
 exit_code = Minitest.run(ARGV)
 Couchbase.disconnect
 $mock.stop

data/test/test_arithmetic.rb

@@ -17,7 +17,7 @@
 
 require File.join(File.dirname(__FILE__), 'setup')
 
-class TestArithmetic < MiniTest::Test
+class TestArithmetic < Minitest::Test
 
   def test_trivial_incr_decr
     cb.set(uniq_id, 1)

data/test/test_async.rb

@@ -17,283 +17,8 @@
 
 require File.join(File.dirname(__FILE__), 'setup')
 
-class TestAsync < MiniTest::Test
+class TestAsync < Minitest::Test
 
-  def test_result_object_provides_enough_info
-    obj = Couchbase::Result.new
-    assert obj.respond_to?(:success?)
-    assert obj.respond_to?(:error)
-    assert obj.respond_to?(:key)
-    assert obj.respond_to?(:value)
-    assert obj.respond_to?(:node)
-    assert obj.respond_to?(:cas)
-  end
 
-  def method_name
-    
-  end
 
-  # def test_it_requires_block_for_running_loop
-  #   refute cb.async?
-  #   assert_raises(LocalJumpError) do
-  #     cb.run
-  #   end
-  #   cb.run do |conn|
-  #     assert conn.async?
-  #   end
-  # end
-
-  # def test_it_resets_async_flag_when_raising_exception_from_callback
-  #   assert_raises(RuntimeError) do
-  #     cb.run do |conn|
-  #       conn.set(uniq_id, "foo") { raise }
-  #     end
-  #   end
-  #   refute cb.async?
-  # end
-
-  # def test_nested_async_get_set
-  #   cb.set(uniq_id, {"bar" => 1})
-  #   cb.set(uniq_id(:hit), 0)
-
-  #   cb.run do |conn|
-  #     conn.get(uniq_id) do
-  #       conn.get(uniq_id(:hit)) do |res|
-  #         conn.set(uniq_id(:hit), res.value + 1)
-  #       end
-  #     end
-  #   end
-
-  #   val = cb.get(uniq_id(:hit))
-  #   assert_equal 1, val
-  # end
-
-  # def test_nested_async_set_get
-  #   val = nil
-
-  #   cb.run do |conn|
-  #     conn.set(uniq_id, "foo") do
-  #       conn.get(uniq_id) do |res|
-  #         val = res.value
-  #       end
-  #     end
-  #   end
-
-  #   assert_equal "foo", val
-  # end
-
-  # def test_nested_async_touch_get
-  #   cb.set(uniq_id, "foo")
-  #   success = false
-  #   val = nil
-
-  #   cb.run do |conn|
-  #     conn.touch(uniq_id, :ttl => 1) do |res1|
-  #       success = res1.success?
-  #       conn.get(uniq_id) do |res2|
-  #         val = res2.value
-  #       end
-  #     end
-  #   end
-
-  #   assert success
-  #   assert_equal "foo", val
-  #   sleep(2)
-  #   assert_raises(Couchbase::Error::NotFound) do
-  #     cb.get(uniq_id)
-  #   end
-  # end
-
-  # def test_nested_async_delete_get
-  #   cas = cb.set(uniq_id, "foo")
-  #   success = false
-  #   val = :unknown
-
-  #   cb.run do |conn|
-  #     conn.delete(uniq_id, :cas => cas) do |res1|
-  #       success = res1.success?
-  #       conn.get(uniq_id, :quiet => true) do |res2|
-  #         val = res2.value
-  #       end
-  #     end
-  #   end
-
-  #   assert success
-  #   refute val
-  # end
-
-  # def test_nested_async_stats_set
-  #   skip
-  #   stats = {}
-
-  #   cb.run do |conn|
-  #     conn.stats do |res1|
-  #       id = uniq_id(res1.node, res1.key)
-  #       stats[id] = false
-  #       conn.set(id, res1.value) do |res2|
-  #         stats[id] = res2.cas
-  #       end
-  #     end
-  #   end
-
-  #   stats.keys.each do |key|
-  #     assert stats[key].is_a?(Numeric)
-  #   end
-  # end
-
-  # def test_nested_async_flush_set
-  #   skip
-  #   cas = cb.set(uniq_id, "foo")
-  #   res = {}
-
-  #   cb.run do |conn|
-  #     conn.flush do |res1|
-  #       assert res1.success?, "Expected: successful status code.\nActual: #{res1.error.inspect}"
-  #       id = uniq_id(res1.node)
-  #       res[id] = false
-  #       conn.set(id, true) do |res2|
-  #         res[id] = res2.cas
-  #       end
-  #     end
-  #   end
-
-  #   assert_raises(Couchbase::Error::NotFound) do
-  #     cb.get(uniq_id)
-  #   end
-  #   res.keys.each do |key|
-  #     assert res[key].is_a?(Numeric)
-  #     assert cb.get(key)
-  #   end
-  # end
-
-  # def test_nested_async_incr_get
-  #   skip
-  #   cas = cb.set(uniq_id, 1)
-  #   val = nil
-
-  #   cb.run do |conn|
-  #     conn.incr(uniq_id) do
-  #       conn.get(uniq_id) do |res|
-  #         val = res.value
-  #       end
-  #     end
-  #   end
-
-  #   assert_equal 2, val
-  # end
-
-  # def test_it_doesnt_accept_callbacks_in_synchronous_mode
-  #   refute cb.async?
-
-  #   assert_raises(ArgumentError) { cb.add(uniq_id, "foo") {} }
-  #   assert_raises(ArgumentError) { cb.set(uniq_id, "foo") {} }
-  #   assert_raises(ArgumentError) { cb.replace(uniq_id, "foo") {} }
-  #   assert_raises(ArgumentError) { cb.get(uniq_id) {} }
-  #   assert_raises(ArgumentError) { cb.touch(uniq_id) {} }
-  #   assert_raises(ArgumentError) { cb.incr(uniq_id) {} }
-  #   assert_raises(ArgumentError) { cb.decr(uniq_id) {} }
-  #   assert_raises(ArgumentError) { cb.delete(uniq_id) {} }
-  #   assert_raises(ArgumentError) { cb.append(uniq_id, "bar") {} }
-  #   assert_raises(ArgumentError) { cb.prepend(uniq_id, "bar") {} }
-  #   assert_raises(ArgumentError) { cb.stats {} }
-  # end
-
-  # def test_it_disallow_nested_run
-  #   assert_raises(Couchbase::Error::Invalid) do
-  #     cb.run do
-  #       cb.run do
-  #       end
-  #     end
-  #   end
-  # end
-
-  # def test_it_extends_timeout_in_async_mode_if_needed
-  #   skip
-  #   cb.set(uniq_id, "foo")
-
-  #   cb.timeout = 100_000  # 100_000 us
-  #   cb.run do
-  #     cb.get(uniq_id) do |ret|
-  #       assert ret.success?
-  #       assert_equal "foo", ret.value
-  #     end
-  #     sleep(1.5)  # 1_500_000 us
-  #   end
-  # end
-
-  # def test_send_threshold
-  #   skip
-  #   sent = false
-  #   cb.run(:send_threshold => 100) do # 100 bytes
-  #     cb.set(uniq_id, "foo" * 100) {|r| sent = true}
-  #     assert sent
-  #   end
-  # end
-
-  # def test_asynchronous_connection
-  #   skip
-  #   connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port, :async => true)
-  #   refute cb.connected?, "new asynchronous connection must be disconnected"
-  #   cb.on_connect do |res|
-  #     assert res.success?, "on_connect called with error #{res.error.inspect}"
-  #     assert_same connection, res.bucket
-  #   end
-  #   cb.run {}
-  #   assert cb.connected?, "it should be connected after first run"
-  # end
-
-  # def test_it_calls_callback_immediately_if_connected_sync
-  #   skip
-  #   assert cb.connected?, "connection wasn't established in sync mode"
-  #   called = false
-  #   cb.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
-  #   cb.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
-  #   skip
-  #   connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port, :async => true)
-  #   refute cb.connected?, "new asynchronous connection must be disconnected"
-  #   called = false
-  #   cb.run {}
-  #   assert cb.connected?, "the connection must be established"
-  #   cb.run do
-  #     cb.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
-  #   cb.run do
-  #     cb.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
-  #   skip
-  #   connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port, :async => true)
-  #   refute cb.connected?, "new asynchronous connection must be disconnected"
-  #   error = nil
-  #   cb.on_error do |ex|
-  #     error = ex
-  #   end
-  #   cb.run do |c|
-  #     c.set("foo", "bar")
-  #   end
-  #   assert_instance_of(Couchbase::Error::Connect, error)
-  # end
 end

data/test/test_bucket.rb

@@ -17,7 +17,7 @@
 
 require File.join(File.dirname(__FILE__), 'setup')
 
-class TestBucket < MiniTest::Test
+class TestBucket < Minitest::Test
 
   def test_it_substitute_default_parts_to_url
     with_configs(:host => 'localhost') do |configs| # pick first free port

data/test/test_cas.rb

@@ -17,7 +17,7 @@
 
 require File.join(File.dirname(__FILE__), 'setup')
 
-class TestCas < MiniTest::Test
+class TestCas < Minitest::Test
 
   def test_compare_and_swap
     cb.set(uniq_id, {"bar" => 1})
@@ -29,37 +29,4 @@ class TestCas < MiniTest::Test
     expected = {"bar" => 1, "baz" => 2}
     assert_equal expected, val
   end
-
-  def test_compare_and_swap_async
-    skip
-    cb.set(uniq_id, {"bar" => 1})
-    calls = 0
-    cb.run do |conn|
-      conn.cas(uniq_id) do |ret|
-        calls += 1
-        case ret.operation
-        when :get
-          new_val = ret.value
-          new_val["baz"] = 2
-          new_val
-        when :set
-          assert ret.success?
-        else
-          flunk "Unexpected operation: #{ret.operation.inspect}"
-        end
-      end
-    end
-    assert_equal 2, calls
-    val = cb.get(uniq_id)
-    expected = {"bar" => 1, "baz" => 2}
-    assert_equal expected, val
-  end
-
-  def test_flags_replication
-    skip
-    cb.set(uniq_id, "bar", :flags => 0x100)
-    cb.cas(uniq_id) { "baz" }
-    _, flags, _ = cb.get(uniq_id, :extended => true)
-    assert_equal 0x100, flags
-  end
 end

data/test/test_cluster.rb

@@ -16,7 +16,7 @@
 #
 require File.join(File.dirname(__FILE__), 'setup')
 
-class TestCluster < MiniTest::Test
+class TestCluster < Minitest::Test
 
   def setup
     @cluster = Couchbase::Cluster.new(username: 'admin', password: 'password')

data/test/test_couchbase.rb

@@ -17,7 +17,7 @@
 
 require File.join(File.dirname(__FILE__), 'setup')
 
-class TestCouchbase < MiniTest::Test
+class TestCouchbase < Minitest::Test
 
   def test_that_it_create_instance_of_bucket
     with_configs do |configs|

data/test/test_couchbase_rails_cache_store.rb

@@ -20,7 +20,7 @@
 # require 'active_support/notifications'
 # require 'ostruct'
 
-# class TestCouchbaseRailsCacheStore < MiniTest::Test
+# class TestCouchbaseRailsCacheStore < Minitest::Test
 
 #   def setup
 #     @mock = start_mock

data/test/test_delete.rb

@@ -17,7 +17,7 @@
 
 require File.join(File.dirname(__FILE__), 'setup')
 
-class TestDelete < MiniTest::Test
+class TestDelete < Minitest::Test
 
   def test_trivial_delete
     cb.set(uniq_id, "bar")

data/test/test_design_docs.rb

@@ -17,7 +17,7 @@
 
 require File.join(File.dirname(__FILE__), 'setup')
 
-class TestDesignDocs < MiniTest::Test
+class TestDesignDocs < Minitest::Test
 
   def test_save_design_doc
     skip unless $mock.real?

data/test/test_errors.rb

@@ -18,7 +18,7 @@
 require File.join(File.dirname(__FILE__), 'setup')
 require 'digest/md5'
 
-class TestErrors < MiniTest::Test
+class TestErrors < Minitest::Test
 
   def genkey(item)
     tuple = [item["author"], item["message"]]

data/test/test_fetch.rb

@@ -17,7 +17,7 @@
 
 require File.join(File.dirname(__FILE__), 'setup')
 
-class TestFetch < MiniTest::Test
+class TestFetch < Minitest::Test
 
   def test_trivial_fetch
     cb.fetch(uniq_id) do

data/test/test_format.rb

@@ -17,7 +17,7 @@
 
 require File.join(File.dirname(__FILE__), 'setup')
 
-class TestFormat < MiniTest::Test
+class TestFormat < Minitest::Test
 
   ArbitraryClass = Struct.new(:name, :role)
   class SkinyClass < Struct.new(:name, :role)

data/test/test_get.rb

@@ -17,7 +17,7 @@
 
 require File.join(File.dirname(__FILE__), 'setup')
 
-class TestGet < MiniTest::Test
+class TestGet < Minitest::Test
 
   def test_trivial_get
     cb.set(uniq_id, "bar")

data/test/test_query.rb

@@ -17,7 +17,7 @@
 
 require File.join(File.dirname(__FILE__), 'setup')
 
-class TestQuery < MiniTest::Test
+class TestQuery < Minitest::Test
 
-  
-end
+
+end

data/test/test_result.rb

@@ -0,0 +1,15 @@
+require File.join(File.dirname(__FILE__), 'setup')
+
+class TestResult < Minitest::Test
+
+  def test_result_object_provides_enough_info
+    obj = Couchbase::Result.new
+    assert obj.respond_to?(:success?)
+    assert obj.respond_to?(:error)
+    assert obj.respond_to?(:key)
+    assert obj.respond_to?(:value)
+    assert obj.respond_to?(:node)
+    assert obj.respond_to?(:cas)
+  end
+
+end

data/test/test_stats.rb

@@ -17,7 +17,7 @@
 
 require File.join(File.dirname(__FILE__), 'setup')
 
-class TestStats < MiniTest::Test
+class TestStats < Minitest::Test
 
   def test_trivial_stats_without_argument
     stats = cb.stats

data/test/test_store.rb

@@ -17,7 +17,7 @@
 
 require File.join(File.dirname(__FILE__), 'setup')
 
-class TestStore < MiniTest::Test
+class TestStore < Minitest::Test
 
   def test_trivial_set
     cas = cb.set(uniq_id, "bar")

data/test/test_touch.rb

@@ -17,7 +17,7 @@
 
 require File.join(File.dirname(__FILE__), 'setup')
 
-class TestTouch < MiniTest::Test
+class TestTouch < Minitest::Test
 
   def test_trivial_touch
     cb.set(uniq_id, "bar", :ttl => 1)

data/test/test_unlock.rb

@@ -17,7 +17,7 @@
 
 require File.join(File.dirname(__FILE__), 'setup')
 
-class TestUnlock < MiniTest::Test
+class TestUnlock < Minitest::Test
 
   def test_trivial_unlock
     cb.set(uniq_id, "foo")

data/test/test_utils.rb

@@ -17,7 +17,7 @@
 
 require File.join(File.dirname(__FILE__), 'setup')
 
-class TestUtils < MiniTest::Test
+class TestUtils < Minitest::Test
 
   def test_complex_startkey
     assert_equal "all_docs?startkey=%5B%22Deadmau5%22%2C%22%22%5D", Couchbase::Utils.build_query("all_docs", :startkey =>  ["Deadmau5", ""])

data/test/test_version.rb

@@ -17,27 +17,12 @@
 
 require File.join(File.dirname(__FILE__), 'setup')
 
-class TestVersion < MiniTest::Test
+class TestVersion < Minitest::Test
 
-  def test_sync_version
+  def test_version
     ver = cb.version
     assert ver.is_a?(Hash)
     assert_equal 1, ver.size
   end
 
-  def test_async_version
-    skip
-    ver = {}
-    cb.run do |conn|
-      conn.version do |ret|
-        assert ret.success?
-        ver[ret.node] = ret.value
-      end
-    end
-    assert_equal 1, ver.size
-    ver.each do |node, v|
-      assert v.is_a?(String)
-    end
-  end
-
 end

data/test/test_view.rb

@@ -17,7 +17,7 @@
 
 require File.join(File.dirname(__FILE__), 'setup')
 
-class TestView < MiniTest::Test
+class TestView < Minitest::Test
 
   def setup
     return unless $mock.real?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: couchbase-jruby-client
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: java
 authors:
 - Mike Evans
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-12-23 00:00:00.000000000 Z
+date: 2014-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -186,9 +186,9 @@ files:
 - test/test_format.rb
 - test/test_get.rb
 - test/test_query.rb
+- test/test_result.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
@@ -240,9 +240,9 @@ test_files:
 - test/test_format.rb
 - test/test_get.rb
 - test/test_query.rb
+- test/test_result.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

data/test/test_timer.rb

@@ -1,34 +0,0 @@
-# Author:: Couchbase <info@couchbase.com>
-# Copyright:: 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')
-
-class TestTimer < MiniTest::Test
-
-  def test_initialization
-    skip
-    num = 0
-    cb.run do
-      assert Couchbase::Timer.new(connection, 100)  { num += 1}
-      assert cb.create_timer(100)           { num += 1}
-
-      assert Couchbase::Timer.new(connection, 100, :periodic => true)  {|t| num += 1; t.cancel}
-      assert cb.create_periodic_timer(100)                     {|t| num += 1; t.cancel}
-    end
-    assert_equal 4, num
-  end
-end