neo4j 9.5.2 → 9.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0364211168add80fe38bd3274825f155430521e2f6fb2e7228dad3e49aa057ac'
-  data.tar.gz: c12278922c2b982334a564b85bf572a6db59fbd9c8ed7b520823a267c6d82562
+  metadata.gz: 822965793898b0cdde8a1e6410520b411478b84e849ee4130a53e6391858f8c4
+  data.tar.gz: c92710ffdbca32f588378bf11ea0466fc69233f571656e499b0287fa685f1578
 SHA512:
-  metadata.gz: e063079054524c0843e720158e0af61fbb2b9c4121d38fac4fd1eea3648b95af196f63d8c3585491d4518535f398dde6b733a55baa2f0798dc8bf7927cc821b2
-  data.tar.gz: e7822e8abf2eb73bce2011bbbb016f60ace21bc93ddaf7e1db89f3e9a3c0614e49fbc89f14990bf2f9f63fddbe5a3a54371b7ef6769737eea85735d304c8d8c6
+  metadata.gz: ff8a3d6a6122ad2f9fee70dcafbb10a2c30de757c0d98b755547334d56b5df020ae66eebaa12750dbdb2ab418a57ee071fd736960225426e0d55bef178e104bf
+  data.tar.gz: 19a8e93b5dd488c8d119d48230a02127b2622842de1adda468fe57f996ad00ec128f927e2b05e5ddea2cf4fd298cde324a5c7f3c90a16473614ea48ca838563f

data/CHANGELOG.md

@@ -3,6 +3,13 @@ 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/).
 
+## [9.5.3] 2019-08-16
+
+## Fixed
+
+- Enforces has_one uniqness constraint on relationship with config flag. (#1566)
+- Restricting activemodel and activesupport version to < 6.0.
+
 ## [9.5.2] 2019-08-06
 
 ## Fixed

data/config/neo4j/config.yml

@@ -33,3 +33,6 @@ cache_class_names: true
 # class_name_property:  :_classname
 
 transform_rel_type: :upcase
+
+# Enforce has_one relationship. When same reationship is created on reverse object with another object, raise the error.
+enforce_has_one: false

data/lib/neo4j/active_node/has_n.rb

@@ -3,7 +3,7 @@ module Neo4j::ActiveNode
     extend ActiveSupport::Concern
 
     class NonPersistedNodeError < Neo4j::Error; end
-
+    class HasOneConstraintError < Neo4j::Error; end
     # Return this object from associations
     # It uses a QueryProxy to get results
     # But also caches results and can have results cached on it
@@ -229,14 +229,27 @@ module Neo4j::ActiveNode
       end
     end
 
-    def delete_has_one_rel(active_rel, direction, target_class)
-      rel = active_rel_corresponding_rel(active_rel, direction, target_class)
-      delete_rel(rel.last) if rel && rel.last.type == :has_one
+    def validate_reverse_has_one_core_rel(association, other_node)
+      return unless Neo4j::Config[:enforce_has_one]
+      reverse_assoc = reverse_association(association)
+      validate_has_one_rel!(reverse_assoc, other_node) if reverse_assoc && reverse_assoc.type == :has_one
+    end
+
+    def reverse_association(association)
+      reverse_assoc = self.class.associations.find do |_key, assoc|
+        association.inverse_of?(assoc) || assoc.inverse_of?(association)
+      end
+      reverse_assoc && reverse_assoc.last
+    end
+
+    def validate_reverse_has_one_active_rel(active_rel, direction, other_node)
+      rel = active_rel_corresponding_rel(active_rel, direction, other_node.class)
+      validate_has_one_rel!(rel.last, other_node) if rel && rel.last.type == :has_one
     end
 
-    def delete_rel(rel)
-      send("#{rel.name}=", nil)
-      association_proxy_cache.clear
+    def validate_has_one_rel!(rel, other_node)
+      raise_error = (node = send(rel.name.to_s)) && node != other_node
+      fail(HasOneConstraintError, "node #{self.class}##{neo_id} has a has_one relationship with #{other_node.class}##{other_node.neo_id}") if raise_error
     end
 
     def active_rel_corresponding_rel(active_rel, direction, target_class)

data/lib/neo4j/active_node/query/query_proxy.rb

@@ -208,7 +208,7 @@ module Neo4j
           Neo4j::ActiveBase.run_transaction do
             other_nodes.each do |other_node|
               if other_node.neo_id
-                other_node.try(:delete_reverse_relationship, association)
+                other_node.try(:validate_reverse_has_one_core_rel, association, @start_object)
               else
                 other_node.save
               end

data/lib/neo4j/active_node/rels.rb

@@ -7,17 +7,5 @@ module Neo4j::ActiveNode
       fail "Can't access relationship on a non persisted node" unless _persisted_obj
       _persisted_obj
     end
-
-    def delete_reverse_relationship(association)
-      reverse_assoc = reverse_association(association)
-      delete_rel(reverse_assoc) if reverse_assoc && reverse_assoc.type == :has_one
-    end
-
-    def reverse_association(association)
-      reverse_assoc = self.class.associations.find do |_key, assoc|
-        association.inverse_of?(assoc) || assoc.inverse_of?(association)
-      end
-      reverse_assoc && reverse_assoc.last
-    end
   end
 end

data/lib/neo4j/active_rel/persistence.rb

@@ -45,16 +45,17 @@ module Neo4j::ActiveRel
 
     def create_model
       validate_node_classes!
-      delete_has_one_rel
+      validate_has_one_rel
       rel = _create_rel
       return self unless rel.respond_to?(:props)
       init_on_load(rel, from_node, to_node, @rel_type)
       true
     end
 
-    def delete_has_one_rel
-      to_node.delete_has_one_rel(self, :in, from_node.class) if to_node.persisted?
-      from_node.delete_has_one_rel(self, :out, to_node.class) if from_node.persisted?
+    def validate_has_one_rel
+      return unless Neo4j::Config[:enforce_has_one]
+      to_node.validate_reverse_has_one_active_rel(self, :in, from_node) if to_node.persisted?
+      from_node.validate_reverse_has_one_active_rel(self, :out, to_node) if from_node.persisted?
     end
 
     def query_as(var)

data/lib/neo4j/version.rb

@@ -1,3 +1,3 @@
 module Neo4j
-  VERSION = '9.5.2'
+  VERSION = '9.5.3'
 end

data/neo4j.gemspec

@@ -33,8 +33,8 @@ DESCRIPTION
     'bug_tracker_uri' => 'https://github.com/neo4jrb/neo4j/issues'
   }
 
-  s.add_dependency('activemodel', '>= 4.0')
-  s.add_dependency('activesupport', '>= 4.0')
+  s.add_dependency('activemodel', ['>= 4.0', '< 6'])
+  s.add_dependency('activesupport', ['>= 4.0', '< 6'])
   s.add_dependency('i18n', '!= 1.3.0') # version 1.3.0 introduced a bug with `symbolize_key`
   s.add_dependency('neo4j-core', '>= 9.0.0')
   s.add_dependency('orm_adapter', '~> 0.5.0')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j
 version: !ruby/object:Gem::Version
-  version: 9.5.2
+  version: 9.5.3
 platform: ruby
 authors:
 - Andreas Ronge, Brian Underwood, Chris Grigg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-06 00:00:00.000000000 Z
+date: 2019-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -17,6 +17,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,6 +27,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -31,6 +37,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -38,6 +47,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement