neo4j-core 7.0.7 → 7.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df59e523326d0f32d5c85d5148cc1c2029013789
-  data.tar.gz: 45e9e52b039ccc859dbb0ca5dc5c0f72e0205eff
+  metadata.gz: 2a65542a2290f562de9a0328eb11b8454c4be9ed
+  data.tar.gz: de9c7c86c59696baa6fe4e76c9dd867e49d6dbbd
 SHA512:
-  metadata.gz: a1263e57c3f4c8a0adf910a9f937b3bf6adecd98e2855ca9dcc46a0086e69779b96706bf306ee666c87ae4c04e5070e94eeb4b732ef21e1149f3d1a0c8ee27bc
-  data.tar.gz: a615b1178d22709928932acb07a9bb2b330de3ecd2f9ce1189b0dac152cddf5ed23831c2f6e5eed7a5b2fe09b7491d7ff377067da9f19dd7e264c255ee31ad9f
+  metadata.gz: a4b7c2a873274d91e72c2a15533652524cb7ba765dc3a189f2d8031161fa8fdad4a0b47d39efb3c3cf7010691a2b25a69e233b81de8fb0daf95d6e83a6ef23b4
+  data.tar.gz: b50573ced241fa10e647fa893d64c252cf274e697f100eba87f7c465aba138a76ae5eb4006d0d83a4e60d58efc4397dfbcd7facf0d47c4c8876039ef7cd957a5

data/lib/neo4j-core/version.rb

@@ -1,5 +1,5 @@
 module Neo4j
   module Core
-    VERSION = '7.0.7'
+    VERSION = '7.0.8'
   end
 end

data/lib/neo4j/core/cypher_session/adaptors/http.rb

@@ -15,8 +15,12 @@ module Neo4j
             @options = options
           end
 
+          DEFAULT_FARADAY_CONFIGURATOR = proc do |faraday|
+            faraday.use Faraday::Adapter::NetHttpPersistent
+          end
+
           def connect
-            @requestor = Requestor.new(@url, USER_AGENT_STRING, self.class.method(:instrument_request), @options.fetch(:faraday_options, {}))
+            @requestor = Requestor.new(@url, USER_AGENT_STRING, self.class.method(:instrument_request), @options.fetch(:faraday_configurator, DEFAULT_FARADAY_CONFIGURATOR))
           end
 
           ROW_REST = %w(row REST)
@@ -101,12 +105,12 @@ module Neo4j
             include Adaptors::HasUri
             default_url('http://neo4:neo4j@localhost:7474')
             validate_uri { |uri| uri.is_a?(URI::HTTP) }
-            def initialize(url, user_agent_string, instrument_proc, faraday_options = {})
+            def initialize(url, user_agent_string, instrument_proc, faraday_configurator)
               self.url = url
               @user = user
               @password = password
               @user_agent_string = user_agent_string
-              @faraday = wrap_connection_failed! { faraday_connection(faraday_options) }
+              @faraday = wrap_connection_failed! { faraday_connection(faraday_configurator) }
               @instrument_proc = instrument_proc
             end
 
@@ -122,11 +126,7 @@ module Neo4j
               url = url_from_path(path)
               @instrument_proc.call(method, url, request_body) do
                 wrap_connection_failed! do
-                  @faraday.run_request(method, url, request_body, REQUEST_HEADERS) do |req|
-                    # Temporary
-                    # req.options.timeout = 5
-                    # req.options.open_timeout = 5
-                  end
+                  @faraday.run_request(method, url, request_body, REQUEST_HEADERS)
                 end
               end
             end
@@ -143,21 +143,19 @@ module Neo4j
 
             private
 
-            def faraday_connection(options = {})
+            def faraday_connection(configurator)
               require 'faraday'
               require 'faraday_middleware/multi_json'
 
-              Faraday.new(url, options) do |c|
-                c.request :basic_auth, username_config(options), password_config(options)
-                c.request :multi_json
+              Faraday.new(url) do |faraday|
+                faraday.request :multi_json
 
-                c.response :multi_json, symbolize_keys: true, content_type: 'application/json'
-                c.use Faraday::Adapter::NetHttpPersistent
+                faraday.response :multi_json, symbolize_keys: true, content_type: 'application/json'
 
-                # c.response :logger, ::Logger.new(STDOUT), bodies: true
+                faraday.headers['Content-Type'] = 'application/json'
+                faraday.headers['User-Agent'] = @user_agent_string
 
-                c.headers['Content-Type'] = 'application/json'
-                c.headers['User-Agent'] = @user_agent_string
+                configurator.call(faraday)
               end
             end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j-core
 version: !ruby/object:Gem::Version
-  version: 7.0.7
+  version: 7.0.8
 platform: ruby
 authors:
 - Andreas Ronge, Chris Grigg, Brian Underwood
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-15 00:00:00.000000000 Z
+date: 2017-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday