activegraph 12.0.0.beta.6 → 12.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f10f61337255f2e1e68ba9e4a7d06c5cad602ee9d94fd3258d6c4437f40f64d
-  data.tar.gz: e7525d5641cb10951fb92e973259a6ec88ca83d529070065b8cd75491791cf02
+  metadata.gz: 631a772ff4cad538ff9390a07f910d0369c341e0bc6e8e35957521a1ec16cba4
+  data.tar.gz: 45daf82de8e8bce83260c8245f8988e897dcd70dc35fda742247525e1e7ab38b
 SHA512:
-  metadata.gz: 7f56d37e271db3e850cf861384afa46e7cf2427656ef9392982bdb6f46834499db15eeb943e3d6f6149af23d902d719bfd7ea07b601dab9032f022768e1f67a2
-  data.tar.gz: 2c452170b87d7fbe6e83ce87965bd2c30ef671edcd6083b819f1160f2175a9aee0d82d3187eed86e0e6ac8174f5883a5541be4a4d8b72b6154e69ace9714e348
+  metadata.gz: a571949dd06e7289914e90ba4d8507793b73b48531a7d8d17a83a15c145e901e73380783ba3521da52a6bcc93056ec290969b007d3a455588699c720e8103774
+  data.tar.gz: d501ed3dfed4a833b93608de5f883721a93277752719abda0d1c9ba734fc1c62acebba0fd88a037cb1f446432bee00992d83a66904ce3a741c7941442a159532

data/CHANGELOG.md

