neo4j-ruby-driver 4.4.0.alpha.5 → 4.4.0.alpha.8

data/ruby/neo4j/driver/internal/messaging/request/transaction_metadata_builder.rb

@@ -6,10 +6,10 @@ module Neo4j::Driver
           MODE_READ_VALUE = 'r'
 
           class << self
-            def build_metadata(tx_timeout:, tx_metadata:, mode:, bookmark:, impersonated_user:,
+            def build_metadata(timeout:, tx_metadata:, mode:, bookmark:, impersonated_user:,
                                database_name: DatabaseNameUtil.default_database)
               { bookmarks: bookmark.presence,
-                tx_timeout: tx_timeout,
+                tx_timeout: timeout&.then(&DurationNormalizer.method(:milliseconds)),
                 tx_metadata: tx_metadata.presence,
                 mode: (MODE_READ_VALUE if mode == AccessMode::READ),
                 db: database_name&.database_name,

data/ruby/neo4j/driver/internal/messaging/v3/bolt_protocol_v3.rb

@@ -13,7 +13,7 @@ module Neo4j::Driver
 
           def initialize_channel(channel, user_agent, auth_token, routing_context)
             message = Request::HelloMessage.new(user_agent, auth_token,
-                                                (routing_context.to_map if routing_context.server_routing_enabled?))
+                                                (routing_context.to_h if routing_context.server_routing_enabled?))
             handler = Handlers::HelloResponseHandler.new(channel, VERSION)
 
             channel.message_dispatcher.enqueue(handler)
@@ -36,12 +36,16 @@ module Neo4j::Driver
             connection.write_and_flush(begin_message, Handlers::BeginTxResponseHandler.new)
           end
 
-          def commit_transaction(connection, bookmark_holder)
-            connection.write_and_flush(Request::CommitMessage::COMMIT, Handlers::CommitTxResponseHandler.new(bookmark_holder))
+          def commit_transaction(connection)
+            Util::ResultHolder.new.tap do |result_holder|
+              connection.write_and_flush(Request::CommitMessage::COMMIT, Handlers::CommitTxResponseHandler.new(result_holder))
+            end
           end
 
           def rollback_transaction(connection)
-            connection.write_and_flush(Request::RollbackMessage::ROLLBACK, Handlers::RollbackTxResponseHandler.new)
+            Util::ResultHolder.new.tap do |result_holder|
+              connection.write_and_flush(Request::RollbackMessage::ROLLBACK, Handlers::RollbackTxResponseHandler.new(result_holder))
+            end
           end
 
           def run_in_auto_commit_transaction(connection, query, bookmark_holder, config, fetch_size)

data/ruby/neo4j/driver/internal/messaging/v44/message_writer_v44.rb

@@ -10,7 +10,7 @@ module Neo4j::Driver
               Request::HelloMessage::SIGNATURE => Encode::HelloMessageEncoder.new,
               Request::GoodbyeMessage::SIGNATURE => Encode::GoodbyeMessageEncoder.new,
               Request::RunWithMetadataMessage::SIGNATURE => Encode::RunWithMetadataMessageEncoder.new,
-              Request::RouteMessage::SIGNATURE => Encode::RouteMessageEncoder.new,
+              Request::RouteMessage::SIGNATURE => Encode::RouteV44MessageEncoder.new,
               Request::DiscardMessage::SIGNATURE => Encode::DiscardMessageEncoder.new,
               Request::PullMessage::SIGNATURE => Encode::PullMessageEncoder.new,
               Request::BeginMessage::SIGNATURE => Encode::BeginMessageEncoder.new,

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

@@ -0,0 +1,13 @@
+module Neo4j::Driver
+  module Internal
+    class ReadOnlyBookmarkHolder
+      attr_reader :bookmark
+
+      def initialize(bookmark = InternalBookmark.empty)
+        @bookmark = bookmark
+      end
+
+      def bookmark=(_value) end
+    end
+  end
+end

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

@@ -0,0 +1,35 @@
+module Neo4j::Driver
+  module Internal
+    class ResolvedBoltServerAddress < BoltServerAddress
+      MAX_HOST_ADDRESSES_IN_STRING_VALUE = 5
+
+      def initialize(host, port, *resolved_addresses_arr)
+        super(host: host, port: port)
+        if resolved_addresses_arr.empty?
+          raise ArgumentError,
+                'The resolvedAddressesArr must not be empty, check your DomainNameResolver is compliant with the interface contract'
+        end
+        @resolved_addresses = resolved_addresses_arr.to_set.freeze
+        @string_value = create_string_representation
+      end
+
+      def unicast_stream
+        @resolved_addresses
+          .map { |address| BoltServerAddress.new(host: host, connection_host: address.ip_address, port: port) }
+      end
+
+      def to_s
+        @string_value
+      end
+
+      def attributes
+        super + [@resolved_addresses]
+      end
+
+      def create_string_representation
+        host_addresses = @resolved_addresses.take(MAX_HOST_ADDRESSES_IN_STRING_VALUE).map(&:ip_address).join(',')
+        "#{host}(#{host_addresses}#{',...' if @resolved_addresses.size > MAX_HOST_ADDRESSES_IN_STRING_VALUE}):#{port}"
+      end
+    end
+  end
+end

data/ruby/neo4j/driver/internal/security/security_plan_impl.rb

@@ -4,7 +4,7 @@ module Neo4j::Driver::Internal
                                         :revocation_strategy)
       class << self
         def for_all_certificates(requires_hostname_verification, revocation_strategy)
