activegraph 12.0.0.beta.5 → 12.0.0.beta.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d874584342339574829e1049d3b50075283ce6811e09156408a8e6845a3646e
-  data.tar.gz: 56670037e70309d62db283a165691576af3137c3c1632fd9cdb96f4c9fb087c5
+  metadata.gz: 855f60d7bca8cec018819f65c0765be6002683af5617b3ec2e81b8c0cc5559e0
+  data.tar.gz: 06261c803fc0c5ed98d7b32b4bb621f7d2a239b8519c7f23e9c2c84458018271
 SHA512:
-  metadata.gz: 8b1e932ec561196a75ec02f84a9d715b4ff251b039a0761c97d4bbc21931bb5086c54b712d5cccdbf3efd9d1943a4287e84893eec5dea5aeb283e4d97572120b
-  data.tar.gz: fede28ced764c0e9cdac7479464a6ebba25bb26bdaac05c00cdd6150596fdbee228a4253685165981b339807ed12e103c7d1fa80a97eb169d56cc216cc55f75b
+  metadata.gz: d815973f66662ea91c56b12c0bde8cc5ae17ce5df727c19f735397cce96e4b4549dcda7a1c84fd26dfe645b4ac0602a303a1cd4e2e2aecb33801d7d8d462e4fb
+  data.tar.gz: 9e3bf57529430fad4cfb4332bc48f497bf19f17ade7dae94f1047e9a26d953a74b04f157223b1a382a0f07b7422b4f018e47a1bdd60d6dc964f607060e2636d3

data/CHANGELOG.md

@@ -3,6 +3,25 @@ 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.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
+
+- reworked rollback handling, using `ActiveGraph::Rollback` exception
+- bumped required ruby version to `>= 3.4`
+- bumped `neo4j-ruby-driver` dependency to `>= 6.0.3.alpha.0`
+- updated CI to test against ActiveRecord 7.1, 7.2, 8.0, 8.1
+- updated CI to use Java 21 for JRuby
+- internal: switched from `write_transaction`/`read_transaction` to `execute_write`/`execute_read` in line with new driver API
+- internal: replaced `last_bookmark` with `last_bookmarks`
+- internal: removed `sorted_set` and `neo4j-rake_tasks` dependencies
+- internal: added `benchmark` as a dependency
+
 ## [12.0.0.beta.1] 2024-01-01
 
 ## Added

data/activegraph.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.name     = 'activegraph'
   s.version  = ActiveGraph::VERSION
 
-  s.required_ruby_version = '>= 3.1'
+  s.required_ruby_version = '>= 3.4'
 
   s.authors  = 'Andreas Ronge, Brian Underwood, Chris Grigg, Heinrich Klobuczek'
   s.email    = 'andreas.ronge@gmail.com, public@brian-underwood.codes, chris@subvertallmedia.com, heinrich@mail.com'
@@ -31,15 +31,15 @@ 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', '>= 5.7.0.alpha.3')
+  s.add_dependency('neo4j-ruby-driver', '>= 6.0.3.alpha.0')
   s.add_dependency('orm_adapter', '>= 0.5.0')
-  s.add_dependency('sorted_set')
   s.add_development_dependency('guard')
   s.add_development_dependency('guard-rspec')
   s.add_development_dependency('guard-rubocop')
-  s.add_development_dependency('neo4j-rake_tasks', '>= 0.3.0')
   s.add_development_dependency('os')
+  s.add_development_dependency('ostruct')
   s.add_development_dependency('pry')
   s.add_development_dependency('railties', '>= 7')
   s.add_development_dependency('rake')

data/lib/active_graph/migrations/runner.rb

@@ -11,12 +11,14 @@ module ActiveGraph
       MIGRATION_RUNNING = {up: 'running', down: 'reverting'}.freeze
       MIGRATION_DONE = {up: 'migrated', down: 'reverted'}.freeze
 
+      attr_reader :up_versions
+
       def initialize(options = {})
         @silenced = options[:silenced] || !!ENV['MIGRATIONS_SILENCED']
         label = SchemaMigration.mapped_label
         label.create_constraint(:migration_id, type: :unique) unless label.constraint?(:migration_id)
-        @schema_migrations = SchemaMigration.all.to_a
-        @up_versions = SortedSet.new(@schema_migrations.map(&:migration_id))
+        @schema_migrations = SchemaMigration.order(:migration_id).to_a
+        @up_versions = @schema_migrations.map(&:migration_id)
       end
 
       def all
@@ -43,7 +45,7 @@ module ActiveGraph
 
       def rollback(steps)
         handle_incomplete_states!
-        @up_versions.to_a.reverse.first(steps).each do |version|
+        @up_versions.reverse.first(steps).each do |version|
           down(version)
         end
       end
@@ -52,10 +54,6 @@ module ActiveGraph
         all_migrations.select { |migration| !up?(migration) }
       end
 
-      def complete_migration_versions
-        @schema_migrations.map(&:migration_id)
-      end
-
       def mark_versions_as_complete(versions)
         ActiveGraph::Base.new_query
                          .with('$versions AS versions').params(versions: versions).break
@@ -158,7 +156,7 @@ MSG
       end
 
       def incomplete_states
-        @incomplete_states ||= SortedSet.new(@schema_migrations.select(&:incomplete?))
+        @incomplete_states ||= @schema_migrations.select(&:incomplete?)
       end
 
       delegate :migration_files, :migration_files_versions, to: :class

data/lib/active_graph/migrations/schema_migration.rb

@@ -5,10 +5,6 @@ module ActiveGraph
       id_property :migration_id
       property :migration_id, type: String
       property :incomplete, type: Boolean
-
-      def <=>(other)
-        migration_id <=> other.migration_id
-      end
     end
   end
 end

data/lib/active_graph/tasks/migration.rake

@@ -65,7 +65,7 @@ COMMENT
       schema_data = ActiveGraph::Migrations::Schema.fetch_schema_data
 
       runner = ActiveGraph::Migrations::Runner.new
-      schema_data[:versions] = runner.complete_migration_versions.sort
+      schema_data[:versions] = runner.up_versions
 
       FileUtils.mkdir_p(File.dirname(SCHEMA_YAML_PATH))
       File.open(SCHEMA_YAML_PATH, 'w') { |file| file << SCHEMA_YAML_COMMENT + schema_data.to_yaml }

data/lib/active_graph/transaction.rb

@@ -1,16 +1,19 @@
 module ActiveGraph
   module Transaction
     def rollback
-      super
       @rolled_back = true
     end
 
+    def check_rollback
+      fail ActiveGraph::Rollback if @rolled_back
+    end
+
     def after_commit(&block)
       after_commit_registry << block
     end
 
     def apply_callbacks
-      after_commit_registry.each(&:call) unless @rolled_back
+      after_commit_registry.each(&:call)
     end
 
     private

data/lib/active_graph/transactions.rb

@@ -5,7 +5,7 @@ module ActiveGraph
     extend ActiveSupport::Concern
 
     included do
-      thread_mattr_accessor :explicit_session, :tx, :last_bookmark
+      thread_mattr_accessor :explicit_session, :tx, :last_bookmarks
     end
 
     class_methods do
@@ -14,48 +14,54 @@ module ActiveGraph
           self.explicit_session = session
           yield session
         ensure
-          self.last_bookmark = session.last_bookmark
+          self.last_bookmarks = session.last_bookmarks
         end
       end
 
       def write_transaction(**config, &block)
-        send_transaction(:write_transaction, **config, &block)
+        send_transaction(:execute_write, **config, &block)
       end
 
       def read_transaction(**config, &block)
-        send_transaction(:read_transaction, **config, &block)
+        send_transaction(:execute_read, **config, &block)
       end
 
       alias transaction write_transaction
 
       def lock_node(node)
-        node.as(:n).query.remove('n._AGLOCK_').exec if tx&.open?
+        node.as(:n).query.remove('n._AGLOCK_').exec if tx
       end
 
       private
 
       def send_transaction(method, **config, &block)
-        return yield tx if tx&.open?
+        return yield tx if tx
         return run_transaction_work(explicit_session, method, **config, &block) if explicit_session&.open?
         driver.session do |session|
           run_transaction_work(session, method, **config, &block)
         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
+        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

data/lib/active_graph/version.rb

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

data/lib/active_graph.rb

@@ -19,7 +19,6 @@ require 'neo4j/driver'
 require 'orm_adapter'
 require 'rake'
 require 'set'
-require 'sorted_set'
 require 'yaml'
 
 loader = Zeitwerk::Loader.for_gem

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: activegraph
 version: !ruby/object:Gem::Version
-  version: 12.0.0.beta.5
+  version: 12.0.0.beta.7
 platform: ruby
 authors:
 - Andreas Ronge, Brian Underwood, Chris Grigg, Heinrich Klobuczek
 bindir: bin
 cert_chain: []
-date: 2025-01-13 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -24,61 +24,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: i18n
+  name: benchmark
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "!="
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.8
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "!="
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.8
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: neo4j-ruby-driver
+  name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "!="
       - !ruby/object:Gem::Version
-        version: 5.7.0.alpha.3
+        version: 1.8.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "!="
       - !ruby/object:Gem::Version
-        version: 5.7.0.alpha.3
+        version: 1.8.8
 - !ruby/object:Gem::Dependency
-  name: orm_adapter
+  name: neo4j-ruby-driver
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 6.0.3.alpha.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 6.0.3.alpha.0
 - !ruby/object:Gem::Dependency
-  name: sorted_set
+  name: orm_adapter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
@@ -122,21 +122,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: neo4j-rake_tasks
+  name: os
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: os
+  name: ostruct
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -424,14 +424,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.1'
+      version: '3.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 4.0.3
 specification_version: 4
 summary: A graph database for Ruby
 test_files: []