neo4j-ruby-driver 6.2.1.beta.1 → 6.2.1.beta.2

data/lib/neo4j/driver/types/local_date_time.rb

@@ -3,11 +3,17 @@
 module Neo4j
   module Driver
     module Types
-      # Bolt LocalDateTime — wall-clock datetime without timezone.
-      # Stored as the wire-format pair (epoch_seconds, nanoseconds), where
-      # epoch_seconds is the wall-clock components encoded as if they were
-      # UTC. Two LocalDateTimes representing the same wall-clock value
-      # always have the same field values regardless of the host TZ.
+      # Bolt LocalDateTime — a wall-clock datetime with no timezone
+      # (java.time.LocalDateTime). Stored as the wire-format pair
+      # (epoch_seconds, nanoseconds), where epoch_seconds encodes the
+      # wall-clock components as if they were UTC — so the value reads the
+      # same regardless of the host TZ.
+      #
+      # There is deliberately no #to_time: a zone-less value cannot become a
+      # zoned Ruby Time without inventing a zone, and every serious datetime
+      # library refuses that implicit conversion (Java's LocalDateTime forces
+      # .atZone/.atOffset; Python yields a naive datetime). Read the fields via
+      # the component getters instead.
       class LocalDateTime < TemporalValue
         PARSE_FORMATS = [
           '%Y-%m-%d %H:%M:%S.%N',
@@ -28,35 +34,54 @@ module Neo4j
 
         def self.from_epoch(epoch_seconds, nanoseconds) = new(epoch_seconds, nanoseconds)
 
+        # Store the Time's wall clock (its date and time-of-day *in its own
+        # zone*), dropping the zone. We read that wall clock off the instant
+        # using the offset the Time already carries — we never invent a zone,
+        # so from_time(t) and from_time(t.utc) differ (they show different
+        # clocks). epoch_seconds encodes it as-if-UTC per the class contract.
         def self.from_time(time)
-          new(time.to_i, ((time.to_f - time.to_i) * NANOS_PER_SECOND).round)
+          new(time.to_i + time.utc_offset, time.nsec)
         end
 
         def self.parse(string)
           # Strip trailing timezone if present — naive datetime ignores it.
-          naive = string.sub(/[Z+\-]\d{2}:?\d{2}?$/, '')
-          time = PARSE_FORMATS.lazy.filter_map { |fmt| ::Time.strptime(naive, fmt) rescue nil }.first
+          naive = string.sub(/[Z+-]\d{2}:?\d{2}?$/, '')
+          time = PARSE_FORMATS.lazy.filter_map do |fmt|
+            ::Time.strptime(naive, fmt)
+          rescue StandardError
+            nil
+          end.first
           raise ArgumentError, "Invalid LocalDateTime format: #{string}" unless time
-          from_time(::Time.utc(*time_components(time)))
-        end
 
-        def self.time_components(time)
-          [time.year, time.month, time.day, time.hour, time.min, time.sec, time.subsec * 1_000_000]
+          from_time(time)
         end
-        private_class_method :time_components
 
-        def to_time
-          ::Time.at(@epoch_seconds, @nanoseconds.to_i, :nanosecond)
-        end
+        def year       = wall_clock.year
+        def month      = wall_clock.month
+        def day        = wall_clock.day
+        def hour       = wall_clock.hour
+        def minute     = wall_clock.min
+        def second     = wall_clock.sec
+        def nanosecond = @nanoseconds
 
-        # Add a numeric or ActiveSupport::Duration. Sub-second precision
-        # preserved by going through to_f.
-        def +(seconds)
-          self.class.from_time(to_time + seconds.to_f)
+        # Add a numeric or ActiveSupport::Duration. A wall clock has no DST,
+        # so this is plain second arithmetic; sub-second precision preserved.
+        def +(other)
+          total = (@epoch_seconds * NANOS_PER_SECOND) + @nanoseconds +
+                  (other.to_f * NANOS_PER_SECOND).round
+          self.class.new(total / NANOS_PER_SECOND, total % NANOS_PER_SECOND)
         end
 
         def to_s
-          to_time.strftime('%Y-%m-%d %H:%M:%S.%N')
+          wall_clock.strftime('%Y-%m-%d %H:%M:%S.%N')
+        end
+
+        private
+
+        # epoch_seconds read back as its wall clock. UTC by construction, so
+        # the components never depend on the host TZ.
+        def wall_clock
+          ::Time.at(@epoch_seconds, @nanoseconds.to_i, :nanosecond, in: 'UTC')
         end
       end
     end

data/lib/neo4j/driver/types/local_time.rb

@@ -16,6 +16,14 @@ module Neo4j
 
         def self.from_nanos(nanoseconds) = new(nanoseconds)
 
+        # Build from a Ruby Time, taking its displayed wall clock (so the
+        # host zone / .utc of the Time decides which time-of-day is captured).
+        # Mirrors LocalDateTime.from_time.
+        def self.from_time(time)
+          new(time.hour * NANOS_PER_HOUR + time.min * NANOS_PER_MINUTE +
+              time.sec * NANOS_PER_SECOND + time.nsec)
+        end
+
         # Accepts "12:34:56.123456789" or any string containing such a
         # time component (so a full datetime works too — we just take the
         # time fields).
@@ -34,15 +42,15 @@ module Neo4j
         end
         private_class_method :parse_nanos
 
-        def hour       = (@nanoseconds / NANOS_PER_HOUR) % 24
-        def minute     = (@nanoseconds / NANOS_PER_MINUTE) % 60
-        def second     = (@nanoseconds / NANOS_PER_SECOND) % 60
+        def hour = (@nanoseconds / NANOS_PER_HOUR) % 24
+        def minute = (@nanoseconds / NANOS_PER_MINUTE) % 60
+        def second = (@nanoseconds / NANOS_PER_SECOND) % 60
         def nanosecond = @nanoseconds % NANOS_PER_SECOND
 
         # Add a numeric or ActiveSupport::Duration. Sub-second precision
         # preserved by going through to_f (NOT to_i, which dropped 0.5s).
-        def +(seconds)
-          self.class.new(@nanoseconds + (seconds.to_f * NANOS_PER_SECOND).round)
+        def +(other)
+          self.class.new(@nanoseconds + (other.to_f * NANOS_PER_SECOND).round)
         end
 
         def to_s

data/lib/neo4j/driver/types/node.rb

@@ -3,23 +3,14 @@
 module Neo4j
   module Driver
     module Types
-      # Represents a Node in the Neo4j graph
-      class Node
-        attr_reader :id, :labels, :properties, :element_id
+      # Represents a Node in the Neo4j graph. Mirrors
+      # org.neo4j.driver.types.Node — an Entity with a set of labels.
+      class Node < Entity
+        attr_reader :labels
 
         def initialize(id, labels, properties, element_id = nil)
-          @id = id
+          super(id, properties, element_id)
           @labels = labels
-          @properties = properties
-          @element_id = element_id || id.to_s
-        end
-
-        def [](key)
-          @properties[key.to_s] || @properties[key.to_sym]
-        end
-
-        def ==(other)
-          other.is_a?(Node) && other.id == @id
         end
       end
     end

data/lib/neo4j/driver/types/offset_time.rb

@@ -19,10 +19,16 @@ module Neo4j
 
         def self.from_nanos(nanoseconds, tz_offset_seconds) = new(nanoseconds, tz_offset_seconds)
 
+        # Build from a Ruby Time — its wall clock plus its UTC offset.
+        # Reuses LocalTime's field extraction. Mirrors LocalDateTime.from_time.
+        def self.from_time(time)
+          new(LocalTime.from_time(time).nanoseconds, time.utc_offset)
+        end
+
         # Accepts "12:34:56.123456789+01:00", "12:34:56Z", or any string
         # containing such a time-with-offset component.
         def self.parse(string)
-          match = string.match(/(\d{1,2}):(\d{2})(?::(\d{2})(?:\.(\d+))?)?([Z+\-][\d:]*)?/)
+          match = string.match(/(\d{1,2}):(\d{2})(?::(\d{2})(?:\.(\d+))?)?([Z+-][\d:]*)?/)
           raise ArgumentError, "Invalid OffsetTime format: #{string}" unless match
 
           nanos = LocalTime.send(:parse_nanos,
@@ -32,22 +38,22 @@ module Neo4j
 
         def self.parse_offset(str)
           return 0 if str == 'Z'
-          raise ArgumentError, "Invalid timezone offset: #{str}" unless str =~ /^([+\-])(\d{2}):?(\d{2})?$/
+          raise ArgumentError, "Invalid timezone offset: #{str}" unless str =~ /^([+-])(\d{2}):?(\d{2})?$/
 
-          sign = $1 == '+' ? 1 : -1
-          sign * ($2.to_i * 3600 + ($3 || 0).to_i * 60)
+          sign = ::Regexp.last_match(1) == '+' ? 1 : -1
+          sign * (::Regexp.last_match(2).to_i * 3600 + (::Regexp.last_match(3) || 0).to_i * 60)
         end
         private_class_method :parse_offset
 
-        def hour       = (@nanoseconds / NANOS_PER_HOUR) % 24
-        def minute     = (@nanoseconds / NANOS_PER_MINUTE) % 60
-        def second     = (@nanoseconds / NANOS_PER_SECOND) % 60
+        def hour = (@nanoseconds / NANOS_PER_HOUR) % 24
+        def minute = (@nanoseconds / NANOS_PER_MINUTE) % 60
+        def second = (@nanoseconds / NANOS_PER_SECOND) % 60
         def nanosecond = @nanoseconds % NANOS_PER_SECOND
 
         # Add a numeric or ActiveSupport::Duration. Sub-second precision
         # preserved (see LocalTime#+).
-        def +(seconds)
-          self.class.new(@nanoseconds + (seconds.to_f * NANOS_PER_SECOND).round, @tz_offset_seconds)
+        def +(other)
+          self.class.new(@nanoseconds + (other.to_f * NANOS_PER_SECOND).round, @tz_offset_seconds)
         end
 
         def to_s
@@ -66,6 +72,7 @@ module Neo4j
         # <=>; == still requires same fields (they're not the same value).
         def <=>(other)
           return nil unless other.is_a?(OffsetTime)
+
           utc_nanos <=> other.utc_nanos
         end
 

data/lib/neo4j/driver/types/path.rb

@@ -45,8 +45,8 @@ module Neo4j
 
         # Iterate over segments in the path
         # Each segment represents a relationship and its start/end nodes
-        def each(&block)
-          @segments.each(&block)
+        def each(&)
+          @segments.each(&)
         end
 
         # Represents a segment of a path (a relationship and its start/end nodes)

data/lib/neo4j/driver/types/point.rb

@@ -8,10 +8,10 @@ module Neo4j
         attr_reader :srid, :x, :y, :z
 
         # SRID constants for coordinate reference systems
-        WGS_84_2D = 4326        # Geographic 2D (longitude, latitude)
-        WGS_84_3D = 4979        # Geographic 3D (longitude, latitude, height)
-        CARTESIAN_2D = 7203     # Cartesian 2D (x, y)
-        CARTESIAN_3D = 9157     # Cartesian 3D (x, y, z)
+        WGS_84_2D = 4326 # Geographic 2D (longitude, latitude)
+        WGS_84_3D = 4979 # Geographic 3D (longitude, latitude, height)
+        CARTESIAN_2D = 7203 # Cartesian 2D (x, y)
+        CARTESIAN_3D = 9157 # Cartesian 3D (x, y, z)
 
         def initialize(srid: nil, x: nil, y: nil, z: nil, longitude: nil, latitude: nil, height: nil)
           # Handle longitude/latitude aliases for x/y

data/lib/neo4j/driver/types/relationship.rb

@@ -4,10 +4,11 @@ module Neo4j
   module Driver
     module Types
       # Represents a Relationship in the Neo4j graph.
-      # Mirrors Java's org.neo4j.driver.types.Relationship.
-      class Relationship
-        attr_reader :id, :start_node_id, :end_node_id, :type, :properties,
-                    :element_id, :start_node_element_id, :end_node_element_id
+      # Mirrors Java's org.neo4j.driver.types.Relationship — an Entity with a
+      # type and start/end node ids.
+      class Relationship < Entity
+        attr_reader :start_node_id, :end_node_id, :type,
+                    :start_node_element_id, :end_node_element_id
 
         # Bolt 4.x wire doesn't include start/end_node_element_id —
         # PackStream hydration passes nil for those slots. Fall back to
@@ -18,23 +19,13 @@ module Neo4j
         def initialize(id, start_node_id, end_node_id, type, properties,
                        element_id = nil, start_node_element_id = nil,
                        end_node_element_id = nil)
-          @id = id
+          super(id, properties, element_id)
           @start_node_id = start_node_id
           @end_node_id = end_node_id
           @type = type
-          @properties = properties
-          @element_id = element_id || id.to_s
           @start_node_element_id = start_node_element_id || start_node_id.to_s
           @end_node_element_id = end_node_element_id || end_node_id.to_s
         end
-
-        def [](key)
-          @properties[key.to_s] || @properties[key.to_sym]
-        end
-
-        def ==(other)
-          other.is_a?(Relationship) && other.id == @id
-        end
       end
     end
   end

data/lib/neo4j/driver/types/temporal_value.rb

@@ -13,8 +13,8 @@ module Neo4j
 
         NANOS_PER_SECOND = 1_000_000_000
         NANOS_PER_MINUTE = 60 * NANOS_PER_SECOND
-        NANOS_PER_HOUR   = 60 * NANOS_PER_MINUTE
-        NANOS_PER_DAY    = 24 * NANOS_PER_HOUR
+        NANOS_PER_HOUR = 60 * NANOS_PER_MINUTE
+        NANOS_PER_DAY = 24 * NANOS_PER_HOUR
 
         def self.significant_fields
           raise NotImplementedError, "#{self} must define .significant_fields"
@@ -26,6 +26,7 @@ module Neo4j
 
         def <=>(other)
           return nil unless other.is_a?(self.class)
+
           significant <=> other.significant
         end
 

data/lib/neo4j/driver/types/unbound_relationship.rb

@@ -3,19 +3,14 @@
 module Neo4j
   module Driver
     module Types
-      # Represents an unbound relationship (used in paths before binding to nodes)
-      class UnboundRelationship
-        attr_reader :id, :type, :properties, :element_id
+      # Represents an unbound relationship (used in paths before binding to
+      # nodes). An Entity with a type but no start/end nodes yet.
+      class UnboundRelationship < Entity
+        attr_reader :type
 
         def initialize(id, type, properties, element_id = nil)
-          @id = id
+          super(id, properties, element_id)
           @type = type
-          @properties = properties
-          @element_id = element_id || id.to_s
-        end
-
-        def [](key)
-          @properties[key.to_s] || @properties[key.to_sym]
         end
 
         # Bind this relationship to specific start and end nodes

data/lib/neo4j/driver/version.rb

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

data/lib/neo4j/driver.rb

@@ -3,7 +3,6 @@
 require 'connection_pool'
 require 'neo4j-ruby-driver_loader'
 require 'openssl'
-require 'set'
 require 'socket'
 require 'stringio'
 require 'tzinfo'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: neo4j-ruby-driver
 version: !ruby/object:Gem::Version
-  version: 6.2.1.beta.1
+  version: 6.2.1.beta.2
 platform: ruby
 authors:
 - Neo4j Driver Team
@@ -37,76 +37,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.6'
-- !ruby/object:Gem::Dependency
-  name: csv
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: ffaker
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.13'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.13'
-- !ruby/object:Gem::Dependency
-  name: rspec-its
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: connection_pool
   requirement: !ruby/object:Gem::Requirement
@@ -245,6 +175,7 @@ files:
 - lib/neo4j/driver/summary/summary_counters.rb
 - lib/neo4j/driver/transaction.rb
 - lib/neo4j/driver/types/duration.rb
+- lib/neo4j/driver/types/entity.rb
 - lib/neo4j/driver/types/local_date_time.rb
 - lib/neo4j/driver/types/local_time.rb
 - lib/neo4j/driver/types/node.rb
@@ -262,7 +193,8 @@ files:
 homepage: https://github.com/neo4jrb/neo4j-ruby-driver
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
 - lib