neo4j-ruby-driver 0.3.4 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 285f1e745b1c40e78643541afbda39871b35e261b80f2a11c5a1282339dd9a73
-  data.tar.gz: 22fde4ee4e1a5ccb729063a1d4bf96ebd51af261c73e9739325fa4817d9109d3
+  metadata.gz: d33153e299b755a419d12e6977650124965789923b7faedaddfa78dfde1bd6d1
+  data.tar.gz: abdaeef0e7c8dc83c6dc38d052e10630836a0cb3c9999976f8a1fed5b616a650
 SHA512:
-  metadata.gz: 9c044349f323e3aad1215ccbd28b9a4f9f750ae6e0ca0e3ecdaeb4601122fb016169552ab47e4de63b753a0b77eff29c37f4a1b1e56fa9d4486132f9efa599fc
-  data.tar.gz: dcc9281e5572ca88fb7a8073f1ab7a145209d9a7c055af62c0b985e87e3eeac59a5e5e6fc8beb533c6cf9b1ee217a8538d49460010f0d849d7243588987dc860
+  metadata.gz: e72296857ec72dd8d624098be60d5567a775fcbd4a0d3c6fcc931314072114c7ffcc8d33ac1a4f72dd8983ec9548d5da88609d7e1319b3223cc7450459f8e13c
+  data.tar.gz: e9a45e37d1332e0391230900949891945ee5e1182c89d6b63d87fe5992659fa14f2ef4bd6bfe80c42c2aa3daaa620013fbbef273141070341c78beccd8a37e34

data/README.md

@@ -72,12 +72,11 @@ FFI based same as above but with driver variable set:
 To run the tests the following tools need to be installed:
 
     $ brew install python
-    $ wget https://bootstrap.pypa.io/get-pip.py && python3 get-pip.py --user
-    $ python3 -m pip install --user git+https://github.com/klobuczek/boltkit@1.3#egg=boltkit
-    $ neoctrl-install -e 4.0.0 servers
-    $ neoctrl-configure servers/neo4j-enterprise-4.0.0 dbms.directories.import=
-    $ neoctrl-set-initial-password password servers/neo4j-enterprise-4.0.0
-    $ neoctrl-start servers/neo4j-enterprise-4.0.0
+    $ pip3 install --user git+https://github.com/klobuczek/boltkit@1.3#egg=boltkit
+    $ neoctrl-install -e 4.0.2 servers
+    $ neoctrl-configure servers/neo4j-enterprise-4.0.2 dbms.directories.import= dbms.default_listen_address=::
+    $ neoctrl-set-initial-password password servers/neo4j-enterprise-4.0.2
+    $ neoctrl-start servers/neo4j-enterprise-4.0.2
 
 ## Contributing
 

data/ffi/neo4j/driver.rb

@@ -54,3 +54,7 @@ module Neo4j
 end
 
 Loader.load
+
+Neo4j::Driver::Record = Neo4j::Driver::Internal::InternalRecord
+Neo4j::Driver::StatementResult = Neo4j::Driver::Internal::InternalStatementResult
+Neo4j::Driver::Transaction = Neo4j::Driver::Internal::ExplicitTransaction

data/ffi/neo4j/driver/graph_database.rb

@@ -44,7 +44,7 @@ module Neo4j
           scheme = (uris.map(&method(:URI)).map(&:scheme) - VALID_ROUTING_SCHEMES).first
           return unless scheme
           raise ArgumentError,
-                "Illegal URI scheme, expected URI scheme '#{scheme}' to be among [#{VALID_ROUTING_SCHEMES.join ', '}]"
+                "Illegal URI scheme, expected URI scheme '#{scheme}' to be among '[#{VALID_ROUTING_SCHEMES.join ', '}]'"
         end
       end
     end

data/ffi/neo4j/driver/internal/async/direct_connection.rb

@@ -30,6 +30,7 @@ module Neo4j
               )
             end
             set_bookmarks(:set_run_bookmarks, boomarks_holder.bookmarks)
+            set_config(:set_run, config)
             register(run_handler, Bolt::Connection.load_run_request(bolt_connection))
             register(pull_handler, Bolt::Connection.load_pull_request(bolt_connection, -1))
             flush
@@ -42,6 +43,7 @@ module Neo4j
           def begin(bookmarks, config, begin_handler)
             check_error Bolt::Connection.clear_begin(bolt_connection)
             set_bookmarks(:set_begin_bookmarks, bookmarks)
+            set_config(:set_begin, config)
             register(begin_handler, Bolt::Connection.load_begin_request(bolt_connection))
           end
 
@@ -82,6 +84,21 @@ module Neo4j
             Value::ValueAdapter.to_neo(value, bookmarks)
             check_error Bolt::Connection.send(method, bolt_connection, value)
           end
