activegraph 10.0.0 → 10.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66259444a09dbe560ec1a284b7c1988b24eaf4b29386efb63664cef081edf520
-  data.tar.gz: ec43759b43c92f62a93589225207e0d37ef1d18ee4b61d5f4f204b89b8985787
+  metadata.gz: 65cca8a21c8ecb9dff1f8fdf38ab82bcbc02fb211bc29a1b50f947e1d4126b9f
+  data.tar.gz: c64ebb3dff76ec6b66eebe3499aef2fb15a1db56cf786e2da250e0ace1e6bcb8
 SHA512:
-  metadata.gz: ec40cecc16c133c065672a3aa37360c304bba5cf24fe430dda7a789885262a7b239b798a7998b6d96b34ba8d05d5d0376c134dc829d6db0800e392fb740c0ec7
-  data.tar.gz: 9f7fc129cf6916cdf69373ebb789ff7bc5f6c38c675d3e51403c4b0e6e7135a9649cfb2f3f754634507979a371de2a6a16f8670c765e38a016627c21f04e8535
+  metadata.gz: 898089b35cfcf2d101103ada41f27c1884cb00d9169b802526d4573af60cc577a8ddbb3ca71be96d9e54202a95a7a560448b6b27bdd57ff964b6d9e0b4f8b2e5
+  data.tar.gz: 3c3f46755b637e4cdc663f450dc5d247720cee609ae14fa00de87c01f9c9fe09a96d6e9a2bf9b3967f56460444946b35654061ef4cd24e36d9a7acadd20d7f89

data/CHANGELOG.md

@@ -3,6 +3,35 @@ 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/).
 
+## [10.1.1] 2021-11-05
+
+## Fixed
+
+- Fixed issue where some has_one relationships where incorrectly deleted disregarding direction
+- It changes the relationship length assignment in query proxy eagerloading module to be consistent with query proxy relationship length syntax.
+
+## [10.1.0] 2021-02-05
+
+## Added
+
+- support for ruby 3.0.0
+
+## [10.0.2] 2020-12-08
+
+## Fixed
+
+- fixed bad require (https://github.com/neo4jrb/activegraph/issues/1634)
+- removed unused exception class (Thanks @joshjordan)
+- prevented after_commit callbacks from being called multiple times (Thanks @joshjordan)
+
+## [10.0.1] 2020-07-26
+
+## Fixed
+
+- fixed incorrect id comparison, which could result in lost relationships (https://github.com/neo4jrb/activegraph/issues/1611)
+- brought back BigDecimalConverter
+- fixed rails template (Thanks @ekampp)
+
 ## [10.0.0] 2020-07-06
 
 - neo4j 4.0 support (default database only)

data/Gemfile

@@ -7,7 +7,7 @@ gemspec
 gem 'listen', '< 3.1'
 
 active_model_version = ENV['ACTIVE_MODEL_VERSION']
-gem 'activemodel', "~> #{active_model_version}" if active_model_version
+gem 'activemodel', "~> #{active_model_version}" if active_model_version&.length&.positive?
 
 group 'test' do
   gem 'coveralls', require: false
@@ -15,7 +15,6 @@ group 'test' do
   gem 'codecov', require: false
   gem 'simplecov', require: false
   gem 'simplecov-html', require: false
-  gem 'rspec', '~> 3.4'
   gem 'its'
   gem 'test-unit'
   gem 'colored'

data/README.md

@@ -45,31 +45,33 @@ 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.0 | activegraph 11.0.0.beta.4-java |
+|-------------------|------|-------|---------|----------|------------------|--------------------------------|
+| 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
 
 `*` 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

@@ -32,13 +32,14 @@ DESCRIPTION
 
   s.add_dependency('activemodel', '>= 4.0')
   s.add_dependency('activesupport', '>= 4.0')
-  s.add_dependency('i18n', '!= 1.3.0') # version 1.3.0 introduced a bug with `symbolize_key`
+  s.add_dependency('i18n', '!= 1.8.8') # https://github.com/jruby/jruby/issues/6547
   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.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')
@@ -46,4 +47,5 @@ DESCRIPTION
   s.add_development_dependency('rubocop', '>= 0.56.0')
   s.add_development_dependency('yard')
   s.add_development_dependency('dryspec')
+  s.add_development_dependency('rspec', '< 3.10') # Cannot proxy frozen objects
 end

data/lib/active_graph/migrations/runner.rb

@@ -1,15 +1,19 @@
+# frozen_string_literal: true
+
+require 'sorted_set'
+
 module ActiveGraph
   module Migrations
     class Runner
-      STATUS_TABLE_FORMAT = '%-10s %-20s %s'.freeze
-      SEPARATOR = '--------------------------------------------------'.freeze
-      FILE_MISSING = '**** file missing ****'.freeze
-      STATUS_TABLE_HEADER = ['Status'.freeze, 'Migration ID'.freeze, 'Migration Name'.freeze].freeze
-      UP_MESSAGE = 'up'.freeze
-      DOWN_MESSAGE = 'down'.freeze
-      INCOMPLETE_MESSAGE = 'incomplete'.freeze
-      MIGRATION_RUNNING = {up: 'running'.freeze, down: 'reverting'.freeze}.freeze
-      MIGRATION_DONE = {up: 'migrated'.freeze, down: 'reverted'.freeze}.freeze
+      STATUS_TABLE_FORMAT = '%-10s %-20s %s'
+      SEPARATOR = '--------------------------------------------------'
+      FILE_MISSING = '**** file missing ****'
+      STATUS_TABLE_HEADER = ['Status', 'Migration ID', 'Migration Name'].freeze
+      UP_MESSAGE = 'up'
+      DOWN_MESSAGE = 'down'
+      INCOMPLETE_MESSAGE = 'incomplete'
+      MIGRATION_RUNNING = {up: 'running', down: 'reverting'}.freeze
+      MIGRATION_DONE = {up: 'migrated', down: 'reverted'}.freeze
 
       def initialize(options = {})
         @silenced = options[:silenced] || !!ENV['MIGRATIONS_SILENCED']

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/node/query/query_proxy_link.rb

@@ -22,6 +22,7 @@ module ActiveGraph
           class << self
             def for_clause(clause, arg, model, *args)
               method_to_call = "for_#{clause}_clause"
+              return unless respond_to?(method_to_call)
 
               send(method_to_call, arg, model, *args)
             end
@@ -112,8 +113,6 @@ module ActiveGraph
               default = [Link.new(clause, arg, *args)]
 
               Link.for_clause(clause, arg, model, *args) || default
-            rescue NoMethodError
-              default
             end
 
             def converted_keys(model, arg)

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

@@ -49,31 +49,20 @@ module ActiveGraph
         # Deletes the relationships between all nodes for the last step in the QueryProxy chain and replaces them with relationships to the given nodes.
         # Executed in the database, callbacks will not be run.
         def replace_with(node_or_nodes)
-          node_hash = idify_hash(node_or_nodes)
+          node_or_nodes = Array(node_or_nodes).map { |arg| arg.is_a?(ActiveGraph::Node) ? arg : @model.find(arg) }
           original_ids = self.pluck(:id)
-          new_nodes = add_rels(node_hash, original_ids)
-          delete_rels_for_nodes(original_ids - node_hash.keys)
-          new_nodes | node_hash.values
+          delete_rels_for_nodes(original_ids, node_or_nodes.collect(&:id))
+          add_rels(node_or_nodes, original_ids)
         end
 
-        def idify_hash(args)
-          Array(args).reject(&:blank?).flatten.each_with_object({}).with_index do |(arg, hash), inx|
-            if arg.is_a?(Integer) || arg.is_a?(String)
-              hash[arg.to_i] = @model.find(arg)
-            else
-              key = arg.persisted? ? arg.id : "tmp_#{inx}"
-              hash[key] = arg
-            end
-          end
-        end
-
-        def add_rels(node_hash, original_ids)
-          (node_hash.keys - original_ids).map do |id|
-            node_hash[id] if _create_relation_or_defer(node_hash[id])
+        def add_rels(node_or_nodes, original_ids)
+          node_or_nodes.map do |obj|
+            obj if original_ids.include?(obj.id) || _create_relation_or_defer(obj)
           end.compact
         end
 
-        def delete_rels_for_nodes(ids)
+        def delete_rels_for_nodes(original_ids, new_ids)
+          ids = original_ids.select { |id| !new_ids.include?(id) }
           return unless ids.present?
           if association.dependent
             start_object.public_send("dependent_#{association.dependent}_callback", association, ids)

data/lib/active_graph/node/validations.rb

@@ -28,7 +28,7 @@ module ActiveGraph
         def validate_each(record, attribute, value)
           return unless found(record, attribute, value).exists?
 
-          record.errors.add(attribute, :taken, options.except(:case_sensitive, :scope).merge(value: value))
+          record.errors.add(attribute, :taken, **options.except(:case_sensitive, :scope).merge(value: value))
         end
 
         def found(record, attribute, value)

data/lib/active_graph/shared/type_converters.rb

@@ -69,6 +69,33 @@ module ActiveGraph::Shared
       end
     end
 
+    class BigDecimalConverter < BaseConverter
+      class << self
+        def convert_type
+          BigDecimal
+        end
+
+        def db_type
+          String
+        end
+
+        def to_db(value)
+          case value
+          when Rational
+            value.to_f.to_d
+          when respond_to?(:to_d)
+            value.to_d
+          else
+            BigDecimal(value.to_s)
+          end.to_s
+        end
+
+        def to_ruby(value)
+          value.to_d
+        end
+      end
+    end
+
     class StringConverter < BaseConverter
       class << self
         def convert_type

data/lib/active_graph/tasks/migration.rake

@@ -5,9 +5,8 @@ require 'active_graph/migration'
 if !defined?(Rails) && !Rake::Task.task_defined?('environment')
   desc 'Run a script against the database to perform system-wide changes'
   task :environment do
-    require 'active_graph/session_manager'
     require 'ostruct'
-    neo4j_url = ENV['NEO4J_URL'] || 'http://localhost:7474'
+    neo4j_url = ENV['NEO4J_URL'] || 'bolt://localhost:7687'
     $LOAD_PATH.unshift File.dirname('./')
     ActiveGraph::Base.on_establish_driver do
       Neo4j::Driver::GraphDatabase.driver(neo4j_url)

data/lib/active_graph/transaction.rb

@@ -8,13 +8,16 @@ module ActiveGraph
     def close
       success
       super
-      after_commit_registry.each(&:call) unless @failure
     end
 
     def after_commit(&block)
       after_commit_registry << block
     end
 
+    def apply_callbacks
+      after_commit_registry.each(&:call) unless @failure
+    end
+
     private
 
     def after_commit_registry

data/lib/active_graph/transactions.rb

@@ -43,7 +43,7 @@ module ActiveGraph
         session.send(method, **config) do |tx|
           self.tx = tx
           checked_yield(tx, &block)
-        end
+        end.tap { tx.apply_callbacks }
       end
 
       def checked_yield(tx)

data/lib/active_graph/version.rb

@@ -1,3 +1,3 @@
 module ActiveGraph
-  VERSION = '10.0.0'
+  VERSION = '10.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activegraph
 version: !ruby/object:Gem::Version
-  version: 10.0.0
+  version: 10.1.1
 platform: ruby
 authors:
 - Andreas Ronge, Brian Underwood, Chris Grigg, Heinrich Klobuczek
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-07 00:00:00.000000000 Z
+date: 2021-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "!="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.8.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "!="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.8.8
 - !ruby/object:Gem::Dependency
   name: orm_adapter
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.0
+- !ruby/object:Gem::Dependency
+  name: sorted_set
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.7.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.7.4
 - !ruby/object:Gem::Dependency
   name: os
   requirement: !ruby/object:Gem::Requirement
@@ -234,6 +248,20 @@ 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'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.10'
 description: 'A Neo4j OGM (Object-Graph-Mapper) for Ruby heavily inspired by ActiveRecord.
 
   '
@@ -260,7 +288,6 @@ files:
 - lib/active_graph/class_arguments.rb
 - lib/active_graph/config.rb
 - lib/active_graph/core.rb
-- lib/active_graph/core/connection_failed_error.rb
 - lib/active_graph/core/cypher_error.rb
 - lib/active_graph/core/entity.rb
 - lib/active_graph/core/instrumentable.rb
@@ -394,7 +421,7 @@ 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: 
+post_install_message:
 rdoc_options:
 - "--quiet"
 - "--title"
@@ -416,8 +443,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: A graph database for Ruby
 test_files: []

data/lib/active_graph/core/connection_failed_error.rb

@@ -1,6 +0,0 @@
-module ActiveGraph
-  module Core
-    class ConnectionFailedError < StandardError;
-    end
-  end
-end