neo4j-ruby-driver 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d65c2ee6760cec8fc521979b62cda83acc9ffe0ff2c5f0d190b9afcf6923aa7
-  data.tar.gz: 54199c67bc880e059ad3280956b7b628969e91a4e7fd43838ad23c9bf5334c34
+  metadata.gz: f25d2880441e748a0152d2f23afa956891bde3fd90e9c15886e21784ef0da61b
+  data.tar.gz: 82edb2e592d1fd45f895290d49f5f7d6533193e2406d7eadae89d0344082f986
 SHA512:
-  metadata.gz: eecc477146f649aabf6ef8aae6a3c52391f2afba6ab37b495446b5cb5c0e2cd503247327e99e7e03ed4f624f5dca857bc0caf71cdd042a108ef426c412695e7d
-  data.tar.gz: 39489c64659ef01d68b8d9920a366a9a46031e40a7aa65cb385b91a315ece2c949a7aa2cb0fcf10e12e90bc9dbca5f106a0bf0c140eb9cdac937faba8076d48d
+  metadata.gz: 29f37f4671b277a5b276f43bd4549a998f0ca17fbd80cfd41128d98e84fa9d64d594cfd271600e27f5fa9d20d0f33dab08c7c378790921143d5a0cf6441a9d2f
+  data.tar.gz: d2012cb64c0336afbfdf7e15b18f38295f35f1d4c88da068ce73abf8743bd672a800f984962040c70c9f6c64b65bbfc5d3e09a5eb881c60e5c714894ee019d2e

data/ffi/bolt/config.rb

@@ -5,6 +5,8 @@ module Bolt
     extend Bolt::Library
     attach_function :create, :BoltConfig_create, [], :auto_pointer
     attach_function :destroy, :BoltConfig_destroy, [:pointer], :void
+    attach_function :get_log, :BoltConfig_get_log, [:pointer], :pointer
+    attach_function :set_log, :BoltConfig_set_log, %i[pointer pointer], :int32
     attach_function :set_user_agent, :BoltConfig_set_user_agent, %i[pointer string], :int32
   end
 end

data/ffi/bolt/log.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Bolt
+  module Log
+    extend Bolt::Library
+
+    callback :log_func, %i[pointer string], :void
+
+    attach_function :create, :BoltLog_create, %i[pointer], :auto_pointer
+    attach_function :destroy, :BoltLog_create, %i[pointer], :void
+    attach_function :set_error_func, :BoltLog_create, %i[pointer log_func], :void
+    attach_function :set_warning_func, :BoltLog_set_warning_func, %i[pointer log_func], :void
+    attach_function :set_info_func, :BoltLog_set_info_func, %i[pointer log_func], :void
+    attach_function :set_debug_func, :BoltLog_set_debug_func, %i[pointer log_func], :void
+  end
+end

data/ffi/neo4j/driver.rb

@@ -40,6 +40,7 @@ require 'active_support/core_ext/array/grouping'
 require 'concurrent/atomic/atomic_boolean'
 require 'concurrent/atomic/atomic_reference'
 require 'ffi'
+require 'fiddle'
 require 'loader'
 require 'recursive-open-struct'
 

data/ffi/neo4j/driver/graph_database.rb

@@ -16,7 +16,7 @@ module Neo4j
 
         def driver(uri, auth_token = Neo4j::Driver::AuthTokens.none, config = {})
           raise Exceptions::AuthenticationException, 'Unsupported authentication token' unless auth_token
-          config ||= Config.default_config
+          # config ||= Config.default_config
           # routing_settings = config.routing_settings
           # retry_settings = config.retry_settings
           routing_settings = nil

data/ffi/neo4j/driver/internal/driver_factory.rb

@@ -4,6 +4,7 @@ module Neo4j
   module Driver
     module Internal
       class DriverFactory
+        include ErrorHandling
         BOLT_URI_SCHEME = 'bolt'
         BOLT_ROUTING_URI_SCHEME = 'bolt+routing'
         NEO4J_URI_SCHEME = 'neo4j'
@@ -11,17 +12,27 @@ module Neo4j
 
         def new_instance(uri, auth_token, routing_settings, retry_settings, config)
           uri = URI(uri)
-          connector = create_connector(uri, auth_token)
-          create_driver(uri.scheme, connector, routing_settings).tap(&:verify_connectivity)
+          connector, logger = create_connector(uri, auth_token, config)
+          create_driver(uri.scheme, connector, logger, routing_settings).tap(&:verify_connectivity)
         end
 
         private
 
-        def create_connector(uri, auth_token)
+        def create_connector(uri, auth_token, config)
           address = Bolt::Address.create(host(uri).gsub(/^\[(.*)\]$/, '\\1'), port(uri).to_s)
