libcouchbase 0.3.1 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5997fa863626ca0ef4723becd7d60ddbbcb3425f
-  data.tar.gz: 43edae591acdd1a6146db06da0c97c4267e6c1ef
+  metadata.gz: 5e109b474ba52c5f517c1d56bb11decfcce96079
+  data.tar.gz: 0bf3dcda70e298bdd5121199875a0a05552b304d
 SHA512:
-  metadata.gz: 5357cad71cf73c2e3c649a74692c613cd386cd07bb3d0c2f97117f3ca75f3d912230bf6d122e5fb59d0634acaec279caddbab2fe1b26f5bd64e13c3a5afe40a2
-  data.tar.gz: be6d945d52b776287dd469a61781a2c5099f7eabf905be786fd946bfcb21c16ae387a97478f59fe5e0e58db006588d45f63bea79ef1270392880d1baa540cffa
+  metadata.gz: 5e46bd8fe2c97bc6ed242cbe49b16d670407839a5a39bea4ba872b68a2065d2bf0e41e52bb4116f919d1cd95b3c46a6e7937d70ab3550e2c877dae04b0410700
+  data.tar.gz: 641f6bb07307a0e4c95937c11c9278100dc486d165de84e4ecc677d20534555b0157e52aa8913278f11cb719cb1b19d1af443012182bde6f53e1bdc2ab0163d4

data/.travis.yml

@@ -1,12 +1,12 @@
 language: ruby
 rvm:
-  - ruby-2.3.1
-  - ruby-2.2.5
+  - ruby-2.4.1
+  - ruby-2.3.4
   - ruby-head
-  - jruby-9.1.5.0
+  - jruby-9.1.10.0
   - jruby-head
   - rubinius
-  - rubinius-3.76
+  - rubinius-3.78
 branches:
   only:
     - master
@@ -14,8 +14,8 @@ before_install:
   - git submodule update --init --recursive
   - gem install ffi
   - sudo apt-get install libev-dev
-  - sudo wget https://packages.couchbase.com/releases/4.6.1/couchbase-server-enterprise_4.6.1-ubuntu14.04_amd64.deb
-  - sudo dpkg -i couchbase-server-enterprise_4.6.1-ubuntu14.04_amd64.deb
+  - sudo wget https://packages.couchbase.com/releases/4.6.2/couchbase-server-enterprise_4.6.2-ubuntu14.04_amd64.deb
+  - sudo dpkg -i couchbase-server-enterprise_4.6.2-ubuntu14.04_amd64.deb
   - sleep 4
   - sudo service couchbase-server status
   - /opt/couchbase/bin/couchbase-cli cluster-init -c 127.0.0.1:8091 --cluster-username=admin --cluster-password=password --cluster-ramsize=320 --cluster-index-ramsize=256 --cluster-fts-ramsize=256 --services=data,index,query,fts

data/Rakefile

@@ -11,7 +11,7 @@ require File.expand_path('../lib/libcouchbase/ext/tasks', __FILE__)    # platfor
 task :default => :limited_spec
 RSpec::Core::RakeTask.new(:limited_spec) do |t|
     # Exclude full text search tests until we can automate index creation
-    t.rspec_opts = "--tag ~full_text_search --tag ~n1ql_query"
+    t.rspec_opts = "--tag ~full_text_search --tag ~n1ql_query --fail-fast"
 end
 RSpec::Core::RakeTask.new(:spec)
 

data/lib/libcouchbase/connection.rb

@@ -3,11 +3,21 @@
 require 'json'
 
 
-at_exit do
-    ObjectSpace.each_object(::Libcouchbase::Connection).each do |connection|
-        connection.destroy.finally do
-            connection.reactor.stop
+# Not required on jruby - buckets are cleaned up by GC
+unless defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
+    at_exit do
+        GC.start
+        connections = []
+        ObjectSpace.each_object(::Libcouchbase::Connection).each do |connection|
+            next unless connection.reactor.running?
+            connections << connection
+            begin
+                connection.destroy
+            rescue => e
+            end
         end
