neo4j-java-driver 4.1.0.beta.1-java → 4.2.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5631416868ef0ee4e31eee3ebe51534110c0dc8edf012121d0555662141fd79a
-  data.tar.gz: 9d2703ce1ccb0ac139589582b26c274b5a4985cd01e160634e45b9a058600205
+  metadata.gz: cf45a8f27d9cf287ab09b59734afe619612f5d19922d15e244a03f1b21acb175
+  data.tar.gz: c68fe4e55bf2805f633ca453f4736979936ac47a9b8ebb3d0bc8f484729c7025
 SHA512:
-  metadata.gz: b0003aa8a1bf14b9d7daca164c9cb1ce79fecb7d354495123a5bd3dc1f75c266707e8617c652f5df3b6294b4ce79415cce71c2d57e7cb099eef91d68ca32de64
-  data.tar.gz: 166d16d61082ad1c8997c6f50c0d72c25ac23cbd1a495c1d175f0061e992fe44b75b96ef80788c3f7d1fc89221f52f3cc4cb04c0107550f9840ba29d4056d6e2
+  metadata.gz: ca113bd288db561f5ce921e358c10d99b4f5d6c4a98cca9e106a5f2f28af74aed0aebbdb36e189d695dc74b6773ad7aba7d40bd1cd07f999dc96873e5197c3a5
+  data.tar.gz: 9d6f276659e0ea199a6f940f1e7cab7b7a9083a2603ed02bfde75c58bf411d918a93f5400383fc4ebfbca185044280d75f7bc6d2a3e10d705f42d9adcaf2d1bf

data/jruby/neo4j/driver/ext/auth_tokens.rb

@@ -4,7 +4,7 @@ module Neo4j
   module Driver
     module Ext
       module AuthTokens
-        def basic(username, password)
+        def basic(username, password, realm = nil)
           Neo4j::Driver::Internal::Validator.require_non_nil_credentials!(username, password)
           super
         end

data/jruby/neo4j/driver/ext/config_converter.rb

@@ -9,7 +9,7 @@ module Neo4j
         private
 
         def to_java_config(builder_class, **hash)
-          hash.reduce(builder_class.builder) { |object, key_value| object.send(*config_method(*key_value)) }.build
+          hash.compact.reduce(builder_class.builder) { |object, key_value| object.send(*config_method(*key_value)) }.build
         end
 
         def config_method(key, value)
@@ -17,10 +17,8 @@ module Neo4j
           unit = nil
           case key.to_s
           when 'encryption'
-            unless value
-              method = :without_encryption
-              value = nil
-            end
+            method = :without_encryption unless value
+            value = nil
           when 'timeout'
             value = java.time.Duration.ofMillis(Driver::Internal::DurationNormalizer.milliseconds(value))
           when /time(out)?$/

data/jruby/neo4j/driver/ext/exception_checkable.rb

@@ -20,8 +20,19 @@ module Neo4j
 
         def reverse_check
           yield
-        rescue StandardError => e
-          raise(e.cause || ExceptionMapper.reverse_exception_class(e)&.new('') || e)
+        rescue Neo4j::Driver::Exceptions::ServiceUnavailableException => e
+          raise(throwable(e.cause) || Java::OrgNeo4jDriverExceptions::ServiceUnavailableException.new(e.message))
+        rescue Neo4j::Driver::Exceptions::Neo4jException,
+          Neo4j::Driver::Exceptions::NoSuchRecordException,
+          Neo4j::Driver::Exceptions::UntrustedServerException,
+          Neo4j::Driver::Exceptions::IllegalStateException => e
+          raise(throwable(e.cause) || e)
+        end
+
+        private
+
+        def throwable(e)
+          e if e.is_a? Java::JavaLang::Throwable
         end
       end
     end

data/jruby/neo4j/driver/ext/exception_mapper.rb

@@ -24,14 +24,7 @@ module Neo4j
         end
 
         def arguments
-          [code, message, self, suppressed.map(&method(:mapped_exception))]
-        end
-
-        def self.reverse_exception_class(exception)
-          case exception
-          when Neo4j::Driver::Exceptions::ServiceUnavailableException
-            ServiceUnavailableException
-          end
+          [code, message, suppressed.map(&method(:mapped_exception))]
         end
 
         private

data/jruby/neo4j/driver/ext/neo_converter.rb

@@ -16,8 +16,6 @@ module Neo4j
             object.map(&method(:to_neo))
           when Types::Bytes
             object.to_java_bytes
-          when Date
-            Java::JavaTime::LocalDate.of(object.year, object.month, object.day)
           when ActiveSupport::Duration
             Java::OrgNeo4jDriverInternal::InternalIsoDuration.new(
               *Driver::Internal::DurationNormalizer.normalize(object)
@@ -34,8 +32,12 @@ module Neo4j
                                              object.nsec)
           when ActiveSupport::TimeWithZone
             to_zoned_date_time(object, object.time_zone.tzinfo.identifier)
-          when Time
+          when Time, DateTime
             to_zoned_date_time(object, object.formatted_offset)
+          when Date
+            Java::JavaTime::LocalDate.of(object.year, object.month, object.day)
+          when Symbol
+            object.to_s
           when nil, true, false, Integer, Float, String
             object
           else

data/lib/loader.rb

@@ -8,7 +8,7 @@ class Loader
     loader.tag = 'neo4j-ruby-driver'
     loader.push_dir(File.expand_path(__dir__))
     loader.push_dir(File.dirname(File.dirname(caller_locations(1..1).first.path)))
-    loader.ignore(File.expand_path('neo4j-java-driver_jars.rb', __dir__))
+    loader.ignore(File.expand_path('neo4j-*-driver_jars.rb', __dir__))
     loader.ignore(File.expand_path('neo4j_ruby_driver.rb', __dir__))
     loader.ignore(File.expand_path('org', __dir__))
     loader.inflector = Zeitwerk::GemInflector.new(File.expand_path('neo4j/driver', __dir__))

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

@@ -4,12 +4,11 @@ module Neo4j
   module Driver
     module Exceptions
       class Neo4jException < RuntimeError
-        attr_reader :code, :cause, :suppressed
+        attr_reader :code, :suppressed
 
         def initialize(*args)
           @code = args.shift if args.count > 1
           message = args.shift
-          @cause = args.shift
           @suppressed = args.shift
           super(message)
         end

data/lib/neo4j/driver/internal/duration_normalizer.rb

@@ -6,7 +6,8 @@ module Neo4j
       module DurationNormalizer
         class << self
           def normalize(object)
-            parts = object.parts
+            parts = object.parts.to_h
+            parts.default = 0
             months_i, months_remainder_seconds = divmod(months(parts), ActiveSupport::Duration::SECONDS_PER_MONTH)
             months_days, months_remainder_seconds =
               months_remainder_seconds.divmod(ActiveSupport::Duration::SECONDS_PER_DAY)

data/lib/neo4j/driver/version.rb

@@ -2,6 +2,6 @@
 
 module Neo4j
   module Driver
-    VERSION = '4.1.0.beta.1'
+    VERSION = '4.2.0'
   end
 end

data/lib/neo4j_ruby_driver.rb

@@ -13,6 +13,7 @@ if RUBY_PLATFORM.match?(/java/)
 end
 # End workaround
 
+require 'active_support/concern'
 require 'active_support/core_ext/hash/indifferent_access'
 require 'active_support/core_ext/numeric/time'
 require 'active_support/duration'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j-java-driver
 version: !ruby/object:Gem::Version
-  version: 4.1.0.beta.1
+  version: 4.2.0
 platform: java
 authors:
 - Heinrich Klobuczek
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-16 00:00:00.000000000 Z
+date: 2021-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -249,7 +249,6 @@ files:
 - lib/neo4j/driver/exceptions/transient_exception.rb
 - lib/neo4j/driver/exceptions/untrusted_server_exception.rb
 - lib/neo4j/driver/internal/duration_normalizer.rb
-- lib/neo4j/driver/internal/ruby_signature.rb
 - lib/neo4j/driver/internal/validator.rb
 - lib/neo4j/driver/types/bytes.rb
 - lib/neo4j/driver/types/local_date_time.rb
@@ -278,11 +277,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements:
-- jar org.neo4j.driver, neo4j-java-driver, 4.1.1
+- jar org.neo4j.driver, neo4j-java-driver, 4.2.4
 rubygems_version: 3.0.6
 signing_key:
 specification_version: 4

data/lib/neo4j/driver/internal/ruby_signature.rb

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-module Neo4j
-  module Driver
-    module Internal
-      module RubySignature
-        class << self
-          def session(args)
-            [
-              args.empty? || args.first.is_a?(String) ? Neo4j::Driver::AccessMode::WRITE : args.shift, # mode
-              args # bookmarks
-            ]
-          end
-        end
-      end
-    end
-  end
-end