neo4j-core 8.1.4 → 9.0.0.alpha.1

data/lib/neo4j/core/cypher_session/adaptors/bolt/chunk_writer_io.rb

@@ -13,7 +13,6 @@ class ChunkWriterIO < StringIO
 
   # Write some bytes, splitting into chunks if necessary.
   def write_with_chunking(string)
-    # Kernel.puts "Write!"
     until string.empty?
       future_size = @output_size + string.size
       if future_size >= MAX_CHUNK_SIZE
@@ -56,15 +55,12 @@ class ChunkWriterIO < StringIO
   def buffer_result(zero_chunk = false)
     result = ''
 
-    # Kernel.puts 'result1', result.inspect
     if !@output_buffer.empty?
       result << [@output_size].pack('s>*')
       result.concat(@output_buffer.join)
     end
 
-    # Kernel.puts 'result2', result.inspect
     result << "\x00\x00" if zero_chunk
-    # Kernel.puts 'result3', result.inspect
 
     result
   end

data/lib/neo4j/core/cypher_session/adaptors/bolt/pack_stream.rb

@@ -31,8 +31,10 @@ module Neo4j
         DE: [:struct, 32]
       }
       # For efficiency.  Translates directly from bytes to types
+      # Disabling because this needs to be able to change the hash inside the blocks
+      # There's probably a better way
       MARKER_TYPES.keys.each do |key|
-        ord = eval("0x#{key}") # rubocop:disable Security/Eval
+        ord = key.to_s.to_i(16)
         MARKER_TYPES[ord] = MARKER_TYPES.delete(key)
       end
 
@@ -42,6 +44,7 @@ module Neo4j
         MARKER_BYTES.delete(key) if key.is_a?(Array)
       end
 
+
       MARKER_HEADERS = MARKER_TYPES.each_with_object({}) do |(byte, (type, size)), headers|
         headers[type] ||= {}
         headers[type][size] = [byte].pack('C')
@@ -64,7 +67,7 @@ module Neo4j
           else
             case @object
             when Date, Time, DateTime then string_stream
-            when Integer, Float, String, Symbol, Array, Structure, Hash
+            when Integer, Float, String, Symbol, Array, Set, Structure, Hash
               send(@object.class.name.split('::').last.downcase + '_stream')
             end
           end
@@ -125,6 +128,8 @@ module Neo4j
           end.join
         end
 
+        alias set_stream array_stream
+
         def structure_stream
           fail 'Structure too big' if @object.list.size > 65_535
           marker_string(0xB0, 0xDC, @object.list.size) + [@object.signature].pack('C') + @object.list.map do |e|
@@ -252,7 +257,6 @@ module Neo4j
           Structure.new(shift_byte!, value_for_list!(size))
         end
 
-
         def shift_byte!
           shift_bytes!(1).first unless depleted?
         end

data/lib/neo4j/core/cypher_session/adaptors/embedded.rb

@@ -113,8 +113,7 @@ module Neo4j
             @engine ||= Java::OrgNeo4jCypherJavacompat::ExecutionEngine.new(@graph_db)
           end
 
-          def constraint_definitions_for(graph_db, label)
-          end
+          def constraint_definitions_for(graph_db, label); end
         end
       end
     end

data/lib/neo4j/core/cypher_session/adaptors/has_uri.rb

@@ -49,6 +49,10 @@ module Neo4j
             @uri = self.class.uri_from_url!(url)
           end
 
+          def url_without_password
+            @url_without_password ||= "#{scheme}://#{user + ':...@' if user}#{host}:#{port}"
+          end
+
           included do
             %w[scheme user password host port].each do |method|
               define_method(method) do

data/lib/neo4j/core/cypher_session/adaptors/http.rb

@@ -177,9 +177,7 @@ module Neo4j
               body_is_query_array = body.is_a?(Array) && body.all? { |o| o.respond_to?(:cypher) }
               case body
               when Hash, Array
-                if body_is_query_array
-                  return {statements: body.map(&self.class.method(:statement_from_query))}
-                end
+                return {statements: body.map(&self.class.method(:statement_from_query))} if body_is_query_array
 
                 body
               else

data/lib/neo4j/core/cypher_session/responses.rb

@@ -28,7 +28,7 @@ module Neo4j
             when :proc
               yield.wrap
             else
-              fail ArgumentError, "Inalid wrap_level: #{@wrap_level.inspect}"
+              fail ArgumentError, "Invalid wrap_level: #{@wrap_level.inspect}"
             end
           end
 

data/lib/neo4j/core/cypher_session/responses/bolt.rb

@@ -81,23 +81,6 @@ module Neo4j
             end
           end
 
-          def wrap_by_level(none_value)
-            case @wrap_level
-            when :none
-              if none_value.is_a?(Array)
-                none_value.map(&:symbolize_keys)
-              else
-                none_value.symbolize_keys
-              end
-            when :core_entity
-              yield
-            when :proc
-              yield.wrap
-            else
-              fail ArgumentError, "Invalid wrap_level: #{@wrap_level.inspect}"
-            end
-          end
-
           def wrap_node(id, labels, properties)
             wrap_by_level(properties) { ::Neo4j::Core::Node.new(id, labels, properties) }
           end

data/lib/neo4j/core/cypher_session/responses/embedded.rb

@@ -83,16 +83,18 @@ module Neo4j
           end
 
           def wrap_value(entity)
-            if entity.is_a?(Java::ScalaCollectionConvert::Wrappers::MapWrapper)
+            case entity
+            when Java::ScalaCollectionConvert::Wrappers::MapWrapper
               entity.each_with_object({}) { |(k, v), r| r[k.to_sym] = _wrap_entity(v) }
-            elsif entity.is_a?(Java::OrgNeo4jKernelImplCore::NodeProxy) ||
-                  entity.is_a?(Java::OrgNeo4jKernelImplCore::RelationshipProxy)
+            when Java::OrgNeo4jKernelImplCore::NodeProxy, Java::OrgNeo4jKernelImplCore::RelationshipProxy
               entity.property_keys.each_with_object({}) { |key, hash| hash[key.to_sym] = entity.get_property(key) }
-            elsif entity.respond_to?(:path_entities) || entity.is_a?(Java::ScalaCollectionConvert::Wrappers::SeqWrapper)
-              entity.to_a.map(&method(:_wrap_entity))
             else
-              # Convert from Java?
-              entity
+              if entity.respond_to?(:path_entities) || entity.is_a?(Java::ScalaCollectionConvert::Wrappers::SeqWrapper)
+                entity.to_a.map(&method(:_wrap_entity))
+              else
+                # Convert from Java?
+                entity.is_a?(Hash) ? entity.symbolize_keys : entity
+              end
             end
           end
 

data/lib/neo4j/core/cypher_session/responses/http.rb

@@ -29,12 +29,11 @@ module Neo4j
           end
 
           def wrap_entity(row_datum, rest_datum)
-            case
-            when rest_datum.is_a?(Array)
+            if rest_datum.is_a?(Array)
               row_datum.zip(rest_datum).map { |row, rest| wrap_entity(row, rest) }
-            when ident = identify_entity(rest_datum)
+            elsif ident = identify_entity(rest_datum)
               send("wrap_#{ident}", rest_datum, row_datum)
-            when rest_datum.is_a?(Hash)
+            elsif rest_datum.is_a?(Hash)
               rest_datum.each_with_object({}) do |(k, v), result|
                 result[k.to_sym] = wrap_entity(row_datum[k], v)
               end

data/lib/neo4j/core/cypher_session/transactions.rb

@@ -1,3 +1,5 @@
+require 'neo4j/transaction'
+
 module Neo4j
   module Core
     class CypherSession

data/lib/{neo4j-core → neo4j/core}/helpers.rb

@@ -1,3 +1,4 @@
+# TODO: Needed?
 module Neo4j
   module Core
     module TxMethods
@@ -13,19 +14,5 @@ module Neo4j
         end
       end
     end
-
-    module Config
-      def self.using_new_session?
-        ENV.key?('NEW_NEO4J_SESSIONS')
-      end
-
-      def self.wrapping_level(level = nil)
-        if level.nil?
-          @wrapping_level || :core_entity
-        else
-          @wrapping_level = level
-        end
-      end
-    end
   end
 end

data/lib/neo4j/core/logging.rb

@@ -0,0 +1,44 @@
+# Copied largely from activerecord/lib/active_record/log_subscriber.rb
+module Neo4j
+  module Core
+    module Logging
+      class << self
+        def first_external_path_and_line(callstack)
+          line = callstack.find do |frame|
+            frame.absolute_path && !ignored_callstack(frame.absolute_path)
+          end
+
+          offending_line = line || callstack.first
+
+          [offending_line.path,
+           offending_line.lineno]
+        end
+
+        NEO4J_CORE_GEM_ROOT = File.expand_path('../../..', __dir__) + '/'
+
+        def ignored_callstack(path)
+          paths_to_ignore.any?(&path.method(:start_with?))
+        end
+
+        def paths_to_ignore
+          @paths_to_ignore ||= [NEO4J_CORE_GEM_ROOT,
+                                RbConfig::CONFIG['rubylibdir'],
+                                neo4j_gem_path,
+                                active_support_gem_path].compact
+        end
+
+        def neo4j_gem_path
+          return if !defined?(::Rails.root)
+
+          @neo4j_gem_path ||= File.expand_path('../../..', Neo4j::ActiveBase.method(:current_session).source_location[0])
+        end
+
+        def active_support_gem_path
+          return if !defined?(::ActiveSupport::Notifications)
+
+          @active_support_gem_path ||= File.expand_path('../../..', ActiveSupport::Notifications.method(:subscribe).source_location[0])
+        end
+      end
+    end
+  end
+end

