neo4j 9.6.2 → 10.0.0.pre.alpha.1

data/lib/neo4j/version.rb

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

data/neo4j.gemspec

@@ -10,8 +10,8 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = ((RUBY_PLATFORM == 'java') ? '>= 1.9.3' : '>= 2.1.9')
 
-  s.authors  = 'Andreas Ronge, Brian Underwood, Chris Grigg'
-  s.email    = 'andreas.ronge@gmail.com, public@brian-underwood.codes, chris@subvertallmedia.com'
+  s.authors  = 'Andreas Ronge, Brian Underwood, Chris Grigg, Heinrich Klobuczek'
+  s.email    = 'andreas.ronge@gmail.com, public@brian-underwood.codes, chris@subvertallmedia.com, heinrich@mail.com'
   s.homepage = 'https://github.com/neo4jrb/neo4j/'
   s.rubyforge_project = 'neo4j'
   s.summary = 'A graph database for Ruby'
@@ -22,7 +22,7 @@ DESCRIPTION
 
   s.require_path = 'lib'
   s.files = Dir.glob('{bin,lib,config}/**/*') + %w(README.md CHANGELOG.md CONTRIBUTORS Gemfile neo4j.gemspec)
-  s.executables = ['neo4j-jars']
+  s.executables = []
   s.extra_rdoc_files = %w( README.md )
   s.rdoc_options = ['--quiet', '--title', 'Neo4j.rb', '--line-numbers', '--main', 'README.rdoc', '--inline-source']
   s.metadata = {
@@ -35,17 +35,17 @@ 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('neo4j-core', '>= 9.0.0')
   s.add_dependency('orm_adapter', '~> 0.5.0')
   s.add_development_dependency('guard')
   s.add_development_dependency('guard-rspec')
   s.add_development_dependency('guard-rubocop')
-  s.add_development_dependency('neo4j-community', '~> 2.0') if RUBY_PLATFORM =~ /java/
   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('os')
   s.add_development_dependency('pry')
   s.add_development_dependency('railties', '>= 4.0')
   s.add_development_dependency('rake')
   s.add_development_dependency('rubocop', '~> 0.56.0')
   s.add_development_dependency('yard')
+  s.add_development_dependency('dryspec')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j
 version: !ruby/object:Gem::Version
-  version: 9.6.2
+  version: 10.0.0.pre.alpha.1
 platform: ruby
 authors:
-- Andreas Ronge, Brian Underwood, Chris Grigg
+- Andreas Ronge, Brian Underwood, Chris Grigg, Heinrich Klobuczek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-09 00:00:00.000000000 Z
+date: 2019-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -52,20 +52,6 @@ dependencies:
     - - "!="
       - !ruby/object:Gem::Version
         version: 1.3.0
-- !ruby/object:Gem::Dependency
-  name: neo4j-core
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 9.0.0
-  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
@@ -136,6 +122,20 @@ dependencies:
     - - ">="
       - !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
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.5
 - !ruby/object:Gem::Dependency
   name: os
   requirement: !ruby/object:Gem::Requirement
@@ -220,12 +220,26 @@ dependencies:
     - - ">="
       - !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
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 'A Neo4j OGM (Object-Graph-Mapper) for Ruby heavily inspired by ActiveRecord.
 
   '
-email: andreas.ronge@gmail.com, public@brian-underwood.codes, chris@subvertallmedia.com
-executables:
-- neo4j-jars
+email: andreas.ronge@gmail.com, public@brian-underwood.codes, chris@subvertallmedia.com,
+  heinrich@mail.com
+executables: []
 extensions: []
 extra_rdoc_files:
 - README.md
@@ -234,14 +248,12 @@ files:
 - CONTRIBUTORS
 - Gemfile
 - README.md
-- bin/neo4j-jars
 - bin/rake
 - config/locales/en.yml
 - config/neo4j/add_classnames.yml
 - config/neo4j/config.yml
 - lib/neo4j.rb
 - lib/neo4j/active_base.rb
-- lib/neo4j/active_base/session_registry.rb
 - lib/neo4j/active_node.rb
 - lib/neo4j/active_node/callbacks.rb
 - lib/neo4j/active_node/dependent.rb
@@ -290,9 +302,30 @@ files:
 - lib/neo4j/active_rel/related_node.rb
 - lib/neo4j/active_rel/types.rb
 - lib/neo4j/active_rel/validations.rb
+- lib/neo4j/ansi.rb
 - lib/neo4j/class_arguments.rb
 - lib/neo4j/config.rb
+- lib/neo4j/core.rb
+- lib/neo4j/core/connection_failed_error.rb
+- lib/neo4j/core/cypher_error.rb
+- lib/neo4j/core/driver.rb
+- lib/neo4j/core/has_uri.rb
+- lib/neo4j/core/instrumentable.rb
+- lib/neo4j/core/label.rb
+- lib/neo4j/core/logging.rb
+- lib/neo4j/core/node.rb
+- lib/neo4j/core/querable.rb
+- lib/neo4j/core/query.rb
+- lib/neo4j/core/query_builder.rb
+- lib/neo4j/core/query_clauses.rb
 - lib/neo4j/core/query_ext.rb
+- lib/neo4j/core/query_find_in_batches.rb
+- lib/neo4j/core/relationship.rb
+- lib/neo4j/core/responses.rb
+- lib/neo4j/core/result.rb
+- lib/neo4j/core/schema.rb
+- lib/neo4j/core/schema_errors.rb
+- lib/neo4j/core/wrappable.rb
 - lib/neo4j/errors.rb
 - lib/neo4j/migration.rb
 - lib/neo4j/migrations.rb
@@ -310,7 +343,6 @@ files:
 - lib/neo4j/paginated.rb
 - lib/neo4j/railtie.rb
 - lib/neo4j/schema/operation.rb
-- lib/neo4j/session_manager.rb
 - lib/neo4j/shared.rb
 - lib/neo4j/shared/attributes.rb
 - lib/neo4j/shared/callbacks.rb
@@ -338,6 +370,7 @@ files:
 - lib/neo4j/timestamps.rb
 - lib/neo4j/timestamps/created.rb
 - lib/neo4j/timestamps/updated.rb
+- lib/neo4j/transaction.rb
 - lib/neo4j/type_converters.rb
 - lib/neo4j/undeclared_properties.rb
 - lib/neo4j/version.rb
@@ -377,11 +410,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.1.9
 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.0.6
 signing_key: 
 specification_version: 4
 summary: A graph database for Ruby

data/bin/neo4j-jars

@@ -1,33 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'neo4j'
-
-if ARGV.empty?
-  puts <<TEXT
-A tool for copying jar files needed by the application server, like trinidad
-It copies all jar files which has been required (neo4j-community, neo4j-advanced or neo4j-enterprise) to the lib folder of the current directory
-
-  Usage: neo4j-jars <community|advanced|enterprise>
-
-TEXT
-  exit
-end
-
-if ARGV.include?('community')
-  require 'neo4j-community' # not really needed
-elsif ARGV.include?('advanced')
-  require 'neo4j-advanced' # not really needed
-elsif ARGV.include?('enterprise')
-  require 'neo4j-enterprise' # not really needed
-else
-  puts 'Expected community, advanced, enterprise'
-  exit(-1)
-end
-
-lib_dir = File.join(Dir.pwd, 'lib')
-fail "Expected a lib folder where to copy the jars file, mkdir #{lib_dir}? " unless File.exist?(lib_dir)
-
-files = $CLASSPATH.find_all { |x| x =~ /\.jar$/ }.collect { |y| y.sub('file:', '') }
-files.each { |file| FileUtils.cp(file, lib_dir) }
-
-puts "copied #{files.size} files to #{lib_dir}"

data/lib/neo4j/active_base/session_registry.rb

@@ -1,12 +0,0 @@
-require 'active_support/per_thread_registry'
-
-module Neo4j
-  module ActiveBase
-    # Provides a simple API to manage sessions in a thread-safe manner
-    class SessionRegistry
-      extend ActiveSupport::PerThreadRegistry
-
-      attr_accessor :current_session
-    end
-  end
-end

data/lib/neo4j/session_manager.rb

@@ -1,78 +0,0 @@
-require 'active_support/core_ext/hash'
-require 'active_support/ordered_options'
-
-module Neo4j
-  class SessionManager
-    class << self
-      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)
-
-        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)
-        options[:adaptor_class] || adaptor_class_by_type(type.to_sym)
-      end
-
-      protected
-
-      def session_type_is_embedded?(session_type)
-        [:embedded_db, :embedded].include?(session_type)
-      end
-
-      def enable_unlimited_strength_crypto!
-        # See https://github.com/jruby/jruby/wiki/UnlimitedStrengthCrypto
-        security_class = java.lang.Class.for_name('javax.crypto.JceSecurity')
-        restricted_field = security_class.get_declared_field('isRestricted')
-        restricted_field.accessible = true
-        restricted_field.set nil, false
-      end
-
-      def cypher_session_adaptor(type, path_or_url, options = {})
-        adaptor_class(type, options).new(path_or_url, options)
-      end
-
-      def java_platform?
-        RUBY_PLATFORM =~ /java/
-      end
-
-      def wait_and_retry(session)
-        Timeout.timeout(60) do
-          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
-
-      def adaptor_class_by_type(type)
-        ActiveSupport::Deprecation.warn('`embedded_db` session type is deprecated, please use `embedded`') if type == :embedded_db
-        case type
-        when :embedded_db, :embedded
-          require 'neo4j/core/cypher_session/adaptors/embedded'
-          Neo4j::Core::CypherSession::Adaptors::Embedded
-        when :http
-          require 'neo4j/core/cypher_session/adaptors/http'
-          Neo4j::Core::CypherSession::Adaptors::HTTP
-        when :bolt
-          require 'neo4j/core/cypher_session/adaptors/bolt'
-          Neo4j::Core::CypherSession::Adaptors::Bolt
-        else
-          extra = ' (`server_db` has been replaced by `http` or `bolt`)'
-          fail ArgumentError, "Invalid session type: #{type.inspect} (expected one of [:http, :bolt, :embedded])#{extra if type == :server_db}"
-        end
-      end
-    end
-  end
-end