activegraph 10.0.0.pre.beta.1 → 10.0.0.pre.beta.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f490d36cc6732adb06aca4752e589f4dfc689d307cd33e54fe912a2273d30160
-  data.tar.gz: 61c9355e4403e04dc723071b70b1cc0e27ebb92fae5e27ba6c6c9a349d1dce38
+  metadata.gz: 3c6ef6e85cad5ae83d519bf7c5d781f70f39d9528bf79722e3913a5edfdc0ca2
+  data.tar.gz: 8a75e8976bcb65c734db47024d84f55dad7897ee7e0eb6e08a2e3a60571f441c
 SHA512:
-  metadata.gz: d51a94b8d915e1815913d28ffb96602c3ca8aa74328313bb5d838af00cb8c77ff2bf9f0d6e70289fcbf12061e6d3665980442193ed0818fd9d41684d571287f3
-  data.tar.gz: 5dacdeb85d6b9bff6dbf7ad76e041a98117fa49e36feb702dcac3995c8d573c68af89c413d80f7f9f1c3a52b360d8166858660e4bea99e18072e3982d9bd24b7
+  metadata.gz: ead910dc52bdd93b39b274fc766f376972a16b284a79ba7b8b25b52dab54508927ea7e0ed857f6c416500f283210d659dec1c8fe955cf2ec417dc13d0b5ecc08
+  data.tar.gz: 53d4531aaa3afa01b813f9b4e40adda8ffc3a69b6d0c9f23606d9ef98d184126952909166d17d57e7e3fa372772bf17ce0bf36651cff11c17124a5556d6057ca

data/lib/active_graph/base.rb

@@ -28,10 +28,10 @@ module ActiveGraph
         @establish_driver_block.call if @establish_driver_block
       end
 
-      def new_driver(url, options = {})
+      def new_driver(url, auth_token, options = {})
         verbose_query_logs = ActiveGraph::Config.fetch(:verbose_query_logs, false)
         ActiveGraph::Core::Driver
-          .new(url, options, verbose_query_logs: verbose_query_logs)
+          .new(url, auth_token, options, verbose_query_logs: verbose_query_logs)
       end
 
       def transaction

data/lib/active_graph/core/driver.rb

@@ -1,42 +1,25 @@
 require 'active_support/core_ext/module/attribute_accessors'
 require 'active_graph/core/logging'
-require 'active_graph/core/has_uri'
 require 'active_graph/version'
 
 module ActiveGraph
   module Core
     class Driver
-      include HasUri
-
-      USER_AGENT_STRING = "neo4j-gem/#{::ActiveGraph::VERSION} (https://github.com/neo4jrb/neo4j)"
+      USER_AGENT_STRING = "activegraph-gem/#{::ActiveGraph::VERSION} (https://github.com/neo4jrb/activegraph)"
 
       attr_accessor :wrap_level
-      attr_reader :options, :driver
+      attr_reader :options, :driver, :url
       delegate :close, to: :driver
 
-      default_url('bolt://neo4:neo4j@localhost:7687')
-
-      validate_uri do |uri|
-        uri.scheme == 'bolt'
-      end
-
       class << self
-        def new_instance(url, options = {})
-          uri = URI(url)
-          user = uri.user
-          password = uri.password
-          auth_token = if user
-                         Neo4j::Driver::AuthTokens.basic(user, password)
-                       else
-                         Neo4j::Driver::AuthTokens.none
-                       end
+        def new_instance(url, auth_token,  options = {})
           Neo4j::Driver::GraphDatabase.driver(url, auth_token, options)
         end
       end
 
-      def initialize(url, options = {}, extended_options = {})
-        self.url = url
-        @driver = self.class.new_instance(url, options)
+      def initialize(url, auth_token = Neo4j::Driver::AuthTokens.none, options = {}, extended_options = {})
+        @url = url
+        @driver = self.class.new_instance(url, auth_token, options)
         @options = extended_options
       end
 

data/lib/active_graph/core/instrumentable.rb

@@ -14,7 +14,7 @@ module ActiveGraph
         def subscribe_to_request
           ActiveSupport::Notifications.subscribe('neo4j.core.bolt.request') do |_, start, finish, _id, _payload|
             ms = (finish - start) * 1000
