neo4j-ruby-driver 6.0.0.alpha.1 → 6.0.0.alpha.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48de51feb90d8acae84ead4a6c05d4202de49efafbca7e6af26d949825725628
-  data.tar.gz: 2b3e83315ad909e6b2e5bf1fa2d464eba2a823090470b85f9be1beb1b775bb33
+  metadata.gz: f3311d80f0443eeacf83a9d05717d4a4e1cea4e08ba835d9392d17ee5bfac612
+  data.tar.gz: 200b05e82cd52f7483265a9eeac22ba70a857db9ab5803fc05829a3732837579
 SHA512:
-  metadata.gz: bc1a7175c1443b37b9690855577a50e4421b8b2c375810737838dfe2cc1c7d7b82bff759dfb5f3d9392539af317ec8f88141f7d9d1c96fd57dad2750376de891
-  data.tar.gz: b26f08b231275855625d214481ee3a43eb3e3d90e6c270eca8f835f4244c309d748e7bff1e94f3119db702dcadc843c3fd68318b29c0f0ab466ba0ef6b1c9b59
+  metadata.gz: 00d3a5c75bd7a87226553ee7f0f88fd9e5ac0d06b9ebe768dddcd13aead8eec3c9d4e3d966b6fa0f670c28d84b1301cb2f2ee5e11aa1196448e00ccece428a1f
+  data.tar.gz: f028bdd152fe36030a18a261e7d0614d8f6ed97a10b798e5cf7a1ae426c73aca0750e6da4cb5deb2c7f8b0cc9f07b3c336ed70cc47941b659e73f83a753011a5

data/lib/neo4j/driver/exceptions/neo4j_exception.rb

@@ -7,14 +7,14 @@ module Neo4j
         attr_reader :code, :suppressed
 
         def initialize(*args)
-          @code = args.shift if args.count > 1
-          message = args.shift
-          @suppressed = args.shift
-          super(message)
+          args, exceptions = args.partition { |arg| arg.is_a?(String) }
+          super(args.pop)
+          @code = args.pop
+          add_suppressed(*exceptions)
         end
 
-        def add_suppressed(exception)
-          (@suppressed ||= []) << exception
+        def add_suppressed(*exceptions)
+          (@suppressed ||= []).concat(exceptions) if exceptions.any?
         end
       end
     end

data/ruby/neo4j/driver/internal/async/internal_async_session.rb

@@ -32,10 +32,8 @@ module Neo4j::Driver
             tx_future = @session.begin_transaction_async(mode, ** config)
 
             tx_future.when_complete do |tx, completion_error|
-              error = Util::Futures.completion_exception_cause(completion_error)
-
-              if !error.nil?
-                result_future.complete_exceptionally(error)
+              if completion_error
+                result_future.complete_exceptionally(completion_error)
               else
                 execute_work(result_future, tx, &work)
               end
@@ -48,10 +46,8 @@ module Neo4j::Driver
           work_future = safe_execute_work(tx, &work)
 
           work_future.when_complete do |result, completion_error|
-            error = Util::Futures.completion_exception_cause(completion_error)
-
-            if !error.nil?
-              close_tx_after_failed_transaction_work(tx, result_future, error)
+            if completion_error
+              close_tx_after_failed_transaction_work(tx, result_future, completion_error)
             else
               close_tx_after_succeeded_transaction_work(tx, result_future, result)
             end
@@ -83,10 +79,8 @@ module Neo4j::Driver
 
         def close_tx_after_succeeded_transaction_work(tx, result_future, result)
           tx.close_async(true).when_complete do |_ignored, completion_error|
-            commit_error = Util::Futures.completion_exception_cause(completion_error)
-
-            if !commit_error.nil?
-              result_future.complete_exceptionally(commit_error)
+            if completion_error
+              result_future.complete_exceptionally(completion_error)
             else
               result_future.complete(result)
             end

data/ruby/neo4j/driver/internal/handlers/routing_response_handler.rb

@@ -19,13 +19,12 @@ module Neo4j::Driver
 
         private
 
-        def handled_error(received_error)
-          # TODO: probably not necessary with concurrent-ruby as it might not wrap exceptions like java
-          error = Futures.completion_exception_cause(received_error)
-
+        def handled_error(error)
           case error
           when Exceptions::ServiceUnavailableException
             handled_service_unavailable_exception(error)