-          config = Bolt::Config.create
-          Bolt::Config.set_user_agent(config, 'seabolt-cmake/1.7')
-          Bolt::Connector.create(address, auth_token, config)
+          bolt_config = bolt_config(config)
+          logger = InternalLogger.register(bolt_config, config[:logger])
+          [Bolt::Connector.create(address, auth_token, bolt_config), logger]
+        end
+
+        def bolt_config(config)
+          bolt_config = Bolt::Config.create
+          config.each do |key, value|
+            # case key
+            # end
+          end
+          check_error Bolt::Config.set_user_agent(bolt_config, 'seabolt-cmake/1.7')
+          bolt_config
         end
 
         def host(uri)
@@ -29,16 +40,16 @@ module Neo4j
         end
 
         def port(uri)
-          uri.port&.tap {|port| raise ArgumentError, "Illegal port:  #{port}" unless (0..65_535).cover?(port) } ||
+          uri.port&.tap { |port| raise ArgumentError, "Illegal port:  #{port}" unless (0..65_535).cover?(port) } ||
             DEFAULT_PORT
         end
 
-        def create_driver(scheme, connector, routing_settings)
+        def create_driver(scheme, connector, logger, routing_settings)
           case scheme
           when BOLT_URI_SCHEME
             # assert_no_routing_context( uri, routing_settings )
             # return createDirectDriver( securityPlan, address, connectionPool, retryLogic, metrics, config );
-            create_direct_driver(connector)
+            create_direct_driver(connector, logger)
           when BOLT_ROUTING_URI_SCHEME, NEO4J_URI_SCHEME
             # create_routing_driver( security_plan, address, connection_ool, eventExecutorGroup, routingSettings, retryLogic, metrics, config );
           else
@@ -46,10 +57,10 @@ module Neo4j
           end
         end
 
-        def create_direct_driver(connector)
+        def create_direct_driver(connector, logger)
           connection_provider = DirectConnectionProvider.new(connector)
           session_factory = create_session_factory(connection_provider)
-          InternalDriver.new(session_factory)
+          InternalDriver.new(session_factory, logger)
         end
 
         def create_session_factory(connection_provider, retry_logic = nil, config = nil)

data/ffi/neo4j/driver/internal/internal_driver.rb

@@ -11,8 +11,9 @@ module Neo4j
         delegate :verify_connectivity, to: :session_factory
         auto_closable :session
 
-        def initialize(session_factory)
+        def initialize(session_factory, logger)
           @session_factory = session_factory
+          @logger = logger # just a weak reference to prevent garbage collection
           @closed = Concurrent::AtomicBoolean.new(false)
         end
 

data/ffi/neo4j/driver/internal/internal_logger.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Neo4j
+  module Driver
+    module Internal
+      class InternalLogger
+        include ErrorHandling
+
+        class << self
+          def register(bolt_config, logger)
+            return unless logger
+            new(bolt_config, logger)
+          end
+        end
+
+        def initialize(bolt_config, logger)
+          @logger = logger
+          @funcs = []
+          bolt_log = Bolt::Log.create(nil)
+          %i[error warning info debug].each do |method|
+            Bolt::Log.send("set_#{method}_func", bolt_log, func(method))
+          end
+          check_error Bolt::Config.set_log(bolt_config, bolt_log)
+        end
+
+        def func(method)
+          Proc.new { |_ptr, message| @logger.send(method, message) }.tap(&@funcs.method(:<<))
+        end
+      end
+    end
+  end
+end

data/lib/neo4j/driver/version.rb

@@ -2,6 +2,6 @@
 
 module Neo4j
   module Driver
-    VERSION = '0.1.8'
+    VERSION = '0.1.9'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j-ruby-driver
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Heinrich Klobuczek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-18 00:00:00.000000000 Z
+date: 2019-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -238,6 +238,7 @@ files:
 - ffi/bolt/library.rb
 - ffi/bolt/lifecycle.rb
 - ffi/bolt/list.rb
+- ffi/bolt/log.rb
 - ffi/bolt/status.rb
 - ffi/bolt/string.rb
 - ffi/bolt/structure.rb
@@ -261,6 +262,7 @@ files:
 - ffi/neo4j/driver/internal/handlers/session_pull_all_response_handler.rb
 - ffi/neo4j/driver/internal/handlers/transaction_pull_all_response_handler.rb
 - ffi/neo4j/driver/internal/internal_driver.rb
+- ffi/neo4j/driver/internal/internal_logger.rb
 - ffi/neo4j/driver/internal/internal_record.rb
 - ffi/neo4j/driver/internal/internal_statement_result.rb
 - ffi/neo4j/driver/internal/messaging/bolt_protocol.rb