neo4j-java-driver 0.4.0-java → 1.7.4-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d15a30347713fb80742a8abc60472a20dd240dc327dc7b5ec48e69e128810e7
-  data.tar.gz: a276cf844d3a0a1b5c3b977744aedd8e74634d7a0e9c1829addb334d7e19d825
+  metadata.gz: 0a39ad35198a8958f2857bfcfb6040ffffeee0338fee2105ff2ca4e4f98f162b
+  data.tar.gz: 5f617ac0e6a69992f8febe4ec4ed115383c8088b4732bf33c3607aa9994d8c96
 SHA512:
-  metadata.gz: 7afbfb75c3268db498e5a5ec0a8b64b664e4fc0121f395e97448338e4fbce30fd80dc5341b951465063056f0ad2f7119faba49410cce2440a4733ffaa4cbda9a
-  data.tar.gz: 960124acd456ee2a9fb4f3edd2d0c9bc816b3929792a926a5397d13bbcf814932a6d813b5e2fd81be4694fcb25ddf055293dcfa085e6ef2fe490e6287695e033
+  metadata.gz: 59aa3597d96b34851293e27c49dee3d9d52d5a604112f35274f1dc5477fa87f1c5c27977d36e345ec413d195b1b4b128c6fa12c248d90c234bc88d9a9176f8bb
+  data.tar.gz: de8450ea68258da74d9e17274a12f2d7f83129fbd06a8e9eb497847cd487aa3a5ae3a1a8af4a4d10733bf1565b4cb645bee6caf28692bbce9269a05867e0ce12

data/jruby/neo4j/driver.rb

@@ -42,7 +42,7 @@ end
 Loader.load
 
 Java::OrgNeo4jDriverInternal::InternalDriver.prepend Neo4j::Driver::Ext::InternalDriver
-Java::OrgNeo4jDriverInternal::InternalEntity.include Neo4j::Driver::Ext::MapAccessor
+Java::OrgNeo4jDriverInternal::InternalEntity.include Neo4j::Driver::Ext::InternalEntity
 Java::OrgNeo4jDriverInternal::InternalNode.prepend Neo4j::Driver::Ext::InternalNode
 Java::OrgNeo4jDriverInternal::InternalPath.include Neo4j::Driver::Ext::StartEndNaming
 Java::OrgNeo4jDriverInternal::InternalPath::SelfContainedSegment.include Neo4j::Driver::Ext::StartEndNaming

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

@@ -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) || org.neo4j.driver.v1.exceptions.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

@@ -23,14 +23,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/{map_accessor.rb → internal_entity.rb}

@@ -3,7 +3,7 @@
 module Neo4j
   module Driver
     module Ext
-      module MapAccessor
+      module InternalEntity
         include MapConverter
 
         alias properties to_h
@@ -11,6 +11,10 @@ module Neo4j
         def [](key)
           get(key.to_s).as_ruby_object
         end
+
+        def ==(other)
+          java_method(:isEqual).call(other)
+        end
       end
     end
   end

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/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 = '0.4.0'
+    VERSION = '1.7.4'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j-java-driver
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 1.7.4
 platform: java
 authors:
 - Heinrich Klobuczek
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-09 00:00:00.000000000 Z
+date: 2021-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -218,13 +218,13 @@ files:
 - jruby/neo4j/driver/ext/graph_database.rb
 - jruby/neo4j/driver/ext/internal/summary/internal_result_summary.rb
 - jruby/neo4j/driver/ext/internal_driver.rb
+- jruby/neo4j/driver/ext/internal_entity.rb
 - jruby/neo4j/driver/ext/internal_keys.rb
 - jruby/neo4j/driver/ext/internal_node.rb
 - jruby/neo4j/driver/ext/internal_record.rb
 - jruby/neo4j/driver/ext/internal_relationship.rb
 - jruby/neo4j/driver/ext/internal_statement_result.rb
 - jruby/neo4j/driver/ext/logger.rb
-- jruby/neo4j/driver/ext/map_accessor.rb
 - jruby/neo4j/driver/ext/map_converter.rb
 - jruby/neo4j/driver/ext/neo_converter.rb
 - jruby/neo4j/driver/ext/network_session.rb