+          when Exceptions::ProtocolException
+            handled_protocol_exception(error)
           when Exceptions::ClientException
             handled_client_exception(error)
           when Exceptions::TransientException
@@ -36,12 +35,22 @@ module Neo4j::Driver
         end
 
         def handled_service_unavailable_exception(e)
-          @error_handler.on_connection_failure(@address)
-          Exceptions::SessionExpiredException("Server at #{@address} is no longer available", e)
+          record_connection_failure
+          Exceptions::SessionExpiredException.new("Server at #{@address} is no longer available", e)
         end
 
         def handled_transient_exception(e)
-          e.code == "Neo.TransientError.General.DatabaseUnavailable" ? error_handler.on_connection_failure(@address) : e
+          record_connection_failure if e.code == "Neo.TransientError.General.DatabaseUnavailable"
+          e
+        end
+
+        def handled_protocol_exception(e)
+          record_connection_failure
+          e
+        end
+
+        def record_connection_failure
+          @error_handler.on_connection_failure(@address)
         end
 
         def handled_client_exception(e)

data/ruby/neo4j/driver/internal/internal_session.rb

@@ -48,19 +48,15 @@ module Neo4j::Driver
       end
 
       def execute_read(**config, &block)
-        delegating_transaction(AccessMode::READ, **config, &block)
+        transaction(AccessMode::READ, **config, &block)
       end
 
       def execute_write(**config, &block)
-        delegating_transaction(AccessMode::WRITE, **config, &block)
+        transaction(AccessMode::WRITE, **config, &block)
       end
 
       private
 
-      def delegating_transaction(mode, **config, &block)
-        transaction(mode, **config) { |tx| block.call(DelegatingTransaction.new(tx)) }
-      end
-
       def transaction(mode, **config)
         # use different code path compared to async so that work is executed in the caller thread
         # caller thread will also be the one who sleeps between retries;

data/ruby/neo4j/driver/internal/retry/exponential_backoff_retry_logic.rb

@@ -92,10 +92,9 @@ module Neo4j::Driver
           end
 
           work_stage.on_resolution do |fulfilled, result, completion_error|
-            error = Futures.completion_exception_cause(completion_error)
-            if error
+            if completion_error
               # work failed in async way, attempt to schedule a retry
-              retry_on_error(result_future, work, start_time, retry_delay, error, errors)
+              retry_on_error(result_future, work, start_time, retry_delay, completion_error, errors)
             else
               result_future.fulfill(result)
             end

data/ruby/neo4j/driver/version.rb

@@ -2,6 +2,6 @@
 
 module Neo4j
   module Driver
-    VERSION = '6.0.0.alpha.1'
+    VERSION = '6.0.0.alpha.2'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: neo4j-ruby-driver
 version: !ruby/object:Gem::Version
-  version: 6.0.0.alpha.1
+  version: 6.0.0.alpha.2
 platform: ruby
 authors:
 - Heinrich Klobuczek
@@ -217,7 +217,10 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '8'
-description: ''
+description: |2
+
+
+  ==== To Install:
 email:
 - heinrich@mail.com
 executables: []
@@ -346,7 +349,6 @@ files:
 - ruby/neo4j/driver/internal/database_name_util.rb
 - ruby/neo4j/driver/internal/default_bookmark_holder.rb
 - ruby/neo4j/driver/internal/default_domain_name_resolver.rb
-- ruby/neo4j/driver/internal/delegating_transaction.rb
 - ruby/neo4j/driver/internal/direct_connection_provider.rb
 - ruby/neo4j/driver/internal/driver_factory.rb
 - ruby/neo4j/driver/internal/eager_result_value.rb
@@ -526,14 +528,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.1'
+      version: '3.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.3
 specification_version: 4
-summary: ''
+summary: "==== To Install:"
 test_files: []

data/ruby/neo4j/driver/internal/delegating_transaction.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-module Neo4j::Driver
-  module Internal
-    class DelegatingTransaction
-      delegate :run, to: :@tx
-
-      def initialize(tx)
-        @tx = tx
-      end
-    end
-  end
-end