neo4j-java-driver 0.3.2-java → 0.3.5-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80aa014268c37593184afdd382a4b592f67f39e14acc90ff275697bdf220835e
-  data.tar.gz: d483ae75865378d922e43364ab938c8c8ee49f3794ec1921b550abf4c740257a
+  metadata.gz: 866688516c97a667d7f2a4a6e02f80b500a63adc4dbc2ba1b12fd56b2261d840
+  data.tar.gz: a466a394747f26a3304762a98bb2a197632756340c3fa41f47deae6345927c99
 SHA512:
-  metadata.gz: 7ff736a3dcc239556265d588c3855f284ec4e04038391eef015f5cebadcb8e7dbe8137385472a6b7948b8e3e5b3a607df2d0bb7fc69fa1ce46e8847bd2821a9e
-  data.tar.gz: 5c2f1a36b1456d8532dc333b6a3b7fbfef9e747581736d3fa5dbaf546113cbcbcbb50b3ae537690d84464a628980332823adde447559991fe8105dbfcb7815cc
+  metadata.gz: aba8b8646b15c048c1bf81b96af2acd3a1631221169edacc9beab7d1b6ca4f74e507a3bbec3873ffa7358ef705ea4a0b9088178b99a393d14af702b9b0c18d53
+  data.tar.gz: a9909b50278aa1330a93b30af06fde0f14f9f41d83fce4364fd59ca0be952d146f8c5bf69008508db1e036225086841f1e7d6ccea13e8f623521dc8bb34b54ac

data/README.md

@@ -26,8 +26,13 @@ Or install it yourself as:
     
 ### neo4j-ruby-driver
 
-As a prerequisite [seabolt](https://github.com/neo4j-drivers/seabolt) must be installed. Please follow the instructions to install either from package or source.
-Add `SEABOLT_LIB` environment variable with the location of the installed library.
+As a prerequisite seabolt must be installed.
+ 
+On macOS
+
+    $ brew install michael-simons/homebrew-seabolt/seabolt 
+    
+On other systems please follow the instructions to install [seabolt](https://github.com/neo4j-drivers/seabolt) either from package or source. Make sure the libseabolt17 ends up in a system lib path e.g. /usr/local/lib
  
 Add this line to your application's Gemfile:
 
@@ -56,17 +61,23 @@ This gem includes 2 different implementations: java driver based and another one
 
 For java driver based:
 
-    $ bin/setup
+    $ driver=java bin/setup
     
-FFI based same as above but with SEABOLT_LIB variable set (e.g. on Mac OSX):
+FFI based same as above but with driver variable set:
 
-    $ SEABOLT_LIB=~/seabolt/build/dist/lib/libseabolt17.dylib bin/setup 
+    $ bin/setup 
      
-Please note that seabolt has to be installed separately: https://github.com/neo4j-drivers/seabolt      
+## Testing
+
+To run the tests the following tools need to be installed:
+
+    $ brew install python
+    $ 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
 
-In order to run test by running `rake spec` you may have to set your own `NEO4J_BOLT_URL` URI or it will
-fallback to `bolt://localhost:7687`.
-    
 ## Contributing
 
 Suggestions, improvements, bug reports and pull requests are welcome on GitHub at https://github.com/neo4jrb/neo4j-ruby-driver.

data/jruby/neo4j/driver.rb

@@ -9,6 +9,8 @@ module Neo4j
   module Driver
     include_package 'org.neo4j.driver.v1'
 
+    Transaction = Java::OrgNeo4jDriverInternal::ExplicitTransaction
+
     module Net
       include_package 'org.neo4j.driver.v1.net'
     end
@@ -45,8 +47,8 @@ Java::OrgNeo4jDriverInternal::InternalPath::SelfContainedSegment.include Neo4j::
 Java::OrgNeo4jDriverInternal::InternalRecord.prepend Neo4j::Driver::Ext::InternalRecord
 Java::OrgNeo4jDriverInternal::InternalRelationship.prepend Neo4j::Driver::Ext::InternalRelationship
 Java::OrgNeo4jDriverInternal::InternalStatementResult.prepend Neo4j::Driver::Ext::InternalStatementResult
-Java::OrgNeo4jDriverInternal::ExplicitTransaction.prepend Neo4j::Driver::Ext::RunOverride
-Java::OrgNeo4jDriverInternal::NetworkSession.prepend Neo4j::Driver::Ext::RunOverride
+Java::OrgNeo4jDriverInternal::ExplicitTransaction.prepend Neo4j::Driver::Ext::ExplicitTransaction
+Java::OrgNeo4jDriverInternal::NetworkSession.prepend Neo4j::Driver::Ext::NetworkSession
 Java::OrgNeo4jDriverInternalSummary::InternalResultSummary.prepend Neo4j::Driver::Ext::Internal::Summary::InternalResultSummary
 Java::OrgNeo4jDriverInternalValue::ValueAdapter.include Neo4j::Driver::Ext::RubyConverter
 Java::OrgNeo4jDriverV1::AuthTokens.singleton_class.prepend Neo4j::Driver::Ext::AuthTokens

data/jruby/neo4j/driver/ext/config_converter.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Neo4j
+  module Driver
+    module Ext
+      module ConfigConverter
+        include NeoConverter
+
+        private
+
+        def to_java_config(builder_class, hash)
+          hash&.reduce(builder_class.builder) { |object, key_value| object.send(*config_method(*key_value)) }&.build
+        end
+
+        def config_method(key, value)
+          method = :"with_#{key}"
+          unit = nil
+          case key.to_s
+          when 'encryption'
+            unless value
+              method = :without_encryption
+              value = nil
+            end
+          when 'timeout'
+            value = java.time.Duration.ofMillis(Driver::Internal::DurationNormalizer.milliseconds(value))
+          when /time(out)?$/
+            value = Driver::Internal::DurationNormalizer.milliseconds(value)
+            unit = java.util.concurrent.TimeUnit::MILLISECONDS
+          when 'logger'
+            method = :with_logging
+            value = Neo4j::Driver::Ext::Logger.new(value)
+          when 'resolver'
+            proc = value
+            value = ->(address) { java.util.HashSet.new(proc.call(address)) }
+          else
+            value = to_neo(value, skip_unknown: true)
+          end
+          [method, value, unit].compact
+        end
+      end
+    end
+  end
+end

data/jruby/neo4j/driver/ext/explicit_transaction.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Neo4j
+  module Driver
+    module Ext
+      module ExplicitTransaction
+        include ExceptionCheckable
+        include RunOverride
+
+        def run(statement, parameters = {})
+          check { super(to_statement(statement, parameters)) }
+        end
+      end
+    end
+  end
+end

data/jruby/neo4j/driver/ext/graph_database.rb

@@ -5,6 +5,7 @@ module Neo4j
     module Ext
       module GraphDatabase
         extend AutoClosable
+        include ConfigConverter
         include ExceptionCheckable
 
         auto_closable :driver, :routing_driver
@@ -12,41 +13,15 @@ module Neo4j
         def driver(uri, auth_token = Neo4j::Driver::AuthTokens.none, config = nil)
           check do
             java_method(:driver, [java.lang.String, org.neo4j.driver.v1.AuthToken, org.neo4j.driver.v1.Config])
-              .call(uri.to_s, auth_token, to_java_config(config))
+              .call(uri.to_s, auth_token, to_java_config(Neo4j::Driver::Config, config))
           end
         end
 
         def routing_driver(routing_uris, auth_token, config)
-          check { super(routing_uris.map { |uri| java.net.URI.create(uri.to_s) }, auth_token, to_java_config(config)) }
-        end
-
-        private
-
-        def to_java_config(hash)
-          hash&.reduce(Neo4j::Driver::Config.build) { |object, key_value| object.send(*config_method(*key_value)) }
-            &.to_config
-        end
-
-        def config_method(key, value)
-          method = :"with_#{key}"
-          unit = nil
-          case key.to_s
-          when 'encryption'
-            unless value
-              method = :without_encryption
-              value = nil
-            end
-          when /Time(out)?$/i
-            value = Driver::Internal::DurationNormalizer.milliseconds(value)
-            unit = java.util.concurrent.TimeUnit::MILLISECONDS
-          when 'logger'
-            method = :with_logging
-            value = Neo4j::Driver::Ext::Logger.new(value)
-          when 'resolver'
-            proc = value
-            value = ->(address) { java.util.HashSet.new(proc.call(address)) }
+          check do
+            super(routing_uris.map { |uri| java.net.URI.create(uri.to_s) }, auth_token,
+                  to_java_config(Neo4j::Driver::Config, config))
           end
-          [method, value, unit].compact
         end
       end
     end

data/jruby/neo4j/driver/ext/map_converter.rb

@@ -5,7 +5,8 @@ module Neo4j
     module Ext
       module MapConverter
         def to_hash
-          as_map(&:itself).to_hash.transform_values!(&:as_ruby_object).symbolize_keys!
+          java_method(:asMap, [org.neo4j.driver.v1.util.Function]).call(&:itself).to_hash
+            .transform_values!(&:as_ruby_object).symbolize_keys!
         end
       end
     end

data/jruby/neo4j/driver/ext/neo_converter.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+module Neo4j
+  module Driver
+    module Ext
+      module NeoConverter
+        private
+
+        def to_neo(object, skip_unknown: false)
+          case object
+          when Hash
+            object.map { |key, value| [key.to_s, to_neo(value)] }.to_h
+          when Types::Path
+            Exceptions::ClientException.unable_to_convert(object)
+          when Enumerable
+            object.map(&method(:to_neo))
+          when Types::Bytes
+            object.to_java_bytes
+          when Date
+            Java::JavaTime::LocalDate.of(object.year, object.month, object.day)
+          when ActiveSupport::Duration
+            Java::OrgNeo4jDriverInternal::InternalIsoDuration.new(
+              *Driver::Internal::DurationNormalizer.normalize(object)
+            )
+          when Types::Point
+            Java::OrgNeo4jDriverV1::Values.point(object.srid, *object.coordinates)
+          when Types::OffsetTime
+            Java::JavaTime::OffsetTime.of(object.hour, object.min, object.sec,
+                                          object.nsec, Java::JavaTime::ZoneOffset.of_total_seconds(object.utc_offset))
+          when Types::LocalTime
+            Java::JavaTime::LocalTime.of(object.hour, object.min, object.sec, object.nsec)
+          when Types::LocalDateTime
+            Java::JavaTime::LocalDateTime.of(object.year, object.month, object.day, object.hour, object.min, object.sec,
+                                             object.nsec)
+          when ActiveSupport::TimeWithZone
+            to_zoned_date_time(object, object.time_zone.tzinfo.identifier)
+          when Time
+            to_zoned_date_time(object, object.formatted_offset)
+          when nil, true, false, Integer, Float, String
+            object
+          else
+            if skip_unknown
+              object
+            else
+              raise Exceptions::ClientException.unable_to_convert(object)
+            end
+          end
+        end
+
+        def to_zoned_date_time(object, zone)
+          Java::JavaTime::ZonedDateTime.of(object.year, object.month, object.day, object.hour, object.min, object.sec,
+                                           object.nsec, Java::JavaTime::ZoneId.of(zone))
+        end
+      end
+    end
+  end
+end

data/jruby/neo4j/driver/ext/network_session.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Neo4j
+  module Driver
+    module Ext
+      module NetworkSession
+        extend AutoClosable
+        include ConfigConverter
+        include ExceptionCheckable
+        include RunOverride
+
+        auto_closable :begin_transaction
+
+        # work around jruby issue https://github.com/jruby/jruby/issues/5603
+        Struct.new('Wrapper', :object)
+
+        %i[read write].each do |prefix|
+          define_method("#{prefix}_transaction") do |**config, &block|
+            check do
+              super(->(tx) { Struct::Wrapper.new(reverse_check { block.call(tx) }) }, to_java_config(Neo4j::Driver::TransactionConfig, config)).object
+            end
+          end
+        end
+
+        # end work around
+
+        def run(statement, parameters = {}, config = {})
+          check do
+            java_method(:run, [org.neo4j.driver.v1.Statement, org.neo4j.driver.v1.TransactionConfig])
+              .call(to_statement(statement, parameters), to_java_config(Neo4j::Driver::TransactionConfig, config))
+          end
+        end
+
+        def begin_transaction(**config)
+          check { super(to_java_config(Neo4j::Driver::TransactionConfig, config)) }
+        end
+      end
+    end
+  end
+end

data/jruby/neo4j/driver/ext/run_override.rb

@@ -4,33 +4,7 @@ module Neo4j
   module Driver
     module Ext
       module RunOverride
-        include ExceptionCheckable
-        extend AutoClosable
-
-        auto_closable :begin_transaction
-
-        # work around jruby issue https://github.com/jruby/jruby/issues/5603
-        Struct.new('Wrapper', :object)
-
-        %i[read write].each do |prefix|
-          define_method("#{prefix}_transaction") do |&block|
-            check { super { |tx| Struct::Wrapper.new(reverse_check { block.call(tx) }) }.object }
-          end
-        end
-
-        # end work around
-
-        def run(statement, parameters = {})
-          Neo4j::Driver::Internal::Validator.require_hash_parameters!(parameters)
-          check do
-            java_method(:run, [org.neo4j.driver.v1.Statement])
-              .call(Neo4j::Driver::Statement.new(statement, to_neo(parameters) || {}))
-          end
-        end
-
-        def begin_transaction # (config = nil)
-          check { super }
-        end
+        include NeoConverter
 
         def close
           check { super }
@@ -38,46 +12,9 @@ module Neo4j
 
         private
 
-        def to_neo(object)
-          case object
-          when Hash
-            object.map { |key, value| [key.to_s, to_neo(value)] }.to_h
-          when Types::Path
-            Exceptions::ClientException.unable_to_convert(object)
-          when Enumerable
-            object.map(&method(:to_neo))
-          when Types::Bytes
-            object.to_java_bytes
-          when Date
-            Java::JavaTime::LocalDate.of(object.year, object.month, object.day)
-          when ActiveSupport::Duration
-            Java::OrgNeo4jDriverInternal::InternalIsoDuration.new(
-              *Driver::Internal::DurationNormalizer.normalize(object)
-            )
-          when Types::Point
-            Java::OrgNeo4jDriverV1::Values.point(object.srid, *object.coordinates)
-          when Types::OffsetTime
-            Java::JavaTime::OffsetTime.of(object.hour, object.min, object.sec,
-                                          object.nsec, Java::JavaTime::ZoneOffset.of_total_seconds(object.utc_offset))
-          when Types::LocalTime
-            Java::JavaTime::LocalTime.of(object.hour, object.min, object.sec, object.nsec)
-          when Types::LocalDateTime
-            Java::JavaTime::LocalDateTime.of(object.year, object.month, object.day, object.hour, object.min, object.sec,
-                                             object.nsec)
-          when ActiveSupport::TimeWithZone
-            to_zoned_date_time(object, object.time_zone.tzinfo.identifier)
-          when Time
-            to_zoned_date_time(object, object.formatted_offset)
-          when nil, true, false, Integer, Float, String
-            object
-          else
-            raise Exceptions::ClientException.unable_to_convert(object)
-          end
-        end
-
-        def to_zoned_date_time(object, zone)
-          Java::JavaTime::ZonedDateTime.of(object.year, object.month, object.day, object.hour, object.min, object.sec,
-                                           object.nsec, Java::JavaTime::ZoneId.of(zone))
+        def to_statement(text, parameters)
+          Neo4j::Driver::Internal::Validator.require_hash_parameters!(parameters)
+          Neo4j::Driver::Statement.new(text, to_neo(parameters || {}))
         end
       end
     end

data/lib/neo4j/driver/version.rb

@@ -2,6 +2,6 @@
 
 module Neo4j
   module Driver
-    VERSION = '0.3.2'
+    VERSION = '0.3.5'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j-java-driver
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.5
 platform: java
 authors:
 - Heinrich Klobuczek
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-01-24 00:00:00.000000000 Z
+date: 2020-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -17,8 +17,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: activesupport
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -31,8 +31,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.1.10
   name: zeitwerk
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -45,8 +45,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: jar-dependencies
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -59,8 +59,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: ffaker
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -73,8 +73,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: hoe
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -87,8 +87,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: hoe-bundler
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -101,27 +101,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: hoe-gemspec
-  prerelease: false
   type: :development
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.0
-  name: neo4j-rake_tasks
   prerelease: false
-  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -129,8 +115,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: parallel
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -143,8 +129,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: rake
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -157,8 +143,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: rspec-its
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -171,8 +157,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: rspec-mocks
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -185,8 +171,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: ruby-maven
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -202,8 +188,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '7'
   name: rdoc
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -225,8 +211,10 @@ files:
 - README.md
 - jruby/neo4j/driver.rb
 - jruby/neo4j/driver/ext/auth_tokens.rb
+- jruby/neo4j/driver/ext/config_converter.rb
 - jruby/neo4j/driver/ext/exception_checkable.rb
 - jruby/neo4j/driver/ext/exception_mapper.rb
+- jruby/neo4j/driver/ext/explicit_transaction.rb
 - jruby/neo4j/driver/ext/graph_database.rb
 - jruby/neo4j/driver/ext/internal/summary/internal_result_summary.rb
 - jruby/neo4j/driver/ext/internal_driver.rb
@@ -237,6 +225,8 @@ files:
 - jruby/neo4j/driver/ext/logger.rb
 - jruby/neo4j/driver/ext/map_accessor.rb
 - jruby/neo4j/driver/ext/map_converter.rb
+- jruby/neo4j/driver/ext/neo_converter.rb
+- jruby/neo4j/driver/ext/network_session.rb
 - jruby/neo4j/driver/ext/ruby_converter.rb
 - jruby/neo4j/driver/ext/run_override.rb
 - jruby/neo4j/driver/ext/start_end_naming.rb
@@ -282,7 +272,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -290,8 +280,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - jar org.neo4j.driver, neo4j-java-driver, 1.7.5
-rubyforge_project:
-rubygems_version: 2.7.9
+rubygems_version: 3.0.6
 signing_key:
 specification_version: 4
 summary: ''