neo4j 10.0.0.pre.alpha.2 → 10.0.0.pre.alpha.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06fc784b57e2d00ee0d179d89f83d68238ef58a5752dbf6e34ff6e0ace4e48c4
-  data.tar.gz: fb99dd038913062a097903c5f7c8f6babaa11bdcb43faa550d386621d499ce87
+  metadata.gz: ff515286e8e1202f648f372e9041d1fe09398d2f337125efec503ce9172232de
+  data.tar.gz: 506ee61427202c6233706f419f0386ead7db0dcf8b2c88ae87c2486eb8834efe
 SHA512:
-  metadata.gz: 14150ce3f67874323b0267d22babdc3cd7b5b7016f550493761c992f47b51e702f16b9c6aa49f13730afb9f53f80a2cc3dba057970adb76179260e88d67b1e07
-  data.tar.gz: b82dc132f3c9083b9f96004035336edd4ad314efb1c321e1c453cf6631762be6f4af9d0d3ecd2dc22b5da24487af3944ca9d25e5075789b6cecfd1ad20c2d0f5
+  metadata.gz: 69e84ff47a1ad8eae95c942b6a91a6e8c5fbf3de71b81043d664a1ff9ccd0aee5c8645c659e38a4500f9eee21a7efb69562cff82875a829808a9784f66dbd05c
+  data.tar.gz: 044ff7c2a4f7a5dcef788254b82ab834ef29e9c04c8a837beed669536d9a4df25f392ea4381b92eecb96372945e2be35e5571b2525a9bbda8b1b7b680c107e27

data/CHANGELOG.md