+
+          def set_config(method_prefix, config)
+            return unless config
+            config.each do |key, value|
+              case key
+              when :timeout
+                check_error Bolt::Connection.send("#{method_prefix}_tx_timeout", bolt_connection,
+                                                  DurationNormalizer.milliseconds(value))
+              when :metadata
+                bolt_value = Bolt::Value.create
+                Value::ValueAdapter.to_neo(bolt_value, value)
+                check_error Bolt::Connection.send("#{method_prefix}_tx_metadata", bolt_connection, bolt_value)
+              end
+            end
+          end
         end
       end
     end

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

@@ -49,7 +49,7 @@ module Neo4j
               )
             end
           end
-          check_error Bolt::Config.set_user_agent(bolt_config, 'seabolt-cmake/1.7')
+          check_error Bolt::Config.set_user_agent(bolt_config, "neo4j-ruby-driver #{Neo4j::Driver::VERSION}")
           bolt_config
         end
 

data/ffi/neo4j/driver/internal/handlers/run_response_handler.rb

@@ -21,7 +21,7 @@ module Neo4j
           def finalize
             return if @finished
             super
-            @statement_keys = Value::ValueAdapter.to_ruby(Bolt::Connection.field_names(bolt_connection))
+            @statement_keys = Value::ValueAdapter.to_ruby(Bolt::Connection.field_names(bolt_connection)).map(&:to_sym)
             metadata = Value::ValueAdapter.to_ruby(Bolt::Connection.metadata(bolt_connection))
             @result_available_after = metadata[:result_available_after] || metadata[:t_first]
           end

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

@@ -4,7 +4,7 @@ module Neo4j
   module Driver
     module Internal
       class InternalRecord
-        attr_reader :values
+        attr_reader :keys, :values
         delegate :first, to: :values
 
         def initialize(keys, values)
@@ -13,9 +13,13 @@ module Neo4j
         end
 
         def [](key)
-          field_index = key.is_a?(Integer) ? key : @keys.index(key.to_s)
+          field_index = key.is_a?(Integer) ? key : @keys.index(key.to_sym)
           @values[field_index] if field_index
         end
+
+        def to_h
+          keys.zip(values).to_h
+        end
       end
     end
   end

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

@@ -18,7 +18,7 @@ module Neo4j
           @retry_logic = retry_logic
         end
 
-        def run(statement, parameters = {}, config = nil)
+        def run(statement, parameters = {}, config = {})
           ensure_session_is_open
           ensure_no_open_tx_before_running_query
           acquire_connection(@mode)
@@ -27,11 +27,11 @@ module Neo4j
           )
         end
 
-        def read_transaction(config = nil, &block)
+        def read_transaction(**config, &block)
           transaction(Neo4j::Driver::AccessMode::READ, config, &block)
         end
 
-        def write_transaction(config = nil, &block)
+        def write_transaction(**config, &block)
           transaction(Neo4j::Driver::AccessMode::WRITE, config, &block)
         end
 
@@ -49,11 +49,8 @@ module Neo4j
           @connection&.release
         end
 
-        def begin_transaction(mode = @mode, config = nil)
-          ensure_session_is_open
-          ensure_no_open_tx_before_starting_tx
-          acquire_connection(mode)
-          @transaction = ExplicitTransaction.new(@connection, self).begin(bookmarks, config)
+        def begin_transaction(**config)
+          private_begin_transaction(@mode, config)
         end
 
         def last_bookmark
@@ -66,9 +63,16 @@ module Neo4j
 
         private
 
-        def transaction(mode, config = nil)
+        def private_begin_transaction(mode, config)
+          ensure_session_is_open
+          ensure_no_open_tx_before_starting_tx
+          acquire_connection(mode)
+          @transaction = ExplicitTransaction.new(@connection, self).begin(bookmarks, config)
+        end
+
+        def transaction(mode, config)
           @retry_logic.retry do
-            tx = begin_transaction(mode, config)
+            tx = private_begin_transaction(mode, config)
             result = yield tx
             tx.success
             result
@@ -80,7 +84,7 @@ module Neo4j
           end
         end
 
-        def acquire_connection(mode = @mode)
+        def acquire_connection(mode)
           # make sure previous result is fully consumed and connection is released back to the pool
           @result&.failure
 
@@ -90,7 +94,7 @@ module Neo4j
           #   3) previous result failed and error has been consumed
 
           raise Exceptions::IllegalStateException, 'Existing open connection detected' if @connection&.open?
-          @connection = @connection_provider.acquire_connection(@mode)
+          @connection = @connection_provider.acquire_connection(mode)
         end
 
         def close_transaction_and_release_connection

data/ffi/neo4j/driver/types/entity.rb

@@ -11,6 +11,10 @@ module Neo4j
           @id = id
           @properties = properties
         end
+
+        def ==(other)
+          self.class == other.class && id == other.id
+        end
       end
     end
   end

data/lib/neo4j/driver/version.rb

@@ -2,6 +2,6 @@
 
 module Neo4j
   module Driver
-    VERSION = '0.3.4'
+    VERSION = '1.7.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j-ruby-driver
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 1.7.0
 platform: ruby
 authors:
 - Heinrich Klobuczek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-12 00:00:00.000000000 Z
+date: 2020-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport