activegraph 12.0.0.beta.6 → 12.0.0.beta.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f10f61337255f2e1e68ba9e4a7d06c5cad602ee9d94fd3258d6c4437f40f64d
-  data.tar.gz: e7525d5641cb10951fb92e973259a6ec88ca83d529070065b8cd75491791cf02
+  metadata.gz: 855f60d7bca8cec018819f65c0765be6002683af5617b3ec2e81b8c0cc5559e0
+  data.tar.gz: 06261c803fc0c5ed98d7b32b4bb621f7d2a239b8519c7f23e9c2c84458018271
 SHA512:
-  metadata.gz: 7f56d37e271db3e850cf861384afa46e7cf2427656ef9392982bdb6f46834499db15eeb943e3d6f6149af23d902d719bfd7ea07b601dab9032f022768e1f67a2
-  data.tar.gz: 2c452170b87d7fbe6e83ce87965bd2c30ef671edcd6083b819f1160f2175a9aee0d82d3187eed86e0e6ac8174f5883a5541be4a4d8b72b6154e69ace9714e348
+  metadata.gz: d815973f66662ea91c56b12c0bde8cc5ae17ce5df727c19f735397cce96e4b4549dcda7a1c84fd26dfe645b4ac0602a303a1cd4e2e2aecb33801d7d8d462e4fb
+  data.tar.gz: 9e3bf57529430fad4cfb4332bc48f497bf19f17ade7dae94f1047e9a26d953a74b04f157223b1a382a0f07b7422b4f018e47a1bdd60d6dc964f607060e2636d3

data/CHANGELOG.md

@@ -3,6 +3,11 @@ 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

data/lib/active_graph/transaction.rb

@@ -1,7 +1,11 @@
 module ActiveGraph
   module Transaction
     def rollback
-      fail ActiveGraph::Rollback
+      @rolled_back = true
+    end
+
+    def check_rollback
+      fail ActiveGraph::Rollback if @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.beta.7'
 end

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.beta.7
 platform: ruby
 authors:
 - Andreas Ronge, Brian Underwood, Chris Grigg, Heinrich Klobuczek