+        sleep 2 if connections.length > 0
+        connections.each { |c| c.reactor.stop }
     end
 end
 
@@ -136,7 +146,8 @@ module Libcouchbase
                     err = Ext.connect(@handle)
                     if err != :success
                         @bootstrap_defer.reject(Error.lookup(err).new('failed to schedule connect'))
-                        destroy
+                        Ext.destroy(@handle)
+                        handle_destroyed
                     end
                 end
             }
@@ -165,17 +176,21 @@ module Libcouchbase
         end
 
         def destroy
-            defer = @reactor.defer
+            raise 'not connected' unless @handle
+            return @destroy_defer.promise if @destroy_defer
 
             # Ensure it is thread safe
+            defer = @reactor.defer
             @reactor.schedule {
-                if @handle
+                if @destroy_defer.nil?
+                    @destroy_defer = defer
                     Ext.destroy(@handle)
                     handle_destroyed
+                    defer.resolve(nil)
+                else
+                    defer.resolve(@destroy_defer.promise)
                 end
-                defer.resolve(self)
             }
-
             defer.promise
         end
 

data/lib/libcouchbase/ext/libcouchbase/enums.rb

@@ -830,6 +830,11 @@ module Libcouchbase::Ext
     :unknown_sdcmd, 77,
     :eno_commands, 78,
     :query_error, 79,
+    :generic_tmperr, 80,
+    :generic_subdocerr, 81,
+    :generic_constraint_err, 82,
+    :nameserver_error, 83,
+    :not_authorized, 84,
     :max_error, 4096
   ]
 

data/lib/libcouchbase/results_fiber.rb

@@ -37,14 +37,17 @@ module Libcouchbase
                 @fiber = Fiber.current
 
                 begin
-                    while !@query_completed || (cont = @results.length > 0) do
-                        if cont
+                    remaining = @results.length > 0
+                    while !@query_completed || remaining do
+                        if remaining
                             @resume_results = false
                             yield @results.shift
                         else
                             @resume_results = true
                             resume
                         end
+
+                        remaining = @results.length > 0
                     end
                 ensure
                     # cancel is executed on break or error
@@ -71,13 +74,13 @@ module Libcouchbase
                 @results.each &blk
             else
                 perform
-
-                index = 0
                 @fiber = Fiber.current
 
                 begin
-                    while !@query_completed || (cont = index < @results.length) do
-                        if cont
+                    index = 0
+                    remaining = index < @results.length
+                    while !@query_completed || remaining do
+                        if remaining
                             @resume_results = false
                             yield @results[index]
                             index += 1
@@ -85,6 +88,8 @@ module Libcouchbase
                             @resume_results = true
                             resume
                         end
+
+                        remaining = index < @results.length
                     end
                 ensure
                     # cancel is executed on break or error
@@ -126,19 +131,21 @@ module Libcouchbase
                 @results[0...num]
             else
                 perform is_complete: false, limit: num
-
-                index = 0
                 @fiber = Fiber.current
-
                 result = []
+
                 begin
-                    while !@query_completed  || (cont = index < @results.length && index < num) do
-                        if cont
+                    index = 0
+                    remaining = index < @results.length && index < num
+                    while !@query_completed || remaining do
+                        if remaining
                             result << @results[index]
                             index += 1
                         else
                             resume
                         end
+
+                        remaining = index < @results.length && index < num
                     end
                 ensure
                     @fiber = nil

data/lib/libcouchbase/results_native.rb

@@ -27,12 +27,15 @@ module Libcouchbase
             else
                 perform is_complete: false
                 begin
-                    while !@query_completed || (cont = @results.length > 0) do
-                        if cont
+                    remaining = @results.length > 0
+                    while !@query_completed || remaining do
+                        if remaining
                             yield @results.shift
                         else
                             process_next_item
                         end
+
+                        remaining = @results.length > 0
                     end
                 ensure
                     # cancel is executed on break or error