data/lib/{neo4j-core → neo4j/core}/query.rb

@@ -1,4 +1,5 @@
-require 'neo4j-core/query_clauses'
+require 'neo4j/core/query_clauses'
+require 'neo4j/core/query_find_in_batches'
 require 'active_support/notifications'
 
 module Neo4j
@@ -67,7 +68,7 @@ module Neo4j
       end
 
       def initialize(options = {})
-        @session = options.key?(:session) ? options[:session] : Neo4j::Session.current
+        @session = options[:session]
 
         @options = options
         @clauses = []
@@ -174,9 +175,9 @@ module Neo4j
 
         DEFINED_CLAUSES[clause.to_sym] = clause_class
         define_method(clause) do |*args|
-          build_deeper_query(clause_class, args).ergo do |result|
-            BREAK_METHODS.include?(clause) ? result.break : result
-          end
+          result = build_deeper_query(clause_class, args)
+
+          BREAK_METHODS.include?(clause) ? result.break : result
         end
       end
 
@@ -201,7 +202,7 @@ module Neo4j
       # @example
       #    # Creates a query representing the cypher: MATCH (n:Person) SET n.age = 19
       #    Query.new.match(n: :Person).set_props(n: {age: 19})
-      def set_props(*args)
+      def set_props(*args) # rubocop:disable Naming/AccessorMethodName
         build_deeper_query(SetClause, args, set_props: true)
       end
 

data/lib/{neo4j-core → neo4j/core}/query_clauses.rb

@@ -30,7 +30,7 @@ module Neo4j
 
           [String, Symbol, Integer, Hash, NilClass].each do |arg_class|
             from_method = "from_#{arg_class.name.downcase}"
-            return @value = send(from_method, @arg) if @arg.is_a?(arg_class) && self.respond_to?(from_method)
+            return @value = send(from_method, @arg) if @arg.is_a?(arg_class) && respond_to?(from_method)
           end
 
           fail ArgError
@@ -42,12 +42,10 @@ module Neo4j
         end
 
         def from_hash(value)
-          if self.respond_to?(:from_key_and_value)
-            value.map do |k, v|
-              from_key_and_value k, v
-            end
-          else
-            fail ArgError
+          fail ArgError if !respond_to?(:from_key_and_value)
+
+          value.map do |k, v|
+            from_key_and_value k, v
           end
         end
 
@@ -64,9 +62,7 @@ module Neo4j
 
           prefix_value = value
           if value.is_a?(Hash)
-            prefix_value = if value.values.any? { |v| v.is_a?(Hash) }
-                             value.keys.join(UNDERSCORE)
-                           end
+            prefix_value = (value.keys.join(UNDERSCORE) if value.values.any? { |v| v.is_a?(Hash) })
           end
 
           prefix_array = [key, prefix_value].tap(&:compact!).join(UNDERSCORE)
@@ -107,7 +103,6 @@ module Neo4j
           value.values.any? { |v| v.is_a?(Hash) }
         end
 
-
         def attributes_from_key_and_value(_key, value)
           return nil unless value.is_a?(Hash)
 
@@ -150,7 +145,7 @@ module Neo4j
             strings = clause_strings(clauses)
             stripped_string = strings.join(join_string)
             stripped_string.strip!
-            (pretty && strings.size > 1) ? PRETTY_NEW_LINE + stripped_string : stripped_string
+            pretty && strings.size > 1 ? PRETTY_NEW_LINE + stripped_string : stripped_string
           end
 
           def clause_join
@@ -208,9 +203,7 @@ module Neo4j
         end
 
         def format_label(label_arg)
-          if label_arg.is_a?(Array)
-            return label_arg.map { |arg| format_label(arg) }.join
-          end
+          return label_arg.map { |arg| format_label(arg) }.join if label_arg.is_a?(Array)
 
           label_arg = label_arg.to_s
           label_arg.strip!
@@ -552,7 +545,7 @@ module Neo4j
           from_string(value)
         end
 
