activegraph 12.0.0.beta.7 → 12.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 855f60d7bca8cec018819f65c0765be6002683af5617b3ec2e81b8c0cc5559e0
-  data.tar.gz: 06261c803fc0c5ed98d7b32b4bb621f7d2a239b8519c7f23e9c2c84458018271
+  metadata.gz: f4b65d35d5aad8b65eb4893dce27de5f5c51768d22a4d888f2c6b6b422e7675f
+  data.tar.gz: 368d9faf2918e4603aeffdbe8095b1a2c83d284b40d80f3c550a6eee6307ad81
 SHA512:
-  metadata.gz: d815973f66662ea91c56b12c0bde8cc5ae17ce5df727c19f735397cce96e4b4549dcda7a1c84fd26dfe645b4ac0602a303a1cd4e2e2aecb33801d7d8d462e4fb
-  data.tar.gz: 9e3bf57529430fad4cfb4332bc48f497bf19f17ade7dae94f1047e9a26d953a74b04f157223b1a382a0f07b7422b4f018e47a1bdd60d6dc964f607060e2636d3
+  metadata.gz: a6f8734697c2c335748a515f2cd124fed3083ed7a03e322909df97e58d8b83e922bd34f579f1ac906d6cb674e16e77250cbfe442d9d7bd2d0ae89211f58cefa9
+  data.tar.gz: 382bc1bc3724db5a4892fa184a0d108ebbc36ff029651ed4a03f3e1b1f4a9793bcafa52610d8695ac2932570067b86b2cea70b3b8ebbfd5ac5304b4926d73245

data/CHANGELOG.md

@@ -3,6 +3,24 @@ 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.1] (2026-10-29)
+
+### Fixed
+- Updated dependency 'neo4j-ruby-driver' to stable release version 6.2.1
+- Make JSON properties work with json >= 3.0 ([#1748](https://github.com/neo4jrb/activegraph/pull/1748))
+- Update 'neo4j-ruby-driver' version to 6.3.0 ([#1747](https://github.com/neo4jrb/activegraph/pull/1747))
+
+## [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
@@ -243,12 +261,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/Gemfile

@@ -3,7 +3,13 @@ source 'http://rubygems.org'
 gemspec
 
 active_model_version = ENV['ACTIVE_MODEL_VERSION']
-gem 'activemodel', "~> #{active_model_version}" if active_model_version&.length&.positive?
+if active_model_version&.length&.positive?
+  gem 'activemodel', "~> #{active_model_version}"
+  # ActiveSupport < 8.1 passes the long-removed `quirks_mode` option to JSON.generate, which json >= 3
+  # rejects (fixed upstream in Rails 8.1 and on 8-0-stable, unreleased as of 8.0.5.1). Apps on those
+  # Rails versions must hold json below 3 themselves; mirror that for the matching CI rows.
+  gem 'json', '< 3' if Gem::Version.new(active_model_version) < Gem::Version.new('8.1')
+end
 
 group 'test' do
   # gem 'coveralls', require: false

data/README.md

@@ -76,6 +76,15 @@ Neo4j.rb v4.1.0 was released in January of 2015. Its changes are outlined [here]
 | Causal Cluster             |   No   |  No  | No      | No     | Yes                 |
 | Embedded JVM support       |   Yes  |  Yes | Yes     | Yes    | via bolt only       |
 
+## Rails version support
+
+activegraph 12 is tested against ActiveModel 7.1, 7.2, 8.0 and 8.1.
+
+Note that ActiveSupport < 8.1 is incompatible with the `json` gem >= 3.0 (its JSON encoder passes an option
+that json 3 rejects, see [rails/rails#54224](https://github.com/rails/rails/pull/54224)). This affects every
+`to_json` call in such an application, not only activegraph's JSON-typed properties, so on Rails < 8.1 pin
+`gem 'json', '< 3'` in your Gemfile until you upgrade to a Rails release that includes the fix.
+
 ## Documentation
 
 * [Website](http://neo4jrb.io/) (for an introduction)

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.3.0')
   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
 
@@ -256,11 +298,13 @@ module ActiveGraph::Shared
         end
 
         def to_db(value)
-          value.to_json
+          ActiveSupport::JSON.encode(value)
         end
 
         def to_ruby(value)
-          JSON.parse(value, quirks_mode: true)
+          # `quirks_mode` was removed from the json gem in 2.0 (scalar top-level values are accepted
+          # by default since) and json >= 3.0 raises on unknown options.
+          JSON.parse(value)
         end
       end
     end

data/lib/active_graph/transaction.rb

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

data/lib/active_graph/version.rb

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

data/lib/active_graph.rb

@@ -10,9 +10,12 @@ 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'
+require 'active_support/json'
 require 'active_support/notifications'
 require 'json'
 require 'neo4j/driver'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activegraph
 version: !ruby/object:Gem::Version
-  version: 12.0.0.beta.7
+  version: 12.0.1
 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.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.3.alpha.0
+        version: 6.3.0
 - !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.20
 specification_version: 4
 summary: A graph database for Ruby
 test_files: []