-            yield " #{ANSI::BLUE}BOLT:#{ANSI::CLEAR} #{ANSI::YELLOW}#{ms.round}ms#{ANSI::CLEAR} #{Base.current_driver.url_without_password}"
+            yield " #{ANSI::BLUE}BOLT:#{ANSI::CLEAR} #{ANSI::YELLOW}#{ms.round}ms#{ANSI::CLEAR} #{Base.current_driver.url}"
           end
         end
 

data/lib/active_graph/railtie.rb

@@ -58,11 +58,13 @@ module ActiveGraph
     end
 
     def setup!(neo4j_config = empty_config)
-      url, path, options = final_driver_config!(neo4j_config).values_at(:url, :path, :options)
-      options ||= {}
+      url, path, auth_token, username, password, config, options =
+        final_driver_config!(neo4j_config).values_at(:url, :path, :auth_token, :username, :password, :config, :options)
+      auth_token ||= username ? Neo4j::Driver::AuthTokens.basic(username, password) : Neo4j::Driver::AuthTokens.none
+      options ||= config || {}
       register_neo4j_cypher_logging
 
-      ActiveGraph::Base.new_driver( url || path || default_driver_path_or_url, options)
+      ActiveGraph::Base.new_driver(url || path || default_driver_path_or_url, auth_token, options)
     end
 
     def final_driver_config!(neo4j_config)

data/lib/active_graph/version.rb

@@ -1,3 +1,3 @@
 module ActiveGraph
-  VERSION = '10.0.0-beta.1'
+  VERSION = '10.0.0-beta.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activegraph
 version: !ruby/object:Gem::Version
-  version: 10.0.0.pre.beta.1
+  version: 10.0.0.pre.beta.2
 platform: ruby
 authors:
 - Andreas Ronge, Brian Underwood, Chris Grigg, Heinrich Klobuczek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-01 00:00:00.000000000 Z
+date: 2020-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -263,7 +263,6 @@ files:
 - lib/active_graph/core/connection_failed_error.rb
 - lib/active_graph/core/cypher_error.rb
 - lib/active_graph/core/driver.rb
-- lib/active_graph/core/has_uri.rb
 - lib/active_graph/core/instrumentable.rb
 - lib/active_graph/core/label.rb
 - lib/active_graph/core/logging.rb

data/lib/active_graph/core/has_uri.rb

@@ -1,63 +0,0 @@
-require 'active_support/concern'
-
-module ActiveGraph
-  module Core
-    # Containing the logic for dealing with adaptors which use URIs
-    module HasUri
-      extend ActiveSupport::Concern
-
-      included do
-        %w[scheme user password host port].each do |method|
-          define_method(method) do
-            (@uri && @uri.send(method)) || (self.class.default_uri && self.class.default_uri.send(method))
-          end
-        end
-      end
-
-      module ClassMethods
-        attr_reader :default_uri
-
-        def default_url(default_url)
-          @default_uri = uri_from_url!(default_url)
-        end
-
-        def validate_uri(&block)
-          @uri_validator = block
-        end
-
-        def uri_from_url!(url)
-          validate_url!(url)
-
-          @uri = url.nil? ? @default_uri : URI(url)
-
-          fail ArgumentError, "Invalid URL: #{url.inspect}" if uri_valid?(@uri)
-
-          @uri
-        end
-
-        private
-
-        def validate_url!(url)
-          fail ArgumentError, "Invalid URL: #{url.inspect}" if !(url.is_a?(String) || url.nil?)
-          fail ArgumentError, 'No URL or default URL specified' if url.nil? && @default_uri.nil?
-        end
-
-        def uri_valid?(uri)
-          @uri_validator && !@uri_validator.call(uri)
-        end
-      end
-
-      def url
-        @uri.to_s
-      end
-
-      def url=(url)
-        @uri = self.class.uri_from_url!(url)
-      end
-
-      def url_without_password
-        @url_without_password ||= "#{scheme}://#{user + ':...@' if user}#{host}:#{port}"
-      end
-    end
-  end
-end