@@ -3,6 +3,22 @@ All notable changes to this project will be documented in this file.
 This file should follow the standards specified on [http://keepachangelog.com/]
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [12.0.0] (2026-08-16)
+
+### Changed
+- Use the driver-native Neo4j::Driver::Types::Duration instead of ActiveSupport::Duration
+
+### Added
+- Type converted for ActiveSupport::Duration to Neo4j::Driver::Types::Duration for backward compatibility. The converter is lossy if fractional units are used in ActiveSupport::Duration.
+
+### Fixed
+- Adapt to neo4j-ruby-driver 6.2.1
+
+## [12.0.0.beta.7] (2026-03-19)
+
+### Fixed
+- Improved rollback handling in nested transactions to ensure the result of the block is returned even when a rollback is triggered.
+
 ## [12.0.0.beta.6] 2026-03-18
 
 ## Added
@@ -238,12 +254,6 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 - Micro-optimizations which help when dealing with a lot of data (thanks @jgaskins / see #1490)
 
-## [9.1.8] 2018-03-27
-
-## Fixed
-
-- Micro-optimizations which help when dealing with a lot of data (thanks @jgaskins / see #1490)
-
 ## [9.1.7] 2018-03-27
 
 ## Fixed

data/activegraph.gemspec

@@ -33,7 +33,7 @@ DESCRIPTION
   s.add_dependency('activemodel')
   s.add_dependency('benchmark')
   s.add_dependency('i18n', '!= 1.8.8') # https://github.com/jruby/jruby/issues/6547
-  s.add_dependency('neo4j-ruby-driver', '>= 6.0.3.alpha.0')
+  s.add_dependency('neo4j-ruby-driver', '~> 6.2.1.beta.4')
   s.add_dependency('orm_adapter', '>= 0.5.0')
   s.add_development_dependency('guard')
   s.add_development_dependency('guard-rspec')

data/lib/active_graph/core/result.rb

@@ -13,7 +13,7 @@ module ActiveGraph
 
       def each(&block)
         store if wrap? # TODO: why? This is preventing streaming
-        @records&.each(&block) || super
+        @wrapped_records&.each(&block) || super
       end
 
       ## To avoid to_a on Neo4j::Driver::Result as that one does not call the above block
@@ -22,13 +22,13 @@ module ActiveGraph
       end
 
       def store
-        return if @records
+        return if @wrapped_records
         keys
-        @records = []
+        @wrapped_records = []
         # TODO: implement 'each' without block parameter
         method(:each).super_method.call do |record|
           record.wrap = wrap?
-          @records << record
+          @wrapped_records << record
         end
       end
     end

data/lib/active_graph/core/schema.rb

@@ -59,8 +59,12 @@ module ActiveGraph
         @major ||= version.segments.first
       end
 
+      # Neo4j 2026.07+ renamed the uniqueness constraint types
+      # (UNIQUENESS -> NODE_PROPERTY_UNIQUENESS, RELATIONSHIP_UNIQUENESS ->
+      # RELATIONSHIP_PROPERTY_UNIQUENESS); accept both the old and new names.
       def constraint_filter(record)
-        %w[UNIQUENESS RELATIONSHIP_UNIQUENESS RELATIONSHIP_PROPERTY_EXISTENCE NODE_PROPERTY_EXISTENCE NODE_KEY RELATIONSHIP_KEY].include?(record[:type])
+        %w[UNIQUENESS NODE_PROPERTY_UNIQUENESS RELATIONSHIP_UNIQUENESS RELATIONSHIP_PROPERTY_UNIQUENESS
+           RELATIONSHIP_PROPERTY_EXISTENCE NODE_PROPERTY_EXISTENCE NODE_KEY RELATIONSHIP_KEY].include?(record[:type])
       end
 
       def index_cypher(label, properties)

data/lib/active_graph/migrations/helpers/relationships.rb

@@ -20,7 +20,7 @@ module ActiveGraph
           count = count_relations(relation_query)
           output "Indexing #{count} #{old_name}s into #{new_name}..."
           while count > 0
-            relation_query.create("(a)-[r2:`#{new_name}`]->(b)").set('r2 = r').with(:r).limit(max_per_batch).delete(:r).exec
+            relation_query.create("(a)-[r2:`#{new_name}`]->(b)").set('r2 = properties(r)').with(:r).limit(max_per_batch).delete(:r).exec
             count = count_relations(relation_query)
             output "... #{count} #{old_name}'s left to go.." if count > 0
           end

data/lib/active_graph/shared/property.rb

@@ -12,7 +12,7 @@ module ActiveGraph::Shared
     attr_reader :_persisted_obj
 
     # This list should not be statically created. All types which have converters should by type casted
-    NEO4J_DRIVER_DATA_TYPES = [Hash, ActiveSupport::Duration, Neo4j::Driver::Types::Point,
+    NEO4J_DRIVER_DATA_TYPES = [Hash, Neo4j::Driver::Types::Duration, Neo4j::Driver::Types::Point,
                                Neo4j::Driver::Types::OffsetTime, Neo4j::Driver::Types::LocalTime, Neo4j::Driver::Types::LocalDateTime]
 
     # TODO: Set @attribute correctly using class ActiveModel::Attribute, and after that

data/lib/active_graph/shared/type_converters.rb

@@ -185,6 +185,48 @@ module ActiveGraph::Shared
       end
     end
 
+    # Converts ActiveSupport::Duration to/from the driver-native
+    # Neo4j::Driver::Types::Duration. Kept for backwards compatibility: since
+    # driver 6.2.1 a Neo4j duration is a Types::Duration, but models may still
+    # declare `type: ActiveSupport::Duration`. The mapping is field-to-field
+    # (parts <-> months/days/seconds/nanoseconds) and value-exact; the only soft
+    # spot is a fractional calendar month, which has no exact finer form and
+    # degrades to seconds via ActiveSupport's own rate.
+    class DurationConverter < BaseConverter
+      class << self
+        def convert_type
+          ActiveSupport::Duration
+        end
+
+        def db_type
+          Neo4j::Driver::Types::Duration
+        end
+
+        def to_db(value)
+          parts = Hash.new(0).merge(value.parts)
+          months_f = parts[:years] * 12 + parts[:months]
+          days_f = parts[:weeks] * 7 + parts[:days]
+          months = months_f.to_i
+          days = days_f.to_i
+          # whole calendar units stay put; fractional months/days cascade into
+          # seconds rather than truncating (which would lose magnitude)
+          seconds = parts[:hours] * 3600 + parts[:minutes] * 60 + parts[:seconds] +
+                    (months_f - months) * ActiveSupport::Duration::SECONDS_PER_MONTH +
+                    (days_f - days) * ActiveSupport::Duration::SECONDS_PER_DAY
+          Neo4j::Driver::Types::Duration.new(months, days, seconds.floor, ((seconds % 1) * 1_000_000_000).round)
+        end
+
+        def to_ruby(value)
+          return value if value.is_a?(ActiveSupport::Duration)
+          # map each Neo4j field back to its ActiveSupport unit, field-to-field,
+          # so the calendar structure survives the round trip
+          ActiveSupport::Duration.months(value.months) +
+            ActiveSupport::Duration.days(value.days) +
+            ActiveSupport::Duration.seconds(value.seconds + Rational(value.nanoseconds, 1_000_000_000))
+        end
+      end
+    end
+
     class BooleanConverter < BaseConverter
       FALSE_VALUES = %w(n N no No NO false False FALSE off Off OFF f F).to_set
 

data/lib/active_graph/transaction.rb

@@ -1,7 +1,11 @@
 module ActiveGraph
   module Transaction
     def rollback
-      fail ActiveGraph::Rollback
+      @active_graph_rolled_back = true
+    end
+
+    def check_rollback
+      fail ActiveGraph::Rollback if @active_graph_rolled_back
     end
 
     def after_commit(&block)

data/lib/active_graph/transactions.rb

@@ -42,24 +42,27 @@ module ActiveGraph
         end
       end
 
-      def run_transaction_work(session, method, **config, &block)
-        implicit = config.delete(:implicit)
+      def run_transaction_work(session, method, implicit: false, **config, &block)
+        result = nil
         session.send(method, **config) do |tx|
           self.tx = tx
-          block.call(tx).tap do |result|
-            if implicit &&
-              [Core::Result, ActiveGraph::Node::Query::QueryProxy, ActiveGraph::Core::Query]
-                .any?(&result.method(:is_a?))
-              result.store
-            end
+          (result = block.call(tx)).tap do
+            store(it) if implicit
+            tx.check_rollback
           end
         end.tap { tx.apply_callbacks }
       rescue ActiveGraph::Rollback
         # rollbacks are silently swallowed
-        false # to satisfy save and update conventions
+        result
       ensure
         self.tx = nil
       end
+
+      def store(result)
+        if [Core::Result, ActiveGraph::Node::Query::QueryProxy, ActiveGraph::Core::Query].any?(&result.method(:is_a?))
+          result.store
+        end
+      end
     end
   end
 end

data/lib/active_graph/version.rb

@@ -1,3 +1,3 @@
 module ActiveGraph
-  VERSION = '12.0.0.beta.6'
+  VERSION = '12.0.0'
 end

data/lib/active_graph.rb

@@ -10,6 +10,8 @@ require 'active_support/core_ext/class/attribute'
 require 'active_support/core_ext/class/subclasses'
 require 'active_support/core_ext/module/attribute_accessors'
 require 'active_support/core_ext/module/attribute_accessors_per_thread'
+require 'active_support/core_ext/numeric/time'
+require 'active_support/core_ext/integer/time'
 require 'active_support/core_ext/string/conversions'
 require 'active_support/inflector'
 require 'active_support/inflector/inflections'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activegraph
 version: !ruby/object:Gem::Version
-  version: 12.0.0.beta.6
+  version: 12.0.0
 platform: ruby
 authors:
 - Andreas Ronge, Brian Underwood, Chris Grigg, Heinrich Klobuczek
@@ -55,16 +55,16 @@ dependencies:
   name: neo4j-ruby-driver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.3.alpha.0
+        version: 6.2.1.beta.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.3.alpha.0
+        version: 6.2.1.beta.4
 - !ruby/object:Gem::Dependency
   name: orm_adapter
   requirement: !ruby/object:Gem::Requirement
@@ -431,7 +431,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.16
 specification_version: 4
 summary: A graph database for Ruby
 test_files: []