activegraph 10.1.0 → 11.1.0.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d9a017158867d022f2faae20f99fcbdc4196c046062e08d11bc1c77a41c48e8
-  data.tar.gz: 42ec5aafff7b8e5e372aefdbcf414ae9eeb1640d104ebee16a1f051cb37ac94f
+  metadata.gz: 62237e7dafd589f3a2abe8180ada5c30b7bc12dffa5e165c428dfb4c4a25af7b
+  data.tar.gz: 002ef52d6ad7e0f6735db23c37b033dc24df6af2e0ddd116d593ed88f21f00a1
 SHA512:
-  metadata.gz: 6274d56abf4d330f8e29d5ebba5f788d44355eb079df9730a380ad0433899bccfbd250d89cd0d88cfe67e7e52bf8ff8e981cc34bbc668faf639d66affe724233
-  data.tar.gz: 0b7418a39e465ff94705b3cccc72ff41bc66a1dfe25791dbbcca07e331e6694348fefdb9bfb82139d3d90d582b90e6b48ea8defa491dd6b25dc18f233015d4ec
+  metadata.gz: 4657e85cf211773ba1749e475b1110476fab90a312bb5233f78ca459653ef477090d7c38753390948afb539e21bd831a9960c1395dbbee5f15d0fcb3b40f3f91
+  data.tar.gz: 8023fed0a8ae2ab3b84aa6c76ba0aecbe3ed9d93bbf2d70b094c91afdb1e9a459927dd5f473a046fd7b3ccb45a85b833bb775b9ed4c9374fd9cee06ba182735e

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/).
 
+## [11.0.2] 2021-11-05
+
+## Fixed
+
+- Fixed issue where some has_one relationships where incorrectly deleted disregarding direction
+
+## [11.0.1] 2021-07-14
+
+- It changes the relationship length assignment in query proxy eagerloading module to be consistent with query proxy relationship length syntax.
+
+## [11.0.0] 2021-06-25
+
+## Added
+
+- support for neo4j 4.1, 4.2, 4.3
+
 ## [10.1.0] 2021-02-05
 
 ## Added

data/Gemfile

@@ -2,7 +2,7 @@ source 'http://rubygems.org'
 
 gemspec
 
-#gem "neo4j-#{ENV['driver'] == 'java' ? 'java' : 'ruby'}-driver", path: '../neo4j-ruby-driver'
+# gem 'neo4j-ruby-driver', path: '../neo4j-ruby-driver'
 
 gem 'listen', '< 3.1'
 

data/README.md

@@ -45,31 +45,35 @@ Neo4j.rb v4.1.0 was released in January of 2015. Its changes are outlined [here]
 
 ## Neo4j version support
 
-| **Neo4j Version** | v2.x | v3.x  | >= v4.x | >= 7.0.3 | activegraph 10.0 |
-|-------------------|------|-------|---------|----------|------------------|
-| 1.9.x             | Yes  | No    | No      | No       | No               |
-| 2.0.x             | No   | Yes   | No      | No       | No               |
-| 2.1.x             | No   | Yes   | Yes *   | Yes      | No               |
-| 2.2.x             | No   | No    | Yes     | Yes      | No               |
-| 2.3.x             | No   | No    | Yes     | Yes      | No               |
-| 3.0, 3.1, 3.3     | No   | No    | No      | Yes      | No               |
-| 3.4, 3.5          | No   | No    | No      | Yes      | Yes              |
-| 4.0               | No   | No    | No      | No       | Yes              |
-| 4.1               | No   | No    | No      | No       | No               |
+| **Neo4j Version** | v2.x | v3.x  | >= v4.x | >= 7.0.3 | activegraph 10   | activegraph 11 (jRuby only) |
+|-------------------|------|-------|---------|----------|------------------|-----------------------------|
+| 1.9.x             | Yes  | No    | No      | No       | No               | No
+| 2.0.x             | No   | Yes   | No      | No       | No               | No
+| 2.1.x             | No   | Yes   | Yes *   | Yes      | No               | No
+| 2.2.x             | No   | No    | Yes     | Yes      | No               | No
+| 2.3.x             | No   | No    | Yes     | Yes      | No               | No
+| 3.0, 3.1, 3.3     | No   | No    | No      | Yes      | No               | No
+| 3.4               | No   | No    | No      | Yes      | Yes              | No
+| 3.5               | No   | No    | No      | Yes      | Yes              | Yes
+| 4.0               | No   | No    | No      | No       | Yes              | Yes
+| 4.1               | No   | No    | No      | No       | No               | Yes
+| 4.2               | No   | No    | No      | No       | No               | Yes
+| 4.3               | No   | No    | No      | No       | No               | Yes
+| 4.4               | No   | No    | No      | No       | No               | Yes
 
 `*` Neo4j.rb >= 4.x doesn't support Neo4j versions before 2.1.5.  To use 2.1.x you should upgrade to a version >= 2.1.5
 
 ## Neo4j feature support
 
