neo4j 9.6.2 → 10.0.0.pre.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a03fea8bd94bd82ee1f7dc8379be2d7b32522255094efa953ee916dbbd98e24d
-  data.tar.gz: 974ce13ddb60fd778a425aad98590d858af5ed3a1424f6f818bb28d3b72fd92f
+  metadata.gz: 7ad62d7a9aef94c37ee1bee3ec34b94aa539240ddaf7fb3d0bd6081685569d70
+  data.tar.gz: b1f6a1a5bb2acb59ddaa364141e80aaad3fcf6d978fdf4c0b4301b934abd27bd
 SHA512:
-  metadata.gz: cbf90843f2a0d208170a8e232141d9e8f49a259b62e7d3ac51a23a951c906e9bb785105c49a8372198d0628cc70db25c64c40eeabec9bd6115d6694be2afaafb
-  data.tar.gz: d956459329732c7578d2fb7a58754dbce96811145baec33bd9b83812e13a91311f9aa84065a0ba5d0c103e16aff4fe7b025ddca93556e5585d023ea3200ceac3
+  metadata.gz: b6af43cca75d102ee54a0869dc72fbe2ea3337c49999591d0072caaf9bbceac05b8de0dfb092d8adf5a8d1f3b86a3527344883ca06b3909ed4d88017be19b30e
+  data.tar.gz: '08b1201082c9bf09557a5cc890e4c92b7b2c9fa1e7bcbfb05851369f8ff6df42dadb84761a47cfb8cf164d976b7976beff404177a56d1b13e12a9d1dcc8f80e5'

data/CHANGELOG.md