-        def from_nilclass(value)
+        def from_nilclass(_value)
           ''
         end
 

data/lib/{neo4j-core → neo4j/core}/query_find_in_batches.rb

@@ -24,10 +24,8 @@ module Neo4j
         end
       end
 
-      def find_each(*args)
-        find_in_batches(*args) do |batch|
-          batch.each { |result| yield result }
-        end
+      def find_each(*args, &block)
+        find_in_batches(*args) { |batch| batch.each(&block) }
       end
 
       private
@@ -41,7 +39,7 @@ module Neo4j
         last_record.send(node_var).send(prop_var)
       rescue NoMethodError
         begin
-          last_record.send(node_var)[prop_var.to_sym]
+          last_record.send(node_var).properties[prop_var.to_sym]
         rescue NoMethodError
           last_record.send("#{node_var}.#{prop_var}") # In case we're explicitly returning it
         end

data/lib/{neo4j-core → neo4j/core}/version.rb

@@ -1,5 +1,5 @@
 module Neo4j
   module Core
-    VERSION = '8.1.4'
+    VERSION = '9.0.0.alpha.1'
   end
 end

data/lib/neo4j/transaction.rb

@@ -145,17 +145,15 @@ module Neo4j
     # To support old syntax of providing run_in_tx first
     # But session first is ideal
     def session_and_run_in_tx_from_args(args)
+      fail ArgumentError, 'Too few arguments' if args.empty?
       fail ArgumentError, 'Too many arguments' if args.size > 2
 
-      if args.empty?
-        [Session.current!, true]
-      else
-        result = args.dup
-        if result.size == 1
-          result << ([true, false].include?(args[0]) ? Session.current! : true)
-        end
+      if args.size == 1
+        fail ArgumentError, 'Session must be specified' if !args[0].is_a?(Neo4j::Core::CypherSession)
 
-        [true, false].include?(result[0]) ? result.reverse : result
+        [args[0], true]
+      else
+        [true, false].include?(args[0]) ? args.reverse : args.dup
       end
     end
 

data/neo4j-core.gemspec

@@ -1,12 +1,12 @@
-lib = File.expand_path('../lib/', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift lib unless $LOAD_PATH.include?(lib)
 
-require 'neo4j-core/version'
+require 'neo4j/core/version'
 
 Gem::Specification.new do |s|
   s.name     = 'neo4j-core'
   s.version  = Neo4j::Core::VERSION
-  s.required_ruby_version = '>= 1.9.3'
+  s.required_ruby_version = '>= 2.1.0'
 
   s.authors  = 'Andreas Ronge, Chris Grigg, Brian Underwood'
   s.email    = 'andreas.ronge@gmail.com, chris@subvertallmedia.com, brian@brian-underwood.codes'
@@ -14,9 +14,9 @@ Gem::Specification.new do |s|
   s.summary = 'A basic library to work with the graph database Neo4j.'
   s.license = 'MIT'
 
-  s.description = <<-EOF
-Neo4j-core provides classes and methods to work with the graph database Neo4j.
-  EOF
+  s.description = <<-DESCRIPTION
+    Neo4j-core provides classes and methods to work with the graph database Neo4j.
+DESCRIPTION
 
   s.require_path = 'lib'
   s.files = Dir.glob('{bin,lib,config}/**/*') + %w[README.md Gemfile neo4j-core.gemspec]
@@ -38,19 +38,21 @@ Neo4j-core provides classes and methods to work with the graph database Neo4j.
   s.add_dependency('httpclient')
   s.add_dependency('json')
   s.add_dependency('multi_json')
+  s.add_dependency('net_tcp_client', '>= 2.0.1')
   s.add_dependency('typhoeus', '>= 1.1.2')
 
+  s.add_development_dependency('dryspec')
   s.add_development_dependency('neo4j-rake_tasks', '>= 0.3.0')
   s.add_development_dependency('pry')
   s.add_development_dependency('simplecov')
   s.add_development_dependency('yard')
 
   if RUBY_PLATFORM == 'java'
-    s.add_dependency('neo4j-community', '>= 2.1.1')
+    s.add_development_dependency('neo4j-community', '>= 2.1.1')
     s.add_development_dependency 'ruby-debug'
-  else
-    s.add_development_dependency('guard')
-    s.add_development_dependency('guard-rubocop')
-    s.add_development_dependency('rubocop', '~> 0.49.1')
   end
+
+  s.add_development_dependency('guard')
+  s.add_development_dependency('guard-rubocop')
+  s.add_development_dependency('rubocop', '~> 0.56.0')
 end