-| **Neo4j Feature**          |   v2.x | v3.x | >= v4.x | >= 8.x | activegraph 10.0 |
-|----------------------------|--------|------|---------|--------|------------------|
-| Bolt Protocol              |   No   |  No  | No      | Yes    | Yes              | 
-| Auth                       |   No   |  No  | Yes     | Yes    | Yes              |
-| Remote Cypher              |   Yes  |  Yes | Yes     | Yes    | No               |
-| Transactions               |   Yes  |  Yes | Yes     | Yes    | Yes              |
-| High Availability          |   No   |  Yes | Yes     | Yes    | Yes              |
-| Causal Cluster             |   No   |  No  | No      | No     | Yes              |
-| Embedded JVM support       |   Yes  |  Yes | Yes     | Yes    | via bolt only    |
+| **Neo4j Feature**          |   v2.x | v3.x | >= v4.x | >= 8.x | >= activegraph 10.0 |
+|----------------------------|--------|------|---------|--------|---------------------|
+| Bolt Protocol              |   No   |  No  | No      | Yes    | Yes                 | 
+| Auth                       |   No   |  No  | Yes     | Yes    | Yes                 |
+| Remote Cypher              |   Yes  |  Yes | Yes     | Yes    | No                  |
+| Transactions               |   Yes  |  Yes | Yes     | Yes    | Yes                 |
+| High Availability          |   No   |  Yes | Yes     | Yes    | Yes                 |
+| Causal Cluster             |   No   |  No  | No      | No     | Yes                 |
+| Embedded JVM support       |   Yes  |  Yes | Yes     | Yes    | via bolt only       |
 
 ## Documentation
 

data/activegraph.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.name     = 'activegraph'
   s.version  = ActiveGraph::VERSION
 
-  s.required_ruby_version = '>= 2.5'
+  s.required_ruby_version = '>= 2.6'
 
   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'
@@ -33,13 +33,13 @@ DESCRIPTION
   s.add_dependency('activemodel', '>= 4.0')
   s.add_dependency('activesupport', '>= 4.0')
   s.add_dependency('i18n', '!= 1.8.8') # https://github.com/jruby/jruby/issues/6547
+  s.add_dependency('neo4j-ruby-driver', '>= 4.4.0.alpha.5')
   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("neo4j-#{ENV['driver'] == 'java' ? 'java' : 'ruby'}-driver", '~> 1.7.4')
   s.add_development_dependency('os')
   s.add_development_dependency('pry')
   s.add_development_dependency('railties', '>= 4.0')

data/lib/active_graph/base.rb

@@ -30,7 +30,7 @@ module ActiveGraph
       end
 
       def query(*args)
-        transaction do
+        transaction(implicit: true) do
           super(*args)
         end
       end

data/lib/active_graph/core/label.rb

@@ -114,8 +114,9 @@ module ActiveGraph
         end
 
         def drop_constraints
