activegraph 10.0.2 → 10.2.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da2d8a7259add3643cf674f25c93580424d614791b68394c6ebd51e936828140
-  data.tar.gz: 7c6987932e0bb59d96a1233d51a20748fee03d585cc2fa5dcd45111e17b8fb04
+  metadata.gz: c01920a2ca46982b8de50984fbd0a07210ef483a4b933f0de9f4b9c3caa9bb1e
+  data.tar.gz: 1a3c0f858a7653a1a30497b5df0ef552a297efb66d6f5ff56ec545a81b666be1
 SHA512:
-  metadata.gz: 97733e8f86febdfd278a75cbef2561074d14d7d545ce98474f61b8b395a9972e04643b624c0f87b9c132493a316cb8b0a7011e28dc27d918c7bc787681b57b84
-  data.tar.gz: b1529b3c7e256ecef44a7006691593fc0a7a8f1e7b7e6de60fb5d22bae6b92a91307d4753d4f9b12fec0a8853df3369f0e1479b7945c035b1f550f9dc7053b64
+  metadata.gz: e63aa9728efe64bb40bd0b650d6485af7ee9e814b951ee30d6862ef2821556891d8d95cb9d637711a35f18e5d98347b8913c1d42f51c93d4ee694fee873f440e
+  data.tar.gz: 1632af7ded55530fa57b22754a0a156aa3662f61c8cbd962e87753971bf11bf6fdf345d897b80b7537bb61705c5cf5e69f50afc41b48b5c7c64ff4ebe3590f9a

data/CHANGELOG.md

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

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/core/schema.rb

@@ -2,28 +2,32 @@ 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]
+        query('CALL dbms.components()', {}, skip_instrumentation: true).first[:versions][0]
       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)
-
-        result.select(&method(v4?(result) ? :v4_filter : :v3_filter)).map do |row|
-          { type: :uniqueness, label: label(result, row), properties: properties(row) }
+        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
 
+      def raw_indexes
+        result = query('CALL db.indexes()', {}, skip_instrumentation: true)
+        yield result.keys, result.reject { |row| row[:type] == 'LOOKUP' }
+      end
+
       private
 
       def v4_filter(row)
@@ -34,22 +38,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/migrations/base.rb

@@ -57,9 +57,13 @@ 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' ||
+          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."
+        else
+          fail e
+        end
       end
 
       def migration_transaction(&block)

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/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/version.rb

@@ -1,3 +1,3 @@
 module ActiveGraph
-  VERSION = '10.0.2'
+  VERSION = '10.2.0.beta.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activegraph
 version: !ruby/object:Gem::Version
-  version: 10.0.2
+  version: 10.2.0.beta.1
 platform: ruby
 authors:
 - Andreas Ronge, Brian Underwood, Chris Grigg, Heinrich Klobuczek
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-09 00:00:00.000000000 Z
+date: 2022-02-23 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.
 
   '
@@ -411,11 +439,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: A graph database for Ruby