@@ -62,13 +65,16 @@ module Libcouchbase
 
                 begin
                     index = 0
-                    while !@query_completed || (cont = index < @results.length) do
-                        if cont
+                    remaining = index < @results.length
+                    while !@query_completed || remaining do
+                        if remaining
                             yield @results[index]
                             index += 1
                         else
                             process_next_item
                         end
+
+                        remaining = index < @results.length
                     end
                 ensure
                     # cancel is executed on break or error
@@ -109,13 +115,16 @@ module Libcouchbase
 
                 index = 0
                 result = []
-                while !@query_completed || (cont = index < @results.length && index < num) do
-                    if cont
+                remaining = index < @results.length && index < num
+                while !@query_completed || remaining do
+                    if remaining
                         result << @results[index]
                         index += 1
                     else
                         process_next_item
                     end
+
+                    remaining = index < @results.length && index < num
                 end
 
                 raise @error if @error

data/lib/libcouchbase/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true, encoding: ASCII-8BIT
 
 module Libcouchbase
-    VERSION = '0.3.1'
+    VERSION = '0.3.3'
 end

data/spec/connection_spec.rb

@@ -221,7 +221,7 @@ describe Libcouchbase::Connection do
         expect(@log).to eq([:success])
     end
 
-    it "should flush when enabled explicitly" do
+    it "should flush when enabled explicitly", flush: true do
         @reactor.run { |reactor|
             connection = Libcouchbase::Connection.new(bucket: :test, password: 'password123')
             connection.connect(flush_enabled: true).then do

data/spec/design_docs_spec.rb

@@ -3,7 +3,7 @@
 require 'libcouchbase'
 
 
-describe Libcouchbase::DesignDocs do
+describe Libcouchbase::DesignDocs, design_docs: true do
     before :each do
         @ddoc = Libcouchbase::Bucket.new.design_docs
     end

data/spec/results_libuv_spec.rb

@@ -64,20 +64,35 @@ describe Libcouchbase::ResultsLibuv do
     before :each do
         @log = []
         @reactor = ::Libuv::Reactor.default
+        @reactor.notifier do |err|
+            @reactor.stop
+            @log << err
+        end
+        @timeout = @reactor.timer do
+            @timeout.close
+            @reactor.stop
+            @log << "test timed out"
+        end
+        @timeout.start(5000)
+        @timeout.unref
         @query = MockQuery.new(@log)
         @view = Libcouchbase::ResultsLibuv.new(@query)
         expect(@log).to eq([])
     end
 
+    after :each do
+        @timeout.close
+    end
+
     it "should stream the response" do
         @reactor.run { |reactor|
             @view.each {|i| @log << i }
         }
 
+        expect(@log).to eq([:new_row, 0, :new_row, 1, :new_row, 2, :new_row, 3])
         expect(@view.complete_result_set).to be(true)
         expect(@view.query_in_progress).to be(false)
         expect(@view.query_completed).to be(true)
-        expect(@log).to eq([:new_row, 0, :new_row, 1, :new_row, 2, :new_row, 3])
     end
 
     it "should continue to stream the response even if some has already been loaded" do

data/spec/results_native_spec.rb

@@ -173,7 +173,7 @@ describe Libcouchbase::ResultsNative do
 
         @query.wait_join
 
-        expect(@qlog).to eq([:new_row, :new_row, :new_row, :new_row])
+        expect(@qlog).to eq([:new_row])
         expect(@log).to eq([0, 'what what'])
     end
 
@@ -241,7 +241,7 @@ describe Libcouchbase::ResultsNative do
 
         @query.wait_join
 
-        expect(@qlog).to eq([:new_row, :new_row])
+        expect(@qlog).to eq([:new_row])
         expect(@log).to eq([0, 'first'])
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libcouchbase
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.3
 platform: ruby
 authors:
 - Stephen von Takach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-17 00:00:00.000000000 Z
+date: 2017-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -751,7 +751,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: libcouchbase bindings for Ruby