-          ActiveGraph::Base.transaction do |tx|
-            tx.run('CALL db.constraints').each do |record|
+          result = ActiveGraph::Base.read_transaction { |tx| tx.run('CALL db.constraints').to_a }
+          ActiveGraph::Base.write_transaction do |tx|
+            result.each do |record|
               tx.run("DROP #{record.keys.include?(:name) ? "CONSTRAINT #{record[:name]}" : record[:description]}")
             end
           end

data/lib/active_graph/core/querable.rb

@@ -18,34 +18,20 @@ module ActiveGraph
                       args.pop if args[0].is_a?(::ActiveGraph::Core::Query)
                     end || {}
 
-          queries(options) { append(*args) }[0]
+          query_run(QueryBuilder.query(*args), options)
         end
 
-        def queries(options = {}, &block)
-          query_builder = QueryBuilder.new
-
-          query_builder.instance_eval(&block)
-
-          transaction do
-            query_set(query_builder.queries, options)
-          end
-        end
-
-        def setup_queries!(queries, options = {})
+        def setup_query!(query, options = {})
           return if options[:skip_instrumentation]
-          queries.each do |query|
-            ActiveSupport::Notifications.instrument('neo4j.core.cypher_query', query: query)
-          end
+          ActiveSupport::Notifications.instrument('neo4j.core.cypher_query', query: query)
         end
 
-        def query_set(queries, options = {})
-          setup_queries!(queries, skip_instrumentation: options[:skip_instrumentation])
+        def query_run(query, options = {})
+          setup_query!(query, skip_instrumentation: options[:skip_instrumentation])
 
           ActiveSupport::Notifications.instrument('neo4j.core.bolt.request') do
             transaction do |tx|
-              queries.map do |query|
-                tx.run(query.cypher, query.parameters).tap { |result| result.wrap = options[:wrap] != false }
-              end
+              tx.run(query.cypher, **query.parameters).tap { |result| result.wrap = options[:wrap] != false }
             end
           end
         end

data/lib/active_graph/core/query_builder.rb

@@ -1,29 +1,17 @@
 module ActiveGraph
   module Core
     class QueryBuilder
-      attr_reader :queries
-
       Query = Struct.new(:cypher, :parameters, :pretty_cypher, :context)
 
-      def initialize
-        @queries = []
-      end
-
-      def append(*args)
-        query = case args.map(&:class)
-                when [String], [String, Hash]
-                  Query.new(args[0], args[1] || {})
-                when [::ActiveGraph::Core::Query]
-                  args[0]
-                else
-                  fail ArgumentError, "Could not determine query from arguments: #{args.inspect}"
-                end
-
-        @queries << query
-      end
-
-      def query
-        ActiveGraph::Core::Query.new
+      def self.query(*args)
+        case args.map(&:class)
+        when [String], [String, Hash]
+          Query.new(args[0], args[1] || {})
+        when [::ActiveGraph::Core::Query]
+          args[0]
+        else
+          fail ArgumentError, "Could not determine query from arguments: #{args.inspect}"
+        end
       end
     end
   end

data/lib/active_graph/core/result.rb

@@ -3,26 +3,27 @@ module ActiveGraph
     module Result
       attr_writer :wrap
 
+      def keys
+        @keys ||= super
+      end
+
       def wrap?
         @wrap
       end
 
       def each(&block)
-        wrap? ? wrapping_each(&block) : super
+        store if wrap? # TODO: why? This is preventing streaming
+        @records&.each(&block) || super
       end
 
-      private
-
-      def wrapping_each(&block)
-        if @records
-          @records.each(&block)
-        else
-          @records = []
-          method(:each).super_method.call do |record|
-            record.wrap = wrap?
-            @records << record
-            block_given? ? yield(record) : record
-          end
+      def store
+        return if @records
+        keys
+        @records = []
+        # TODO: implement 'each' without block parameter
+        method(:each).super_method.call do |record|
+          record.wrap = wrap?
+          @records << record
         end
       end
     end

data/lib/active_graph/core/schema.rb

@@ -2,25 +2,33 @@ module ActiveGraph
   module Core
     module Schema
       def version
-        result = query('CALL dbms.components()', {}, skip_instrumentation: true)
-
-        # BTW: community / enterprise could be retrieved via `result.first.edition`
-        result.first[:versions][0]
+        read_transaction do
+          # BTW: community / enterprise could be retrieved via `result.first.edition`
+          query('CALL dbms.components()', {}, skip_instrumentation: true).first[:versions][0]
+        end
       end
 
       def indexes
-        result = query('CALL db.indexes()', {}, skip_instrumentation: true)
-
-        result.map do |row|
-          { type: row[:type].to_sym, label: label(result, row), properties: properties(row), state: row[:state].to_sym }
+        raw_indexes do |keys, result|
+          result.map do |row|
+            { type: row[:type].to_sym, label: label(keys, row), properties: properties(row),
+              state: row[:state].to_sym }
+          end
         end
       end
 
       def constraints
-        result = query('CALL db.indexes()', {}, skip_instrumentation: true)
+        raw_indexes do |keys, result|
+          result.select(&method(v4?(keys) ? :v4_filter : :v3_filter)).map do |row|
+            { type: :uniqueness, label: label(keys, row), properties: properties(row) }
+          end
+        end
+      end
 
-        result.select(&method(v4?(result) ? :v4_filter : :v3_filter)).map do |row|
-          { type: :uniqueness, label: label(result, row), properties: properties(row) }
+      def raw_indexes
+        read_transaction do
+          result = query('CALL db.indexes()', {}, skip_instrumentation: true)
+          yield result.keys, result.reject { |row| row[:type] == 'LOOKUP' }
         end
       end
 
@@ -34,22 +42,22 @@ module ActiveGraph
         row[:type] == 'node_unique_property'
       end
 
-      def label(result, row)
-        if v34?(result)
+      def label(keys, row)
+        if v34?(keys)
           row[:label]
         else
-          (v4?(result) ? row[:labelsOrTypes] : row[:tokenNames]).first
+          (v4?(keys) ? row[:labelsOrTypes] : row[:tokenNames]).first
         end.to_sym
       end
 
-      def v4?(result)
+      def v4?(keys)
         return @v4 unless @v4.nil?
-        @v4 = result.keys.include?(:labelsOrTypes)
+        @v4 = keys.include?(:labelsOrTypes)
       end
 
-      def v34?(result)
+      def v34?(keys)
         return @v34 unless @v34.nil?
-        @v34 = result.keys.include?(:label)
+        @v34 = keys.include?(:label)
       end
 
       def properties(row)

data/lib/active_graph/core.rb

@@ -10,5 +10,5 @@ require 'neo4j_ruby_driver'
 Neo4j::Driver::Types::Entity.include ActiveGraph::Core::Wrappable
 Neo4j::Driver::Types::Entity.prepend ActiveGraph::Core::Entity
 Neo4j::Driver::Types::Node.prepend ActiveGraph::Core::Node
-Neo4j::Driver::StatementResult.prepend ActiveGraph::Core::Result
+Neo4j::Driver::Result.prepend ActiveGraph::Core::Result
 Neo4j::Driver::Record.prepend ActiveGraph::Core::Record

data/lib/active_graph/errors.rb

@@ -54,4 +54,6 @@ module ActiveGraph
       defined?(Rails)
     end
   end
+
+  class Rollback < Error; end
 end

data/lib/active_graph/migrations/base.rb

@@ -57,9 +57,12 @@ module ActiveGraph
       end
 
       def handle_migration_error!(e)
-        fail e unless e.message =~ /Cannot perform data updates in a transaction that has performed schema updates./
-        fail MigrationError,
-             "#{e.message}. Please add `disable_transactions!` in your migration file."
+        if e.is_a?(Neo4j::Driver::Exceptions::ClientException) &&
+          e.code == 'Neo.ClientError.Transaction.ForbiddenDueToTransactionType'
+          fail MigrationError, "#{e.message}. Please add `disable_transactions!` in your migration file."
+        else
+          fail e
+        end
       end
 
       def migration_transaction(&block)

data/lib/active_graph/migrations/schema.rb

@@ -3,16 +3,17 @@ module ActiveGraph
     module Schema
       class << self
         def fetch_schema_data
-          {constraints: fetch_constraint_descriptions.sort,
-           indexes: fetch_index_descriptions.sort}
+          { constraints: fetch_constraint_descriptions.sort, indexes: fetch_index_descriptions.sort }
         end
 
         def synchronize_schema_data(schema_data, remove_missing)
           queries = []
-          queries += drop_and_create_queries(fetch_constraint_descriptions, schema_data[:constraints], remove_missing)
-          queries += drop_and_create_queries(fetch_index_descriptions, schema_data[:indexes], remove_missing)
-          ActiveGraph::Base.queries do
-            queries.each { |query| append query }
+          ActiveGraph::Base.read_transaction do
+            queries += drop_and_create_queries(fetch_constraint_descriptions, schema_data[:constraints], remove_missing)
+            queries += drop_and_create_queries(fetch_index_descriptions, schema_data[:indexes], remove_missing)
+          end
+          ActiveGraph::Base.write_transaction do
+            queries.each(&ActiveGraph::Base.method(:query))
           end
         end
 
@@ -23,11 +24,12 @@ module ActiveGraph
         end
 
         def fetch_index_descriptions
-          result = ActiveGraph::Base.query('CALL db.indexes()')
-          if result.keys.include?(:description)
-            v3_indexes(result)
-          else
-            v4_indexes(result)
+          ActiveGraph::Base.raw_indexes do |keys, result|
+            if keys.include?(:description)
+              v3_indexes(result)
+            else
+              v4_indexes(result)
+            end
           end
         end
 

data/lib/active_graph/node/has_n.rb

@@ -253,8 +253,10 @@ module ActiveGraph::Node
 
     def relationship_corresponding_rel(relationship, direction, target_class)
       self.class.associations.find do |_key, assoc|
-        assoc.relationship_class_name == relationship.class.name ||
-          (assoc.relationship_type == relationship.type.to_sym && assoc.target_class == target_class && assoc.direction == direction)
+        assoc.direction == direction && (
+          assoc.relationship_class_name == relationship.class.name ||
+          (assoc.relationship_type == relationship.type.to_sym && assoc.target_class == target_class)
+        )
       end
     end
 

data/lib/active_graph/node/query/query_proxy_eager_loading/association_tree.rb

@@ -58,6 +58,7 @@ module ActiveGraph
           def process_string(str)
             head, rest = str.split('.', 2)
             k, length = head.split('*', -2)
+            length = {max: length} if length
             add_nested(k.to_sym, rest, length)
           end
 

data/lib/active_graph/node/query/query_proxy_eager_loading.rb

@@ -68,7 +68,7 @@ module ActiveGraph
 
         def init_associations(node, element)
           element.each_key { |key| node.association_proxy(key).init_cache }
-          node.association_proxy(element.name).init_cache if element.rel_length == ''
+          node.association_proxy(element.name).init_cache if element.rel_length && element.rel_length[:max] == ''
         end
 
         def cache_and_init(node, element)
@@ -157,14 +157,8 @@ module ActiveGraph
         end
 
         def relationship_part(association, path_name, rel_length)
-          if rel_length
-            rel_name = nil
-            length = {max: rel_length}
-          else
-            rel_name = escape("#{path_name}_rel")
-            length = nil
-          end
-          "#{association.arrow_cypher(rel_name, {}, false, false, length)}(#{escape(path_name)})"
+          rel_name = escape("#{path_name}_rel") unless rel_length
+          "#{association.arrow_cypher(rel_name, {}, false, false, rel_length)}(#{escape(path_name)})"
         end
 
         def chain

data/lib/active_graph/secure_random_ext.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module ActiveGraph
+  module SecureRandomExt
+    def hex(n = nil)
+      super.force_encoding(Encoding::UTF_8)
+    end
+
+    def uuid
+      super.force_encoding(Encoding::UTF_8)
+    end
+  end
+end

data/lib/active_graph/shared/persistence.rb

@@ -90,7 +90,7 @@ module ActiveGraph::Shared
       apply_default_values
       result = _persisted_obj ? update_model : create_model
 
-      ActiveGraph::Base.transaction(&:failure) if result == false
+      ActiveGraph::Base.transaction(&:rollback) if result == false
 
       result != false
     ensure
@@ -179,7 +179,7 @@ module ActiveGraph::Shared
       ActiveGraph::Base.transaction do |tx|
         self.attributes = process_attributes(attributes)
         saved = save
-        tx.failure unless saved
+        tx.rollback unless saved
         saved
       end
     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, Neo4j::Driver::Types::Bytes, ActiveSupport::Duration, Neo4j::Driver::Types::Point,
+    NEO4J_DRIVER_DATA_TYPES = [Hash, ActiveSupport::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/tasks/migration.rake

@@ -62,50 +62,36 @@ namespace :neo4j do
 
 COMMENT
 
-    def check_neo4j_version_3
-      if ActiveGraph::Base.version > '3.0.0'
-        yield
-      else
-        puts 'WARNING: This task does not work for versions of Neo4j before 3.0.0'
-      end
-    end
-
     desc 'Creates a db/neo4j/schema.yml file which represents the indexes / constraints in the Neo4j DB'
     task dump: :environment do
-      check_neo4j_version_3 do
-        require 'active_graph/migrations/schema'
+      require 'active_graph/migrations/schema'
 
-        schema_data = ActiveGraph::Migrations::Schema.fetch_schema_data
+      schema_data = ActiveGraph::Migrations::Schema.fetch_schema_data
 
-        runner = ActiveGraph::Migrations::Runner.new
-        schema_data[:versions] = runner.complete_migration_versions.sort
+      runner = ActiveGraph::Migrations::Runner.new
+      schema_data[:versions] = runner.complete_migration_versions.sort
 
-        FileUtils.mkdir_p(File.dirname(SCHEMA_YAML_PATH))
-        File.open(SCHEMA_YAML_PATH, 'w') { |file| file << SCHEMA_YAML_COMMENT + schema_data.to_yaml }
+      FileUtils.mkdir_p(File.dirname(SCHEMA_YAML_PATH))
+      File.open(SCHEMA_YAML_PATH, 'w') { |file| file << SCHEMA_YAML_COMMENT + schema_data.to_yaml }
 
-        puts "Dumped updated schema file to #{SCHEMA_YAML_PATH}"
-      end
+      puts "Dumped updated schema file to #{SCHEMA_YAML_PATH}"
     end
 
     desc "Loads a db/neo4j/schema.yml file into the database\nOptionally removes schema elements which aren't in the schema.yml file (defaults to false)"
     task :load, [:remove_missing] => :environment do |_t, args|
-      check_neo4j_version_3 do
-        require 'active_graph/migrations/schema'
+      require 'active_graph/migrations/schema'
 
-        args.with_defaults(remove_missing: false)
+      args.with_defaults(remove_missing: false)
 
-        schema_data = YAML.safe_load(File.read(SCHEMA_YAML_PATH), [Symbol])
+      schema_data = YAML.safe_load(File.read(SCHEMA_YAML_PATH), [Symbol])
 
-        ActiveGraph::Base.subscribe_to_query(&method(:puts))
+      ActiveGraph::Base.subscribe_to_query(&method(:puts))
 
-        ActiveGraph::Base.transaction do
-          ActiveGraph::Migrations::Schema.synchronize_schema_data(schema_data, args[:remove_missing])
-        end
+      ActiveGraph::Migrations::Schema.synchronize_schema_data(schema_data, args[:remove_missing])
 
-        ActiveGraph::Base.transaction do
-          runner = ActiveGraph::Migrations::Runner.new
-          runner.mark_versions_as_complete(schema_data[:versions]) # Run in test mode?
-        end
+      ActiveGraph::Base.transaction do
+        runner = ActiveGraph::Migrations::Runner.new
+        runner.mark_versions_as_complete(schema_data[:versions]) # Run in test mode?
       end
     end
   end
@@ -194,7 +180,7 @@ class #{migration_class_name} < ActiveGraph::Migrations::Base
     drop_#{index_or_constraint} #{label.to_sym.inspect}, #{property_name.to_sym.inspect}
   end
 end
-CONTENT
+    CONTENT
 
     File.open(path, 'w') { |f| f << content }
 

data/lib/active_graph/transaction.rb

@@ -1,13 +1,8 @@
 module ActiveGraph
   module Transaction
-    def failure
-      super
-      @failure = true
-    end
-
-    def close
-      success
+    def rollback
       super
+      @rolled_back = true
     end
 
     def after_commit(&block)
@@ -15,7 +10,7 @@ module ActiveGraph
     end
 
     def apply_callbacks
-      after_commit_registry.each(&:call) unless @failure
+      after_commit_registry.each(&:call) unless @rolled_back
     end
 
     private

data/lib/active_graph/transactions.rb

@@ -5,22 +5,19 @@ module ActiveGraph
     extend ActiveSupport::Concern
 
     included do
-      thread_mattr_accessor :explicit_session, :tx
+      thread_mattr_accessor :explicit_session, :tx, :last_bookmark
     end
 
     class_methods do
-      def session(*args)
-        ActiveGraph::Base.driver.session(*args) do |session|
+      def session(**session_config)
+        ActiveGraph::Base.driver.session(**session_config) do |session|
           self.explicit_session = session
           yield session
-          session.last_bookmark
+        ensure
+          self.last_bookmark = session.last_bookmark
         end
       end
 
-      def transaction(**config, &block)
-        send_transaction(:begin_transaction, **config, &block)
-      end
-
       def write_transaction(**config, &block)
         send_transaction(:write_transaction, **config, &block)
       end
@@ -29,10 +26,12 @@ module ActiveGraph
         send_transaction(:read_transaction, **config, &block)
       end
 
+      alias transaction write_transaction
+
       private
 
       def send_transaction(method, **config, &block)
-        return checked_yield(tx, &block) if tx&.open?
+        return yield tx if tx&.open?
         return run_transaction_work(explicit_session, method, **config, &block) if explicit_session&.open?
         driver.session do |session|
           run_transaction_work(session, method, **config, &block)
@@ -40,17 +39,19 @@ module ActiveGraph
       end
 
       def run_transaction_work(session, method, **config, &block)
+        implicit = config.delete(:implicit)
         session.send(method, **config) do |tx|
           self.tx = tx
-          checked_yield(tx, &block)
+          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
+          end
         end.tap { tx.apply_callbacks }
-      end
-
-      def checked_yield(tx)
-        yield tx
-      rescue StandardError => e
-        tx.failure
-        raise e
+      rescue ActiveGraph::Rollback
+        # rollbacks are silently swallowed
       end
     end
   end

data/lib/active_graph/version.rb

@@ -1,3 +1,3 @@
 module ActiveGraph
-  VERSION = '10.1.0'
+  VERSION = '11.1.0.alpha.1'
 end

data/lib/active_graph.rb

@@ -5,6 +5,7 @@ require 'active_graph/core'
 require 'active_graph/core/query_ext' # From this gem
 
 require 'active_support/core_ext/module/attribute_accessors_per_thread'
+require 'active_graph/secure_random_ext'
 require 'active_graph/transactions'
 require 'active_graph/base'
 require 'active_graph/model_schema'
@@ -121,3 +122,4 @@ if defined?(Rails)
 end
 
 Neo4j::Driver::Transaction.prepend ActiveGraph::Transaction
+SecureRandom.singleton_class.prepend ActiveGraph::SecureRandomExt

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activegraph
 version: !ruby/object:Gem::Version
-  version: 10.1.0
+  version: 11.1.0.alpha.1
 platform: ruby
 authors:
 - Andreas Ronge, Brian Underwood, Chris Grigg, Heinrich Klobuczek
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-06 00:00:00.000000000 Z
+date: 2022-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -52,6 +52,20 @@ dependencies:
     - - "!="
       - !ruby/object:Gem::Version
         version: 1.8.8
+- !ruby/object:Gem::Dependency
+  name: neo4j-ruby-driver
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.4.0.alpha.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.4.0.alpha.5
 - !ruby/object:Gem::Dependency
   name: orm_adapter
   requirement: !ruby/object:Gem::Requirement
@@ -136,20 +150,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.0
-- !ruby/object:Gem::Dependency
-  name: neo4j-ruby-driver
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.7.4
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.7.4
 - !ruby/object:Gem::Dependency
   name: os
   requirement: !ruby/object:Gem::Requirement
@@ -372,6 +372,7 @@ files:
 - lib/active_graph/relationship/types.rb
 - lib/active_graph/relationship/validations.rb
 - lib/active_graph/schema/operation.rb
+- lib/active_graph/secure_random_ext.rb
 - lib/active_graph/shared.rb
 - lib/active_graph/shared/attributes.rb
 - lib/active_graph/shared/callbacks.rb
@@ -436,14 +437,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: A graph database for Ruby