neo4j-ruby-driver 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc91e8465e99e443737f4ddd76e2547b260582054d182334c01972158f23d501
-  data.tar.gz: aa0f5b6b9d36235d727a6510d08f77844c099bd227338cea35d754d3b6366c3f
+  metadata.gz: 8d65c2ee6760cec8fc521979b62cda83acc9ffe0ff2c5f0d190b9afcf6923aa7
+  data.tar.gz: 54199c67bc880e059ad3280956b7b628969e91a4e7fd43838ad23c9bf5334c34
 SHA512:
-  metadata.gz: 1420812891d8ae6d83c03804586ba854a6da5dba16680f10801c8469504cd4b40f184b0e81cedeb18252203fb571d826a2afd285e2e3ef09fe6009f3b54d252d
-  data.tar.gz: 38b912cf6b5b33a347a66c4e6a21a5d01e3c4f6ba287bfdb04f78af9ad4ff3720da2811296deffaa56e5c35331dfb245cbe6841034d3faea0b1f50d395927b7a
+  metadata.gz: eecc477146f649aabf6ef8aae6a3c52391f2afba6ab37b495446b5cb5c0e2cd503247327e99e7e03ed4f624f5dca857bc0caf71cdd042a108ef426c412695e7d
+  data.tar.gz: 39489c64659ef01d68b8d9920a366a9a46031e40a7aa65cb385b91a315ece2c949a7aa2cb0fcf10e12e90bc9dbca5f106a0bf0c140eb9cdac937faba8076d48d

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

@@ -4,23 +4,46 @@ module Neo4j
   module Driver
     module Internal
       class DriverFactory
+        BOLT_URI_SCHEME = 'bolt'
+        BOLT_ROUTING_URI_SCHEME = 'bolt+routing'
+        NEO4J_URI_SCHEME = 'neo4j'
+        DEFAULT_PORT = 7687
+
         def new_instance(uri, auth_token, routing_settings, retry_settings, config)
+          uri = URI(uri)
           connector = create_connector(uri, auth_token)
-          create_driver(uri, connector).tap(&:verify_connectivity)
+          create_driver(uri.scheme, connector, routing_settings).tap(&:verify_connectivity)
         end
 
         private
 
         def create_connector(uri, auth_token)
-          uri = URI(uri)
-          address = Bolt::Address.create(uri.host, uri.port.to_s)
+          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)
         end
 
-        def create_driver(uri, connector)
-          create_direct_driver(connector)
+        def host(uri)
+          uri.host.tap { |host| raise ArgumentError, "Invalid address format `#{uri}`" unless host }
+        end
+
+        def port(uri)
+          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)
+          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)
+          when BOLT_ROUTING_URI_SCHEME, NEO4J_URI_SCHEME
+            # create_routing_driver( security_plan, address, connection_ool, eventExecutorGroup, routingSettings, retryLogic, metrics, config );
+          else
+            raise Exceptions::ClientException, "Unsupported URI scheme: #{scheme}"
+          end
         end
 
         def create_direct_driver(connector)

data/lib/neo4j/driver/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j-ruby-driver
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Heinrich Klobuczek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-09 00:00:00.000000000 Z
+date: 2019-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -154,16 +154,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '13'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '13'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement