neo4j 9.4.0 → 9.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ddd749f4da3296fd19bb4c39c1981e3b612d58715fcfbc7bf4e7267811284312
-  data.tar.gz: a39833454052a0fee01b2fbcc781d4334521a1f32415e410e711daa1867eeff0
+  metadata.gz: 1d29f60a9c7d8ae6a2415d1ff37d4bad444a21853dbce515c95824d2a83540d0
+  data.tar.gz: c1bb5780fa1bde00cbbd3fbff425190012a2de19a0a0b22f836f5e6fc10ffb3b
 SHA512:
-  metadata.gz: bb6c4d92ca9cf8544e33da06b29568e44f24ba8f87a5a861256a1cdb369acf536467ccbaafcd102b7ad04457c9da69149c0e0cec92c290b85869ef55063318ff
-  data.tar.gz: 3ee2eaf941aa6e406d7a764c843dbd2b51502452d2682512bb6c512077003c9a9f5021b905332fc7a8bb1480fa80fce49e82b055f60f058345474d9f9d67ce40
+  metadata.gz: e67d937270cfb963b8e3ee4326c0946bbff1c4d21290e54def9eeeec10c5bd258df93d8f05f3241f94c56401a136fc4588d79e198a5d0bfdecf170bb1e3f0683
+  data.tar.gz: 95756152b26bfd067535b680040827872de54fc89e87f1f6f38053b1fa7df9671bb4e20aceb9d4de07695b0573e946765f2568da0029fff2ba71715f11ac4fb9

data/CHANGELOG.md

@@ -3,6 +3,18 @@ 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.0] 2019-06-17
+
+## Added
+
+- Variable length relatinships in eager laoding (thanks @amitsuryavanshi / #1545)
+
+## Fixed
+
+- fixed `wait_for_connection` (thanks @ayghor / see #1540)
+- Reverse has_one relationships (thanks @amitsuryavanshi / #1548)
+- Missing require 'forwardable' (thanks @jschulenklopper / #1535)
+
 ## [9.4.0] 2018-12-20
 
 ## Added

data/README.md

@@ -91,11 +91,16 @@ Neo4j.rb v4.1.0 was released in January of 2015. Its changes are outlined [here]
 
 * [Andreas Ronge](https://github.com/andreasronge)
 
-### Current Maintainers
+### Previous Maintainers
 
 * [Brian Underwood](https://github.com/cheerfulstoic)
 * [Chris Grigg](https://github.com/subvertallchris)
 
+### Current Maintainers
+
+* [Heinrich Klobuczek](https://github.com/klobuczek)
+* [Amit Suryavanshi](https://github.com/amitsuryavanshi)
+
 ## Contributing
 
 Always welcome!  Please review the [guidelines for contributing](CONTRIBUTING.md) to this repository.

data/lib/neo4j.rb

@@ -1,3 +1,4 @@
+require 'forwardable'
 require 'neo4j/version'
 
 require 'neo4j-core'
@@ -71,6 +72,7 @@ require 'neo4j/active_node/query/query_proxy_methods_of_mass_updating'
 require 'neo4j/active_node/query/query_proxy_enumerable'
 require 'neo4j/active_node/query/query_proxy_find_in_batches'
 require 'neo4j/active_node/query/query_proxy_eager_loading'
+require 'neo4j/active_node/query/query_proxy_eager_loading/association_tree'
 require 'neo4j/active_node/query/query_proxy_link'
 require 'neo4j/active_node/labels/index'
 require 'neo4j/active_node/labels/reloading'

data/lib/neo4j/active_node/has_n.rb

@@ -102,7 +102,7 @@ module Neo4j::ActiveNode
       end
 
       def add_to_cache(object, rel = nil)
-        @cached_rels << rel if rel
+        (@cached_rels ||= []) << rel if rel
         (@cached_result ||= []) << object
       end
 

data/lib/neo4j/active_node/has_n/association.rb

@@ -170,7 +170,7 @@ module Neo4j
         end
 
         def origin_association
-          target_class.associations[@origin]
+          target_class && target_class.associations[@origin]
         end
 
         def origin_type

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

@@ -207,7 +207,11 @@ module Neo4j
 
           Neo4j::ActiveBase.run_transaction do
             other_nodes.each do |other_node|
-              other_node.save unless other_node.neo_id
+              if other_node.neo_id
+                other_node.try(:delete_reverse_relationship, association)
+              else
+                other_node.save
+              end
 
               @start_object.association_proxy_cache.clear
 

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

@@ -8,52 +8,6 @@ module Neo4j
           end
         end
 
-        class AssociationTree < Hash
-          attr_accessor :model, :name, :association, :path
-
-          def initialize(model, name = nil)
-            super()
-            self.model = name ? target_class(model, name) : model
-            self.name = name
-            self.association = name ? model.associations[name] : nil
-          end
-
-          def clone
-            super.tap { |copy| copy.each { |key, value| copy[key] = value.clone } }
-          end
-
-          def add_spec(spec)
-            unless model
-              fail "Cannot eager load \"past\" a polymorphic association. \
-              (Since the association can return multiple models, we don't how to handle the \"#{spec}\" association.)"
-            end
-
-            if spec.is_a?(Array)
-              spec.each { |s| add_spec(s) }
-            elsif spec.is_a?(Hash)
-              process_hash(spec)
-            else
-              self[spec] ||= self.class.new(model, spec)
-            end
-          end
-
-          def paths(*prefix)
-            values.flat_map { |v| [[*prefix, v]] + v.paths(*prefix, v) }
-          end
-
-          def process_hash(spec)
-            spec.each { |k, v| (self[k] ||= self.class.new(model, k)).add_spec(v) }
-          end
-
-          private
-
-          def target_class(model, key)
-            association = model.associations[key]
-            fail "Invalid association: #{[*path, key].join('.')}" unless association
-            model.associations[key].target_class
-          end
-        end
-
         def pluck_vars(node, rel)
           with_associations_tree.empty? ? super : perform_query
         end
@@ -68,7 +22,6 @@ module Neo4j
                 add_to_cache(*eager_record, element)
               end
             end
-
             record
           end
         end
@@ -115,6 +68,7 @@ module Neo4j
 
         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 == ''
         end
 
         def cache_and_init(node, element)
@@ -176,10 +130,15 @@ module Neo4j
         def with_association_query_part(base_query, path, previous_with_vars)
           optional_match_with_where(base_query, path, previous_with_vars)
             .with(identity,
-                  "[collect(#{escape("#{path_name(path)}_rel")}), collect(#{escape path_name(path)})] AS #{escape("#{path_name(path)}_collection")}",
+                  "[#{relationship_collection(path)}, collect(#{escape path_name(path)})] "\
+                  "AS #{escape("#{path_name(path)}_collection")}",
                   *previous_with_vars)
         end
 
+        def relationship_collection(path)
+          path.last.rel_length ? "collect(last(relationships(#{escape("#{path_name(path)}_path")})))" : "collect(#{escape("#{path_name(path)}_rel")})"
+        end
+
         def optional_match_with_where(base_query, path, _)
           path
             .each_with_index.map { |_, index| path[0..index] }
@@ -189,15 +148,23 @@ module Neo4j
         end
 
         def optional_match(base_query, path)
+          start_path = "#{escape("#{path_name(path)}_path")}=(#{identity})"
           base_query.optional_match(
-            "(#{identity})#{path.each_with_index.map do |element, index|
-              relationship_part(element.association, path_name(path[0..index]))
+            "#{start_path}#{path.each_with_index.map do |element, index|
+              relationship_part(element.association, path_name(path[0..index]), element.rel_length)
             end.join}"
           )
         end
 
-        def relationship_part(association, path_name)
-          "#{association.arrow_cypher(escape("#{path_name}_rel"))}(#{escape(path_name)})"
+        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)})"
         end
 
         def chain

data/lib/neo4j/active_node/query/query_proxy_eager_loading/association_tree.rb

@@ -0,0 +1,75 @@
+module Neo4j
+  module ActiveNode
+    module Query
+      module QueryProxyEagerLoading
+        class AssociationTree < Hash
+          attr_accessor :model, :name, :association, :path, :rel_length
+
+          def initialize(model, name = nil, rel_length = nil)
+            super()
+            self.model = name ? target_class(model, name) : model
+            self.name = name
+            self.association = name ? model.associations[name] : nil
+            self.rel_length = rel_length
+          end
+
+          def clone
+            super.tap { |copy| copy.each { |key, value| copy[key] = value.clone } }
+          end
+
+          def add_spec(spec)
+            fail_spec(spec) unless model
+
+            case spec
+            when nil
+              nil
+            when Array
+              spec.each(&method(:add_spec))
+            when Hash
+              process_hash(spec)
+            when String
+              process_string(spec)
+            else
+              add_key(spec)
+            end
+          end
+
+          def fail_spec(spec)
+            fail "Cannot eager load \"past\" a polymorphic association. \
+              (Since the association can return multiple models, we don't how to handle the \"#{spec}\" association.)"
+          end
+
+          def paths(*prefix)
+            values.flat_map { |v| [[*prefix, v]] + v.paths(*prefix, v) }
+          end
+
+          def process_hash(spec)
+            spec.each { |key, value| add_nested(key, value) }
+          end
+
+          def add_key(key, length = nil)
+            self[key] ||= self.class.new(model, key, length)
+          end
+
+          def add_nested(key, value, length = nil)
+            add_key(key, length).add_spec(value)
+          end
+
+          def process_string(str)
+            head, rest = str.split('.', 2)
+            k, length = head.split('*', -2)
+            add_nested(k.to_sym, rest, length)
+          end
+
+          private
+
+          def target_class(model, key)
+            association = model.associations[key]
+            fail "Invalid association: #{[*path, key].join('.')}" unless association
+            model.associations[key].target_class
+          end
+        end
+      end
+    end
+  end
+end

data/lib/neo4j/active_node/rels.rb

@@ -7,5 +7,15 @@ 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)
+      self.send("#{reverse_assoc.name}=", nil) if reverse_assoc && reverse_assoc.type == :has_one
+    end
+
+    def reverse_association(association)
+      reverse_assoc = self.class.associations.find { |_key, assoc| association.inverse_of?(assoc) }
+      reverse_assoc && reverse_assoc.last
+    end
   end
 end

data/lib/neo4j/session_manager.rb

@@ -7,13 +7,12 @@ module Neo4j
       def open_neo4j_session(type, url_or_path, wait_for_connection = false, options = {})
         enable_unlimited_strength_crypto! if java_platform? && session_type_is_embedded?(type)
 
-        adaptor = wait_for_value(wait_for_connection, Neo4j::Core::CypherSession::ConnectionFailedError) do
-          verbose_query_logs = Neo4j::Config.fetch(:verbose_query_logs, false)
-          cypher_session_adaptor(type, url_or_path, options.merge(wrap_level: :proc,
-                                                                  verbose_query_logs: verbose_query_logs))
-        end
-
-        Neo4j::Core::CypherSession.new(adaptor)
+        verbose_query_logs = Neo4j::Config.fetch(:verbose_query_logs, false)
+        adaptor = cypher_session_adaptor(type, url_or_path, options.merge(wrap_level: :proc,
+                                                                          verbose_query_logs: verbose_query_logs))
+        session = Neo4j::Core::CypherSession.new(adaptor)
+        wait_and_retry(session) if wait_for_connection
+        session
       end
 
       def adaptor_class(type, options)
@@ -42,23 +41,17 @@ module Neo4j
         RUBY_PLATFORM =~ /java/
       end
 
-      def wait_for_value(wait, exception_class)
-        value = nil
+      def wait_and_retry(session)
         Timeout.timeout(60) do
-          until value
-            begin
-              if value = yield
-                # puts
-                return value
-              end
-            rescue exception_class => e
-              raise e if !wait
-
-              # putc '.'
-              sleep(1)
-            end
+          begin
+            session.constraints
+          rescue Neo4j::Core::CypherSession::ConnectionFailedError
+            sleep(1)
+            retry
           end
         end
+      rescue Timeout::Error
+        raise Timeout::Error, 'Timeout while waiting for connection to neo4j database'
       end
 
       private

data/lib/neo4j/version.rb

@@ -1,3 +1,3 @@
 module Neo4j
-  VERSION = '9.4.0'
+  VERSION = '9.5.0'
 end

metadata

@@ -1,234 +1,220 @@
 --- !ruby/object:Gem::Specification
 name: neo4j
 version: !ruby/object:Gem::Version
-  version: 9.4.0
+  version: 9.5.0
 platform: ruby
 authors:
 - Andreas Ronge, Brian Underwood, Chris Grigg
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-20 00:00:00.000000000 Z
+date: 2019-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
-  name: activemodel
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
-  name: activesupport
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
+  name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "!="
       - !ruby/object:Gem::Version
         version: 1.3.0
-  name: i18n
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "!="
       - !ruby/object:Gem::Version
         version: 1.3.0
 - !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  name: neo4j-community
-  prerelease: false
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
+  name: neo4j-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 9.0.0
-  name: neo4j-core
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 9.0.0
 - !ruby/object:Gem::Dependency
+  name: orm_adapter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.0
-  name: orm_adapter
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.0
 - !ruby/object:Gem::Dependency
+  name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: guard
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !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
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !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
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: neo4j-rake_tasks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.0
-  name: neo4j-rake_tasks
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.0
 - !ruby/object:Gem::Dependency
+  name: os
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: os
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !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
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
-  name: railties
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: rake
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !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
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !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
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -281,6 +267,7 @@ files:
 - lib/neo4j/active_node/query.rb
 - lib/neo4j/active_node/query/query_proxy.rb
 - lib/neo4j/active_node/query/query_proxy_eager_loading.rb
+- lib/neo4j/active_node/query/query_proxy_eager_loading/association_tree.rb
 - lib/neo4j/active_node/query/query_proxy_enumerable.rb
 - lib/neo4j/active_node/query/query_proxy_find_in_batches.rb
 - lib/neo4j/active_node/query/query_proxy_link.rb
@@ -372,7 +359,7 @@ metadata:
   changelog_uri: https://github.com/neo4jrb/neo4j/blob/master/CHANGELOG.md
   source_code_uri: https://github.com/neo4jrb/neo4j/
   bug_tracker_uri: https://github.com/neo4jrb/neo4j/issues
-post_install_message:
+post_install_message: 
 rdoc_options:
 - "--quiet"
 - "--title"
@@ -387,7 +374,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.1.9
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -395,8 +382,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: neo4j
-rubygems_version: 2.7.6
-signing_key:
+rubygems_version: 2.7.8
+signing_key: 
 specification_version: 4
 summary: A graph database for Ruby
 test_files: []