activegraph 12.0.0.beta.4 → 12.0.0.beta.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8689e1a33aefa219174b9d67337f197a55d84d2c07d8123453a851ac58579173
-  data.tar.gz: 10208863566850f436f008690933b6ef5a8cb3f08de0969c948f2ac58be67ae8
+  metadata.gz: 6f10f61337255f2e1e68ba9e4a7d06c5cad602ee9d94fd3258d6c4437f40f64d
+  data.tar.gz: e7525d5641cb10951fb92e973259a6ec88ca83d529070065b8cd75491791cf02
 SHA512:
-  metadata.gz: 5142dd49c7f73a0d761b775824a82fa98bd96bba2c8bdff42da70fefbc66ab06730344fb38133e34faf755401d61296fe03819caaae107c653ed82822217339d
-  data.tar.gz: ec2e34736d51b05688efdfeaea0dc48ca9f3c496195d61310f917ce59d01be9b2c3db4694865acc4d6fe144963f016f759f3d982878bdb723e4b451156d17c9e
+  metadata.gz: 7f56d37e271db3e850cf861384afa46e7cf2427656ef9392982bdb6f46834499db15eeb943e3d6f6149af23d902d719bfd7ea07b601dab9032f022768e1f67a2
+  data.tar.gz: 2c452170b87d7fbe6e83ce87965bd2c30ef671edcd6083b819f1160f2175a9aee0d82d3187eed86e0e6ac8174f5883a5541be4a4d8b72b6154e69ace9714e348

data/CHANGELOG.md

@@ -3,6 +3,20 @@ 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.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/Gemfile

@@ -6,10 +6,11 @@ active_model_version = ENV['ACTIVE_MODEL_VERSION']
 gem 'activemodel', "~> #{active_model_version}" if active_model_version&.length&.positive?
 
 group 'test' do
-  gem 'coveralls', require: false
+  # gem 'coveralls', require: false
   gem 'overcommit'
   gem 'codecov', require: false
   gem 'simplecov', require: false
+  gem 'simplecov-cobertura', require: false
   gem 'simplecov-html', require: false
   gem 'its'
   gem 'test-unit'

data/activegraph.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.name     = 'activegraph'
   s.version  = ActiveGraph::VERSION
 
-  s.required_ruby_version = '>= 2.6'
+  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'
@@ -30,16 +30,16 @@ DESCRIPTION
     'bug_tracker_uri' => 'https://github.com/neo4jrb/activegraph/issues'
   }
 
-  s.add_dependency('activemodel', '>= 7')
+  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')
+  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/migration.rb

@@ -38,8 +38,9 @@ module ActiveGraph
       end
 
       def migrate
-        ActiveSupport::Deprecation.warn '`AddIdProperty` task is deprecated and may be removed from future releases. '\
-                                        'Create a new migration and use the `populate_id_property` helper.', caller
+        ActiveGraph.deprecator.warn '`AddIdProperty` task is deprecated and may be removed from future releases. ' \
+                                      'Create a new migration and use the `populate_id_property` helper.',
+                                    caller_locations
         models = ActiveSupport::HashWithIndifferentAccess.new(YAML.load_file(models_filename))[:models]
         output 'This task will add an ID Property every node in the given file.'
         output 'It may take a significant amount of time, please be patient.'
@@ -108,7 +109,6 @@ MESSAGE
       #  print_output message
       # end
 
-
       # def id_batch_set(label, id_property, new_ids, count)
       #  tx = ActiveGraph::Base.new_transaction
 

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
@@ -96,7 +94,7 @@ module ActiveGraph
         return unless incomplete_states.any?
         incomplete_versions = incomplete_states.map(&:migration_id)
         fail MigrationError, <<-MSG
-There are migrations struck in an incomplete states, that could not be fixed automatically:
+There are migrations stuck in an incomplete states, that could not be fixed automatically:
 #{incomplete_versions.join('\n')}
 This can happen when there's a critical error inside a migration.
 
@@ -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/node/has_n.rb

@@ -299,7 +299,7 @@ module ActiveGraph::Node
 
       # :nocov:
       def has_association?(name)
-        ActiveSupport::Deprecation.warn 'has_association? is deprecated and may be removed from future releases, use association? instead.', caller
+        ActiveGraph.deprecator.warn 'has_association? is deprecated and may be removed from future releases, use association? instead.', caller
 
         association?(name)
       end

data/lib/active_graph/node/id_property.rb

@@ -147,7 +147,7 @@ module ActiveGraph::Node
 
       # rubocop:disable Naming/PredicateName
       def has_id_property?
-        ActiveSupport::Deprecation.warn 'has_id_property? is deprecated and may be removed from future releases, use id_property? instead.', caller
+        ActiveGraph.deprecator.warn 'has_id_property? is deprecated and may be removed from future releases, use id_property? instead.', caller
 
         id_property?
       end

data/lib/active_graph/node/labels.rb

@@ -160,7 +160,7 @@ module ActiveGraph
 
         # rubocop:disable Naming/AccessorMethodName
         def set_mapped_label_name(name)
-          ActiveSupport::Deprecation.warn 'set_mapped_label_name is deprecated, use self.mapped_label_name= instead.', caller
+          ActiveGraph.deprecator.warn 'set_mapped_label_name is deprecated, use self.mapped_label_name= instead.', caller
 
           self.mapped_label_name = name
         end

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

@@ -72,7 +72,7 @@ module ActiveGraph
         # The relationship identifier most recently used by the QueryProxy chain.
         attr_reader :rel_var
         def rel_identity
-          ActiveSupport::Deprecation.warn 'rel_identity is deprecated and may be removed from future releases, use rel_var instead.', caller
+          ActiveGraph.deprecator.warn 'rel_identity is deprecated and may be removed from future releases, use rel_var instead.', caller
 
           @rel_var
         end

data/lib/active_graph/node/scope.rb

@@ -55,7 +55,7 @@ module ActiveGraph::Node
 
       # rubocop:disable Naming/PredicateName
       def has_scope?(name)
-        ActiveSupport::Deprecation.warn 'has_scope? is deprecated and may be removed from future releases, use scope? instead.', caller
+        ActiveGraph.deprecator.warn 'has_scope? is deprecated and may be removed from future releases, use scope? instead.', caller
 
         scope?(name)
       end

data/lib/active_graph/railtie.rb

@@ -65,6 +65,10 @@ module ActiveGraph
       end
     end
 
+    initializer "activegraph.deprecator" do |app|
+      app.deprecators[:activegraph] = ActiveGraph.deprecator
+    end
+
     def setup!(config = empty_config)
       config = final_driver_config!(config)
       scheme = config.delete(:scheme) || 'bolt'

data/lib/active_graph/relationship/query.rb

@@ -49,7 +49,7 @@ module ActiveGraph::Relationship
       private
 
       def deprecation_warning!
-        ActiveSupport::Deprecation.warn 'The ActiveGraph::Relationship::Query module has been deprecated and will be removed in a future version of the gem.', caller
+        ActiveGraph.deprecator.warn 'The ActiveGraph::Relationship::Query module has been deprecated and will be removed in a future version of the gem.', caller_locations
       end
 
       def where_query

data/lib/active_graph/shared/persistence.rb

@@ -276,7 +276,7 @@ module ActiveGraph::Shared
 
     def set_timestamps
       warning = 'This method has been replaced with `inject_timestamps!` and will be removed in a future version'.freeze
-      ActiveSupport::Deprecation.warn warning, caller
+      ActiveGraph.deprecator.warn warning, caller
       inject_timestamps!
     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,8 +1,7 @@
 module ActiveGraph
   module Transaction
     def rollback
-      super
-      @rolled_back = true
+      fail ActiveGraph::Rollback
     end
 
     def after_commit(&block)
@@ -10,7 +9,7 @@ module ActiveGraph
     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,28 +14,28 @@ 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)
@@ -56,6 +56,9 @@ module ActiveGraph
         end.tap { tx.apply_callbacks }
       rescue ActiveGraph::Rollback
         # rollbacks are silently swallowed
+        false # to satisfy save and update conventions
+      ensure
+        self.tx = nil
       end
     end
   end

data/lib/active_graph/version.rb

@@ -1,3 +1,3 @@
 module ActiveGraph
-  VERSION = '12.0.0.beta.4'
+  VERSION = '12.0.0.beta.6'
 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
@@ -27,6 +26,9 @@ loader.ignore(File.expand_path('rails', __dir__))
 loader.ignore(File.expand_path('active_graph/railtie.rb', __dir__))
 loader.inflector.inflect("ansi" => "ANSI")
 module ActiveGraph
+  def self.deprecator
+    @deprecator ||= ActiveSupport::Deprecation.new("12", "ActiveGraph")
+  end
 end
 loader.setup
 # loader.eager_load

metadata

@@ -1,92 +1,91 @@
 --- !ruby/object:Gem::Specification
 name: activegraph
 version: !ruby/object:Gem::Version
-  version: 12.0.0.beta.4
+  version: 12.0.0.beta.6
 platform: ruby
 authors:
 - Andreas Ronge, Brian Underwood, Chris Grigg, Heinrich Klobuczek
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-26 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '7'
-  name: activemodel
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '0'
 - !ruby/object:Gem::Dependency
+  name: benchmark
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "!="
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.8
-  name: i18n
+        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: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "!="
       - !ruby/object:Gem::Version
-        version: '5'
-  name: neo4j-ruby-driver
+        version: 1.8.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "!="
       - !ruby/object:Gem::Version
-        version: '5'
+        version: 1.8.8
 - !ruby/object:Gem::Dependency
+  name: neo4j-ruby-driver
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
-  name: orm_adapter
+        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: orm_adapter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  name: sorted_set
+        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
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: guard
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -95,12 +94,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: guard-rspec
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -109,12 +108,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: guard-rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: guard-rubocop
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -123,26 +122,26 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: os
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
-  name: neo4j-rake_tasks
+        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: ostruct
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: os
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -151,12 +150,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: pry
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -165,12 +164,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '7'
-  name: railties
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -179,12 +178,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '7'
 - !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: rake
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -193,12 +192,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.56.0
-  name: rubocop
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -207,12 +206,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.56.0
 - !ruby/object:Gem::Dependency
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: yard
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -221,12 +220,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: dryspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: dryspec
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -235,12 +234,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.10'
-  name: rspec
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -411,7 +410,6 @@ metadata:
   changelog_uri: https://github.com/neo4jrb/activegraph/blob/master/CHANGELOG.md
   source_code_uri: https://github.com/neo4jrb/activegraph/
   bug_tracker_uri: https://github.com/neo4jrb/activegraph/issues
-post_install_message:
 rdoc_options:
 - "--quiet"
 - "--title"
@@ -426,15 +424,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '3.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.3.26
-signing_key:
+rubygems_version: 4.0.3
 specification_version: 4
 summary: A graph database for Ruby
 test_files: []