@@ -3,6 +3,12 @@ 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.6.1] 2019-12-18
+
+## Fixed
+
+- Fixed duplicate records with with_associations on QueryProxy. (#1576)
+
 ## [9.6.0] 2019-09-3
 
 ## Added

data/lib/neo4j/active_base.rb

@@ -2,6 +2,10 @@ module Neo4j
   # To contain any base login for ActiveNode/ActiveRel which
   # is external to the main classes
   module ActiveBase
+    at_exit do
+      @driver&.close
+    end
+
     class << self
       # private?
       def current_driver
@@ -34,6 +38,7 @@ module Neo4j
 
       # Should support setting driver via config options
       def driver=(driver)
+        @driver&.close
         @driver = driver
       end
 

data/lib/neo4j/active_node/has_n.rb

@@ -103,7 +103,7 @@ module Neo4j::ActiveNode
 
       def add_to_cache(object, rel = nil)
         (@cached_rels ||= []) << rel if rel
-        (@cached_result ||= []) << object
+        (@cached_result ||= []).tap { |results| results << object unless results.include?(object) }
       end
 
       def rels

data/lib/neo4j/core/driver.rb

@@ -10,16 +10,10 @@ module Neo4j
 
       USER_AGENT_STRING = "neo4j-gem/#{::Neo4j::VERSION} (https://github.com/neo4jrb/neo4j)"
 
-      cattr_reader :singleton
       attr_accessor :wrap_level
       attr_reader :options, :driver
       delegate :close, to: :driver
 
-      @@mutex = Mutex.new
-      at_exit do
-        close
-      end
-
       default_url('bolt://neo4:neo4j@localhost:7687')
 
       validate_uri do |uri|
@@ -27,13 +21,6 @@ module Neo4j
       end
 
       class << self
-        def singleton=(driver)
-          @@mutex.synchronize do
-            singleton&.close
-            class_variable_set(:@@singleton, driver)
-          end
-        end
-
         def new_instance(url)
           uri = URI(url)
           user = uri.user
@@ -45,16 +32,11 @@ module Neo4j
                        end
           Neo4j::Driver::GraphDatabase.driver(url, auth_token)
         end
-
-        def close
-          singleton&.close
-        end
       end
 
       def initialize(url, options = {})
         self.url = url
         @driver = self.class.new_instance(url)
-        self.class.singleton = self
         @options = options
       end
 

data/lib/neo4j/core/instrumentable.rb

@@ -14,7 +14,7 @@ module Neo4j
         def subscribe_to_request
           ActiveSupport::Notifications.subscribe('neo4j.core.bolt.request') do |_, start, finish, _id, _payload|
             ms = (finish - start) * 1000
-            yield " #{ANSI::BLUE}BOLT:#{ANSI::CLEAR} #{ANSI::YELLOW}#{ms.round}ms#{ANSI::CLEAR} #{Driver.singleton.url_without_password}"
+            yield " #{ANSI::BLUE}BOLT:#{ANSI::CLEAR} #{ANSI::YELLOW}#{ms.round}ms#{ANSI::CLEAR} #{ActiveBase.current_driver.url_without_password}"
           end
         end
 
@@ -27,7 +27,7 @@ module Neo4j
             source_line, line_number = Logging.first_external_path_and_line(caller_locations)
 
             yield " #{ANSI::CYAN}#{query.context || 'CYPHER'}#{ANSI::CLEAR} #{cypher} #{params_string}" +
-              ("\n   ↳ #{source_line}:#{line_number}" if Driver.singleton.options[:verbose_query_logs] && source_line).to_s
+              ("\n   ↳ #{source_line}:#{line_number}" if ActiveBase.current_driver.options[:verbose_query_logs] && source_line).to_s
           end
         end
       end

data/lib/neo4j/transaction.rb

@@ -22,7 +22,6 @@ module Neo4j
         tx = Neo4j::Transaction.new
         yield tx
       rescue Exception => e # rubocop:disable Lint/RescueException
-
         tx.mark_failed unless tx.nil?
         raise e
       ensure
@@ -39,7 +38,7 @@ module Neo4j
 
       @root = stack.first
       return unless root?
-      @driver_session = Neo4j::Core::Driver.singleton.driver.session(Neo4j::Driver::AccessMode::WRITE)
+      @driver_session = ActiveBase.current_driver.driver.session(Neo4j::Driver::AccessMode::WRITE)
       @driver_tx = @driver_session.begin_transaction
     rescue StandardError => e
       self.stack = []

data/lib/neo4j/version.rb

@@ -1,3 +1,3 @@
 module Neo4j
-  VERSION = '10.0.0-alpha.2'
+  VERSION = '10.0.0-alpha.3'
 end

data/neo4j.gemspec

@@ -40,7 +40,7 @@ DESCRIPTION
   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-#{RUBY_PLATFORM =~ /java/ ? 'java' : 'ruby'}-driver", '>= 0.1.5')
+  s.add_development_dependency("neo4j-#{RUBY_PLATFORM =~ /java/ ? 'java' : 'ruby'}-driver", '>= 0.1.10')
   s.add_development_dependency('os')
   s.add_development_dependency('pry')
   s.add_development_dependency('railties', '>= 4.0')

metadata

@@ -1,234 +1,234 @@
 --- !ruby/object:Gem::Specification
 name: neo4j
 version: !ruby/object:Gem::Version
-  version: 10.0.0.pre.alpha.2
+  version: 10.0.0.pre.alpha.3
 platform: ruby
 authors:
 - Andreas Ronge, Brian Underwood, Chris Grigg, Heinrich Klobuczek
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-12-24 00:00:00.000000000 Z
+date: 2019-12-30 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'
-  type: :runtime
+  name: activemodel
   prerelease: false
+  type: :runtime
   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'
-  type: :runtime
+  name: activesupport
   prerelease: false
+  type: :runtime
   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
-  type: :runtime
+  name: i18n
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "!="
       - !ruby/object:Gem::Version
         version: 1.3.0
 - !ruby/object:Gem::Dependency
-  name: orm_adapter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.0
-  type: :runtime
+  name: orm_adapter
   prerelease: false
+  type: :runtime
   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'
-  type: :development
+  name: guard
   prerelease: false
+  type: :development
   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'
-  type: :development
+  name: guard-rspec
   prerelease: false
+  type: :development
   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'
-  type: :development
+  name: guard-rubocop
   prerelease: false
+  type: :development
   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
-  type: :development
+  name: neo4j-rake_tasks
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.0
 - !ruby/object:Gem::Dependency
-  name: neo4j-ruby-driver
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.5
-  type: :development
+        version: 0.1.10
+  name: neo4j-java-driver
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.5
+        version: 0.1.10
 - !ruby/object:Gem::Dependency
-  name: os
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  name: os
   prerelease: false
+  type: :development
   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'
-  type: :development
+  name: pry
   prerelease: false
+  type: :development
   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'
-  type: :development
+  name: railties
   prerelease: false
+  type: :development
   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'
-  type: :development
+  name: rake
   prerelease: false
+  type: :development
   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
-  type: :development
+  name: rubocop
   prerelease: false
+  type: :development
   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'
-  type: :development
+  name: yard
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: dryspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  name: dryspec
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -392,7 +392,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"
@@ -407,15 +407,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.9
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubyforge_project: neo4j
+rubygems_version: 2.7.10
+signing_key:
 specification_version: 4
 summary: A graph database for Ruby
 test_files: []