-          new(true, OpenSSL::SSL::SSLContext.new, requires_hostname_verification, revocation_strategy)
+          new(true, all_context(requires_hostname_verification), requires_hostname_verification, revocation_strategy)
         end
 
         def for_custom_ca_signed_certificates(cert_files, requires_hostname_verification, revocation_strategy)
@@ -23,19 +23,24 @@ module Neo4j::Driver::Internal
 
         private
 
+        def all_context(requires_hostname_verification)
+          ssl_context(verify_mode: OpenSSL::SSL::VERIFY_NONE, verify_hostname: requires_hostname_verification)
+        end
+
         def ca_signed_context(requires_hostname_verification)
-          OpenSSL::SSL::SSLContext.new.tap do |context|
-            context.verify_mode = OpenSSL::SSL::VERIFY_PEER
-            context.verify_hostname = requires_hostname_verification
-          end
+          ssl_context(verify_hostname: requires_hostname_verification)
         end
 
         def custom_ca_signed_context(cert_files, requires_hostname_verification)
-          ca_signed_context(requires_hostname_verification).tap do |context|
-            context.cert_store = OpenSSL::X509::Store.new.tap do |store|
+          ssl_context(
+            cert_store: OpenSSL::X509::Store.new.tap do |store|
               cert_files.each(&store.method(:add_file))
-            end
-          end
+            end,
+            verify_hostname: requires_hostname_verification)
+        end
+
+        def ssl_context(**params)
+          OpenSSL::SSL::SSLContext.new.tap { |context| context.set_params(params) }
         end
       end
     end

data/ruby/neo4j/driver/internal/util/error_util.rb

@@ -59,7 +59,7 @@ module Neo4j::Driver::Internal::Util
       end
 
       def add_suppressed(main_error, error)
-        main_error.add_suppressed(error) if main_error.is_a?(Exceptions::Neo4jException) && main_error != error
+        main_error.add_suppressed(error) if main_error.is_a?(Neo4j::Driver::Exceptions::Neo4jException) && main_error != error
       end
 
       def get_root_cause(error)

data/ruby/neo4j/driver/internal/util/result_holder.rb

@@ -0,0 +1,70 @@
+module Neo4j::Driver
+  module Internal
+    module Util
+      class ResultHolder
+        def self.successful(result = nil)
+          new.tap { |holder| holder.succeed(result) }
+        end
+
+        def self.failed(error)
+          new.tap { |holder| holder.fail(error) }
+        end
+
+        def succeed(result = nil)
+          if @completed
+            false
+          else
+            @result = result
+            true
+          end
+        ensure
+          @completed = true
+        end
+
+        def fail(error)
+          if @completed
+            false
+          else
+            @error = error
+            true
+          end
+        ensure
+          @completed = true
+        end
+
+        def result!
+          raise @error if @error
+          @result
+        end
+
+        def then
+          @error ? self : ResultHolder.successful(yield(@result))
+        end
+
+        # &block returns a ResultHolder
+        def compose
+          @error ? self : yield(@result)
+        end
+
+        def chain
+          ResultHolder.successful(yield(@result, @error))
+        rescue => error
+          ResultHolder.failed(error)
+        end
+
+        def side
+          yield(@result, @error)
+          self
+        end
+
+        def copy_to(result_holder)
+          if @error
+            result_holder.fail(@error)
+          else
+            result_holder.succeed(@result)
+          end
+        end
+      end
+    end
+  end
+end

data/ruby/neo4j/driver/net/{server_address1.rb → server_address.rb}

@@ -1,8 +1,8 @@
 module Neo4j::Driver
   module Net
-    module ServerAddress1
+    module ServerAddress
       def self.of(host, port)
-        Internal::BoltServerAddress.new(host, port)
+        Internal::BoltServerAddress.new(host: host, port: port)
       end
     end
   end

data/ruby/neo4j/driver/query.rb

@@ -10,7 +10,7 @@ module Neo4j
     # @since 1.0
     class Query < Struct.new(:text, :parameters)
       def initialize(text, **parameters)
-        super(self.class.validated_query_text(text), Values.value!(parameters))
+        super(self.class.validated_query_text(text), Values.value(parameters))
       end
 
       # @param newText the new query text

data/ruby/neo4j/driver/transaction_config.rb

@@ -32,7 +32,11 @@ module Neo4j
       def initialize(timeout: nil, metadata: {})
         Internal::Util::Preconditions.check_argument(timeout.nil? || timeout.positive?, 'Transaction timeout should be positive')
         Internal::Validator.require_non_nil!(metadata)
-        merge(timeout: timeout, metadata: metadata)
+        merge!(timeout: timeout, metadata: metadata)
+      end
+
+      def self.empty
+        EMPTY
       end
 
       # Check if this configuration object contains any values.

data/ruby/neo4j/driver/values.rb

@@ -1,14 +1,14 @@
 module Neo4j
   module Driver
     module Values
-      def self.value!(value)
-        this_method = method(:value!)
+      def self.value(value)
+        this_method = method(:value)
         case value
         when nil, TrueClass, FalseClass, Integer, Float, String, Symbol, Bookmark, ActiveSupport::Duration,
           Types::Point, Types::Time, Time, Date
           value
         when Hash
-          value.transform_keys!(&this_method).transform_values!(&this_method)
+          value.transform_keys(&this_method).transform_values(&this_method)
         when Internal::InternalPath
           nonconvertible(value)
         when Enumerable

data/ruby/neo4j/driver/version.rb

@@ -2,6 +2,6 @@
 
 module Neo4j
   module Driver
-    VERSION = '4.4.0.alpha.5'
+    VERSION = '4.4.0.alpha.8'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j-ruby-driver
 version: !ruby/object:Gem::Version
-  version: 4.4.0.alpha.5
+  version: 4.4.0.alpha.8
 platform: ruby
 authors:
 - Heinrich Klobuczek
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-24 00:00:00.000000000 Z
+date: 2022-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -25,35 +25,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: async
+  name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.1.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.1.10
 - !ruby/object:Gem::Dependency
-  name: zeitwerk
+  name: async-io
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.10
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.10
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: async-io
+  name: async-pool
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,13 +67,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: async-pool
+  name: async
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -287,11 +287,11 @@ files:
 - ruby/neo4j/driver/internal/async/outbound/chunk_aware_byte_buf_output.rb
 - ruby/neo4j/driver/internal/async/outbound/outbound_message_handler.rb
 - ruby/neo4j/driver/internal/async/pool/channel.rb
+- ruby/neo4j/driver/internal/async/pool/channel_tracker.rb
 - ruby/neo4j/driver/internal/async/pool/connection_pool_impl.rb
 - ruby/neo4j/driver/internal/async/pool/controller.rb
 - ruby/neo4j/driver/internal/async/pool/netty_channel_health_checker.rb
 - ruby/neo4j/driver/internal/async/pool/netty_channel_pool.rb
-- ruby/neo4j/driver/internal/async/pool/netty_channel_tracker.rb
 - ruby/neo4j/driver/internal/async/pool/network_connection_factory.rb
 - ruby/neo4j/driver/internal/async/pool/pool_settings.rb
 - ruby/neo4j/driver/internal/async/result_cursors_holder.rb
@@ -320,7 +320,6 @@ files:
 - ruby/neo4j/driver/internal/cursor/disposable_async_result_cursor.rb
 - ruby/neo4j/driver/internal/cursor/result_cursor_factory_impl.rb
 - ruby/neo4j/driver/internal/cursor/rx_result_cursor_impl.rb
-- ruby/neo4j/driver/internal/database_name.rb
 - 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
@@ -435,6 +434,8 @@ files:
 - ruby/neo4j/driver/internal/packstream/pack_output.rb
 - ruby/neo4j/driver/internal/packstream/pack_stream.rb
 - ruby/neo4j/driver/internal/packstream/pack_type.rb
+- ruby/neo4j/driver/internal/read_only_bookmark_holder.rb
+- ruby/neo4j/driver/internal/resolved_bolt_server_address.rb
 - ruby/neo4j/driver/internal/retry/exponential_backoff_retry_logic.rb
 - ruby/neo4j/driver/internal/revocation_strategy.rb
 - ruby/neo4j/driver/internal/scheme.rb
@@ -466,9 +467,10 @@ files:
 - ruby/neo4j/driver/internal/util/metadata_extractor.rb
 - ruby/neo4j/driver/internal/util/mutex.rb
 - ruby/neo4j/driver/internal/util/preconditions.rb
+- ruby/neo4j/driver/internal/util/result_holder.rb
 - ruby/neo4j/driver/internal/util/server_version.rb
 - ruby/neo4j/driver/logging1.rb
-- ruby/neo4j/driver/net/server_address1.rb
+- ruby/neo4j/driver/net/server_address.rb
 - ruby/neo4j/driver/query.rb
 - ruby/neo4j/driver/records.rb
 - ruby/neo4j/driver/session_config.rb

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

@@ -1,12 +0,0 @@
-module Neo4j::Driver
-  module Internal
-    class DatabaseName
-      attr_accessor :database_name, :description
-
-      def initialize(database_name, description = nil)
-        @database_name = database_name
-        @description = description
-      end
-    end
-  end
-end