Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow Faraday init params to be passed to HTTP adaptor #288

Merged
merged 5 commits into from
Mar 14, 2017
Merged

Allow Faraday init params to be passed to HTTP adaptor #288

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
62ad69c
Allow Faraday init params to be passed to HTTP adaptor
heavydawson Mar 11, 2017
0b42d54
Update http.rb
heavydawson Mar 13, 2017
424843a
Fix failing tests
heavydawson Mar 13, 2017
817261e
Fix failing rubocop issues
heavydawson Mar 13, 2017
2b8c741
Fix silly C&P error
heavydawson Mar 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 14 additions & 7 deletions lib/neo4j/core/cypher_session/adaptors/http.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ def initialize(url, options = {})
end

def connect
@requestor = Requestor.new(@url, USER_AGENT_STRING, self.class.method(:instrument_request))
@requestor = Requestor.new(@url, USER_AGENT_STRING, self.class.method(:instrument_request), @options[:faraday_options] ||= {})
end

ROW_REST = %w(row REST)
Expand Down Expand Up @@ -101,13 +101,12 @@ class Requestor
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)
def initialize(url, user_agent_string, instrument_proc, faraday_options = {})
self.url = url
@user = user
@password = password
@user_agent_string = user_agent_string
@faraday = wrap_connection_failed! { faraday_connection }
@faraday = wrap_connection_failed! { faraday_connection(faraday_options.fetch(:initialize, {})) }
@instrument_proc = instrument_proc
end

Expand Down Expand Up @@ -144,12 +143,12 @@ def get(path, body = '', options = {})

private

def faraday_connection
def faraday_connection(options = {})
require 'faraday'
require 'faraday_middleware/multi_json'

Faraday.new(url) do |c|
c.request :basic_auth, user, password
Faraday.new(url, options) do |c|
c.request :basic_auth, config_username(user, options), config_password(password, options)
c.request :multi_json

c.response :multi_json, symbolize_keys: true, content_type: 'application/json'
Expand All @@ -162,6 +161,14 @@ def faraday_connection
end
end

def config_password(password, options)
options[:basic_auth] ? options[:basic_auth][:password] : password
end

def config_username(user, options)
options[:basic_auth] ? options[:basic_auth][:username] : user
end

def request_body(body)
return body if body.is_a?(String)

Expand Down