@@ -3,19 +3,6 @@ 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.2] 2020-04-09
-
-## Fixes
-
-- Perform separate tranactions around schema-load and migrations-update
-  to allow the seabolt driver to load schemas (#1599)
-
-## [9.6.1] 2019-12-18
-
-## Fixed
-
-- Fixed duplicate records with with_associations on QueryProxy. (#1576)
-
 ## [9.6.0] 2019-09-3
 
 ## Added

data/CONTRIBUTORS

@@ -1,4 +1,8 @@
 Maintainers:
+  Heinrich Klobuczek <klobuczek @ GitHub>
+  Amit Suryanvanshi <amitsuryavanshi @ GitHub>
+
+Previous Maintainers:
   Chris Grigg <subvertallchris @ GitHub>
   Brian Underwood <cheerfulstoic @ GitHub>
 

data/Gemfile

@@ -2,47 +2,16 @@ source 'http://rubygems.org'
 
 gemspec
 
-# gem 'neo4j-core', github: 'neo4jrb/neo4j-core', branch: 'master' if ENV['CI']
-
-branch = ENV['NEO4J_CORE_BRANCH'] || ENV['TRAVIS_PULL_REQUEST_BRANCH'] || ENV['TRAVIS_BRANCH']
-slug = !ENV['TRAVIS_PULL_REQUEST_SLUG'].to_s.empty? ? ENV['TRAVIS_PULL_REQUEST_SLUG'] : ENV['TRAVIS_REPO_SLUG']
-if branch
-  command = "curl --head https://github.com/#{slug}-core/tree/#{branch} | head -1"
-  result = `#{command}`
-  if result =~ /200 OK/
-    gem 'neo4j-core', github: "#{slug}-core", branch: branch
-  else
-    gem 'neo4j-core', github: 'neo4jrb/neo4j-core', branch: 'master'
-  end
-elsif ENV['USE_LOCAL_CORE']
-  gem 'neo4j-core', path: '../neo4j-core'
-else
-  gem 'neo4j-core'
-end
-
-# gem 'active_attr', github: 'neo4jrb/active_attr', branch: 'performance'
-# gem 'active_attr', path: '../active_attr'
+# gem 'neo4j-ruby-driver', path: '../neo4j-ruby-driver'
 
 gem 'listen', '< 3.1'
 
 active_model_version = ENV['ACTIVE_MODEL_VERSION']
 gem 'activemodel', "~> #{active_model_version}" if active_model_version
 
-if RUBY_VERSION.to_f < 2.2
-  gem 'activemodel', '~> 4.2'
-  gem 'activesupport', '~> 4.2'
-  gem 'railties', '~> 4.2'
-end
-
 group 'test' do
   gem 'coveralls', require: false
-  if RUBY_VERSION.to_f < 2.0
-    gem 'term-ansicolor', '< 1.4'
-    gem 'tins', '< 1.7'
-    gem 'overcommit', '< 0.35.0'
-  else
-    gem 'overcommit'
-  end
+  gem 'overcommit'
   gem 'codecov', require: false
   gem 'simplecov', require: false
   gem 'simplecov-html', require: false

data/lib/neo4j.rb

@@ -1,17 +1,17 @@
 require 'forwardable'
 require 'neo4j/version'
 
-require 'neo4j-core'
+require 'neo4j/core'
 require 'neo4j/core/query_ext' # From this gem
 
 require 'neo4j/active_base'
 require 'neo4j/model_schema'
-require 'neo4j/active_base/session_registry'
 
 require 'active_model'
 require 'active_support/concern'
 require 'active_support/core_ext/class/attribute.rb'
 require 'active_support/core_ext/class/subclasses.rb'
+require 'active_support/core_ext/module/attribute_accessors'
 require 'json'
 
 require 'neo4j/errors'
@@ -97,6 +97,10 @@ require 'neo4j/active_node/query'
 require 'neo4j/active_node/scope'
 require 'neo4j/active_node'
 
+require 'active_support/concern'
+require 'neo4j/core/cypher_error'
+require 'neo4j/core/schema_errors'
+
 module Neo4j
   extend ActiveSupport::Autoload
   autoload :Migrations

data/lib/neo4j/active_base.rb

@@ -4,8 +4,8 @@ module Neo4j
   module ActiveBase
     class << self
       # private?
-      def current_session
-        (SessionRegistry.current_session ||= establish_session).tap do |session|
+      def current_driver
+        (@driver ||= establish_session).tap do |session|
           fail 'No session defined!' if session.nil?
         end
       end
@@ -15,57 +15,59 @@ module Neo4j
       end
 
       def establish_session
-        make_session_wrap!(@establish_session_block.call) if @establish_session_block
+        @establish_session_block.call if @establish_session_block
+      end
+
+      def new_driver(url, options = {})
+        verbose_query_logs = Neo4j::Config.fetch(:verbose_query_logs, false)
+        Neo4j::Core::Driver
+          .new(url, options.merge(verbose_query_logs: verbose_query_logs))
       end
 
       def current_transaction_or_session
-        current_transaction || current_session
+        current_transaction || Transaction
       end
 
       def query(*args)
         current_transaction_or_session.query(*args)
       end
 
-      # Should support setting session via config options
-      def current_session=(session)
-        SessionRegistry.current_session = make_session_wrap!(session)
-      end
-
-      def current_adaptor=(adaptor)
-        self.current_session = Neo4j::Core::CypherSession.new(adaptor)
+      # Should support setting driver via config options
+      def driver=(driver)
+        @driver = driver
       end
 
       def run_transaction(run_in_tx = true)
-        Neo4j::Transaction.run(current_session, run_in_tx) do |tx|
+        Neo4j::Transaction.run(current_driver, run_in_tx) do |tx|
           yield tx
         end
       end
 
       def new_transaction
         validate_model_schema!
-        Neo4j::Transaction.new(current_session)
+        Neo4j::Transaction.new
       end
 
       def new_query(options = {})
         validate_model_schema!
-        Neo4j::Core::Query.new({session: current_session}.merge(options))
+        Neo4j::Core::Query.new({session: current_driver}.merge(options))
       end
 
       def magic_query(*args)
         if args.empty? || args.map(&:class) == [Hash]
           ActiveBase.new_query(*args)
         else
-          ActiveBase.current_session.query(*args)
+          ActiveBase.current_driver.query(*args)
         end
       end
 
       def current_transaction
         validate_model_schema!
-        Neo4j::Transaction.current_for(current_session)
+        Neo4j::Transaction.root
       end
 
       def label_object(label_name)
-        Neo4j::Core::Label.new(label_name, current_session)
+        Neo4j::Core::Label.new(label_name)
       end
 
       def logger
@@ -77,11 +79,6 @@ module Neo4j
       def validate_model_schema!
         Neo4j::ModelSchema.validate_model_schema! unless Neo4j::Migrations.currently_running_migrations
       end
-
-      def make_session_wrap!(session)
-        session.adaptor.instance_variable_get('@options')[:wrap_level] = :proc
-        session
-      end
     end
   end
 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 ||= []).tap { |results| results << object unless results.include?(object) }
+        (@cached_result ||= []) << object
       end
 
       def rels

data/lib/neo4j/active_node/labels.rb

@@ -41,11 +41,6 @@ module Neo4j
         @_persisted_obj.labels.uniq!
       end
 
-      # Remove this method in 9.0.0
-      def add_label(*_labels)
-        fail 'add_label has been removed in favor of `add_labels`'
-      end
-
       # Removes one or more labels
       # Be careful, don't remove the label representing the Ruby class.
       # @see Neo4j-core
@@ -56,11 +51,6 @@ module Neo4j
         labels.each(&@_persisted_obj.labels.method(:delete))
       end
 
-      # Remove this method in 9.0.0
-      def remove_label(*_labels)
-        fail 'remove_label has been removed in favor of `remove_labels`'
-      end
-
       def self._wrapped_classes
         WRAPPED_CLASSES
       end
@@ -141,7 +131,7 @@ module Neo4j
 
         # @return [Neo4j::Label] the label for this class
         def mapped_label
-          Neo4j::Core::Label.new(mapped_label_name, neo4j_session)
+          Neo4j::Core::Label.new(mapped_label_name)
         end
 
         def base_class

data/lib/neo4j/active_node/node_wrapper.rb

@@ -9,7 +9,7 @@ wrapping_proc = proc do |node|
     wrapped_node.init_on_load(node, node.props)
   end
 end
-Neo4j::Core::Node.wrapper_callback(wrapping_proc)
+Neo4j::Driver::Types::Node.wrapper_callback(wrapping_proc)
 
 module Neo4j
   module NodeWrapping

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

@@ -27,7 +27,7 @@ module Neo4j
           query_with_target(identifier) do |target|
             begin
               self.query.with(target).optional_match("(#{target})-[#{target}_rel]-()").delete("#{target}, #{target}_rel").exec
-            rescue Neo4j::Core::CypherSession::CypherError # <=- Seems hacky
+            rescue Neo4j::Core::CypherError # <=- Seems hacky
               self.query.delete(target).exec
             end
             clear_source_object_cache

data/lib/neo4j/active_rel/rel_wrapper.rb

@@ -3,7 +3,7 @@ require 'neo4j/core/relationship'
 wrapping_proc = proc do |relationship|
   Neo4j::RelWrapping.wrapper(relationship)
 end
-Neo4j::Core::Relationship.wrapper_callback(wrapping_proc)
+Neo4j::Driver::Types::Relationship.wrapper_callback(wrapping_proc)
 
 module Neo4j
   module RelWrapping
@@ -24,7 +24,7 @@ module Neo4j
       end
 
       def class_from_type(rel_type)
-        Neo4j::ActiveRel::Types::WRAPPED_CLASSES[rel_type] || Neo4j::ActiveRel::Types::WRAPPED_CLASSES[rel_type] = rel_type.to_s.camelize
+        Neo4j::ActiveRel::Types::WRAPPED_CLASSES[rel_type] || Neo4j::ActiveRel::Types::WRAPPED_CLASSES[rel_type] = rel_type.to_s.downcase.camelize
       end
     end
   end

data/lib/neo4j/ansi.rb

@@ -0,0 +1,14 @@
+module Neo4j
+  module ANSI
+    CLEAR = "\e[0m"
+    BOLD = "\e[1m"
+
+    RED = "\e[31m"
+    GREEN = "\e[32m"
+    YELLOW = "\e[33m"
+    BLUE = "\e[34m"
+    MAGENTA = "\e[35m"
+    CYAN = "\e[36m"
+    WHITE = "\e[37m"
+  end
+end

data/lib/neo4j/core.rb

@@ -0,0 +1,14 @@
+require 'neo4j/transaction'
+require 'neo4j/core/instrumentable'
+require 'neo4j/core/query'
+require 'neo4j/core/driver'
+require 'neo4j/core/responses'
+
+require 'neo4j_ruby_driver'
+require 'neo4j/core/wrappable'
+require 'neo4j/core/node'
+require 'neo4j/core/relationship'
+
+Neo4j::Driver::Types::Entity.include Neo4j::Core::Wrappable
+Neo4j::Driver::Types::Node.prepend Neo4j::Core::Node
+Neo4j::Driver::Types::Relationship.include Neo4j::Core::Relationship

data/lib/neo4j/core/connection_failed_error.rb

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

data/lib/neo4j/core/cypher_error.rb

@@ -0,0 +1,37 @@
+module Neo4j
+  module Core
+    class CypherError < StandardError
+      attr_reader :code, :original_message, :stack_trace
+
+      def initialize(code = nil, original_message = nil, stack_trace = nil)
+        @code = code
+        @original_message = original_message
+        @stack_trace = stack_trace
+
+        msg = <<-ERROR
+  Cypher error:
+  #{ANSI::CYAN}#{code}#{ANSI::CLEAR}: #{original_message}
+  #{stack_trace}
+        ERROR
+        super(msg)
+      end
+
+      def self.new_from(code, message, stack_trace = nil)
+        error_class_from(code).new(code, message, stack_trace)
+      end
+
+      def self.error_class_from(code)
+        case code
+        when /(ConstraintValidationFailed|ConstraintViolation)/
+          SchemaErrors::ConstraintValidationFailedError
+        when /IndexAlreadyExists/
+          SchemaErrors::IndexAlreadyExistsError
+        when /ConstraintAlreadyExists/ # ?????
+          SchemaErrors::ConstraintAlreadyExistsError
+        else
+          CypherError
+        end
+      end
+    end
+  end
+end

data/lib/neo4j/core/driver.rb

@@ -0,0 +1,83 @@
+require 'active_support/core_ext/module/attribute_accessors'
+require 'neo4j/core/logging'
+require 'neo4j/core/has_uri'
+
+module Neo4j
+  module Core
+    class Driver
+      include HasUri
+
+      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|
+        uri.scheme == 'bolt'
+      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
+          password = uri.password
+          auth_token = if user
+                         Neo4j::Driver::AuthTokens.basic(user, password)
+                       else
+                         Neo4j::Driver::AuthTokens.none
+                       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
+
+      def logger
+        return @logger if @logger
+
+        @logger = if @options[:logger]
+                    @options[:logger]
+                  else
+                    Logger.new(logger_location).tap do |logger|
+                      logger.level = logger_level
+                    end
+                  end
+      end
+
+      private
+
+      def logger_location
+        @options[:logger_location] || STDOUT
+      end
+
+      def logger_level
+        @options[:logger_level] || Logger::WARN
+      end
+    end
+  end
+end