faraday 1.10.0 → 2.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/CHANGELOG.md +197 -3
- data/README.md +11 -9
- data/examples/client_spec.rb +19 -19
- data/examples/client_test.rb +22 -22
- data/lib/faraday/adapter/test.rb +10 -4
- data/lib/faraday/adapter.rb +2 -5
- data/lib/faraday/connection.rb +12 -93
- data/lib/faraday/encoders/nested_params_encoder.rb +13 -6
- data/lib/faraday/error.rb +3 -2
- data/lib/faraday/logging/formatter.rb +1 -0
- data/lib/faraday/middleware.rb +0 -1
- data/lib/faraday/middleware_registry.rb +17 -63
- data/lib/faraday/options.rb +3 -3
- data/lib/faraday/rack_builder.rb +23 -20
- data/lib/faraday/request/authorization.rb +28 -41
- data/lib/faraday/request/instrumentation.rb +2 -0
- data/lib/faraday/request/url_encoded.rb +5 -1
- data/lib/faraday/request.rb +6 -25
- data/lib/faraday/response/json.rb +4 -4
- data/lib/faraday/response/logger.rb +2 -0
- data/lib/faraday/response/raise_error.rb +9 -1
- data/lib/faraday/response.rb +7 -20
- data/lib/faraday/utils/headers.rb +1 -1
- data/lib/faraday/utils.rb +10 -5
- data/lib/faraday/version.rb +1 -1
- data/lib/faraday.rb +8 -44
- data/spec/faraday/connection_spec.rb +136 -85
- data/spec/faraday/middleware_registry_spec.rb +31 -0
- data/spec/faraday/options/env_spec.rb +2 -2
- data/spec/faraday/params_encoders/nested_spec.rb +8 -0
- data/spec/faraday/rack_builder_spec.rb +26 -54
- data/spec/faraday/request/authorization_spec.rb +19 -32
- data/spec/faraday/request/instrumentation_spec.rb +5 -7
- data/spec/faraday/request/url_encoded_spec.rb +12 -2
- data/spec/faraday/request_spec.rb +4 -15
- data/spec/faraday/response/json_spec.rb +4 -6
- data/spec/faraday/response/raise_error_spec.rb +7 -4
- data/spec/faraday/utils/headers_spec.rb +2 -2
- data/spec/faraday/utils_spec.rb +62 -1
- data/spec/support/fake_safe_buffer.rb +1 -1
- data/spec/support/helper_methods.rb +0 -37
- data/spec/support/shared_examples/adapter.rb +0 -1
- data/spec/support/shared_examples/request_method.rb +5 -18
- metadata +8 -149
- data/lib/faraday/adapter/typhoeus.rb +0 -15
- data/lib/faraday/autoload.rb +0 -87
- data/lib/faraday/dependency_loader.rb +0 -37
- data/lib/faraday/request/basic_authentication.rb +0 -20
- data/lib/faraday/request/token_authentication.rb +0 -20
- data/spec/faraday/adapter/em_http_spec.rb +0 -49
- data/spec/faraday/adapter/em_synchrony_spec.rb +0 -18
- data/spec/faraday/adapter/excon_spec.rb +0 -49
- data/spec/faraday/adapter/httpclient_spec.rb +0 -73
- data/spec/faraday/adapter/net_http_spec.rb +0 -64
- data/spec/faraday/adapter/patron_spec.rb +0 -18
- data/spec/faraday/adapter/rack_spec.rb +0 -8
- data/spec/faraday/adapter/typhoeus_spec.rb +0 -7
- data/spec/faraday/composite_read_io_spec.rb +0 -80
- data/spec/faraday/response/middleware_spec.rb +0 -68
- data/spec/support/webmock_rack_app.rb +0 -68
|
@@ -1,18 +0,0 @@
|
|
|
1
|
-
# frozen_string_literal: true
|
|
2
|
-
|
|
3
|
-
RSpec.describe Faraday::Adapter::Patron, unless: defined?(JRUBY_VERSION) do
|
|
4
|
-
features :reason_phrase_parse
|
|
5
|
-
|
|
6
|
-
it_behaves_like 'an adapter'
|
|
7
|
-
|
|
8
|
-
it 'allows to provide adapter specific configs' do
|
|
9
|
-
conn = Faraday.new do |f|
|
|
10
|
-
f.adapter :patron do |session|
|
|
11
|
-
session.max_redirects = 10
|
|
12
|
-
raise 'Configuration block called'
|
|
13
|
-
end
|
|
14
|
-
end
|
|
15
|
-
|
|
16
|
-
expect { conn.get('/') }.to raise_error(RuntimeError, 'Configuration block called')
|
|
17
|
-
end
|
|
18
|
-
end
|
|
@@ -1,80 +0,0 @@
|
|
|
1
|
-
# frozen_string_literal: true
|
|
2
|
-
|
|
3
|
-
require 'stringio'
|
|
4
|
-
|
|
5
|
-
RSpec.describe Faraday::CompositeReadIO do
|
|
6
|
-
Part = Struct.new(:to_io) do
|
|
7
|
-
def length
|
|
8
|
-
to_io.string.length
|
|
9
|
-
end
|
|
10
|
-
end
|
|
11
|
-
|
|
12
|
-
def part(str)
|
|
13
|
-
Part.new StringIO.new(str)
|
|
14
|
-
end
|
|
15
|
-
|
|
16
|
-
def composite_io(*parts)
|
|
17
|
-
Faraday::CompositeReadIO.new(*parts)
|
|
18
|
-
end
|
|
19
|
-
|
|
20
|
-
context 'with empty composite_io' do
|
|
21
|
-
subject { composite_io }
|
|
22
|
-
|
|
23
|
-
it { expect(subject.length).to eq(0) }
|
|
24
|
-
it { expect(subject.read).to eq('') }
|
|
25
|
-
it { expect(subject.read(1)).to be_nil }
|
|
26
|
-
end
|
|
27
|
-
|
|
28
|
-
context 'with empty parts' do
|
|
29
|
-
subject { composite_io(part(''), part('')) }
|
|
30
|
-
|
|
31
|
-
it { expect(subject.length).to eq(0) }
|
|
32
|
-
it { expect(subject.read).to eq('') }
|
|
33
|
-
it { expect(subject.read(1)).to be_nil }
|
|
34
|
-
end
|
|
35
|
-
|
|
36
|
-
context 'with 2 parts' do
|
|
37
|
-
subject { composite_io(part('abcd'), part('1234')) }
|
|
38
|
-
|
|
39
|
-
it { expect(subject.length).to eq(8) }
|
|
40
|
-
it { expect(subject.read).to eq('abcd1234') }
|
|
41
|
-
it 'allows to read in chunks' do
|
|
42
|
-
expect(subject.read(3)).to eq('abc')
|
|
43
|
-
expect(subject.read(3)).to eq('d12')
|
|
44
|
-
expect(subject.read(3)).to eq('34')
|
|
45
|
-
expect(subject.read(3)).to be_nil
|
|
46
|
-
end
|
|
47
|
-
it 'allows to rewind while reading in chunks' do
|
|
48
|
-
expect(subject.read(3)).to eq('abc')
|
|
49
|
-
expect(subject.read(3)).to eq('d12')
|
|
50
|
-
subject.rewind
|
|
51
|
-
expect(subject.read(3)).to eq('abc')
|
|
52
|
-
expect(subject.read(5)).to eq('d1234')
|
|
53
|
-
expect(subject.read(3)).to be_nil
|
|
54
|
-
subject.rewind
|
|
55
|
-
expect(subject.read(2)).to eq('ab')
|
|
56
|
-
end
|
|
57
|
-
end
|
|
58
|
-
|
|
59
|
-
context 'with mix of empty and non-empty parts' do
|
|
60
|
-
subject { composite_io(part(''), part('abcd'), part(''), part('1234'), part('')) }
|
|
61
|
-
|
|
62
|
-
it 'allows to read in chunks' do
|
|
63
|
-
expect(subject.read(6)).to eq('abcd12')
|
|
64
|
-
expect(subject.read(6)).to eq('34')
|
|
65
|
-
expect(subject.read(6)).to be_nil
|
|
66
|
-
end
|
|
67
|
-
end
|
|
68
|
-
|
|
69
|
-
context 'with utf8 multibyte part' do
|
|
70
|
-
subject { composite_io(part("\x86"), part('ファイル')) }
|
|
71
|
-
|
|
72
|
-
it { expect(subject.read).to eq(String.new("\x86\xE3\x83\x95\xE3\x82\xA1\xE3\x82\xA4\xE3\x83\xAB", encoding: 'BINARY')) }
|
|
73
|
-
it 'allows to read in chunks' do
|
|
74
|
-
expect(subject.read(3)).to eq(String.new("\x86\xE3\x83", encoding: 'BINARY'))
|
|
75
|
-
expect(subject.read(3)).to eq(String.new("\x95\xE3\x82", encoding: 'BINARY'))
|
|
76
|
-
expect(subject.read(8)).to eq(String.new("\xA1\xE3\x82\xA4\xE3\x83\xAB", encoding: 'BINARY'))
|
|
77
|
-
expect(subject.read(3)).to be_nil
|
|
78
|
-
end
|
|
79
|
-
end
|
|
80
|
-
end
|
|
@@ -1,68 +0,0 @@
|
|
|
1
|
-
# frozen_string_literal: true
|
|
2
|
-
|
|
3
|
-
RSpec.describe Faraday::Response::Middleware do
|
|
4
|
-
let(:conn) do
|
|
5
|
-
Faraday.new do |b|
|
|
6
|
-
b.use custom_middleware
|
|
7
|
-
b.adapter :test do |stub|
|
|
8
|
-
stub.get('ok') { [200, { 'Content-Type' => 'text/html' }, '<body></body>'] }
|
|
9
|
-
stub.get('not_modified') { [304, nil, nil] }
|
|
10
|
-
stub.get('no_content') { [204, nil, nil] }
|
|
11
|
-
end
|
|
12
|
-
end
|
|
13
|
-
end
|
|
14
|
-
|
|
15
|
-
context 'with a custom ResponseMiddleware' do
|
|
16
|
-
let(:custom_middleware) do
|
|
17
|
-
Class.new(Faraday::Response::Middleware) do
|
|
18
|
-
def parse(body)
|
|
19
|
-
body.upcase
|
|
20
|
-
end
|
|
21
|
-
end
|
|
22
|
-
end
|
|
23
|
-
|
|
24
|
-
it 'parses the response' do
|
|
25
|
-
expect(conn.get('ok').body).to eq('<BODY></BODY>')
|
|
26
|
-
end
|
|
27
|
-
end
|
|
28
|
-
|
|
29
|
-
context 'with a custom ResponseMiddleware and private parse' do
|
|
30
|
-
let(:custom_middleware) do
|
|
31
|
-
Class.new(Faraday::Response::Middleware) do
|
|
32
|
-
private
|
|
33
|
-
|
|
34
|
-
def parse(body)
|
|
35
|
-
body.upcase
|
|
36
|
-
end
|
|
37
|
-
end
|
|
38
|
-
end
|
|
39
|
-
|
|
40
|
-
it 'parses the response' do
|
|
41
|
-
expect(conn.get('ok').body).to eq('<BODY></BODY>')
|
|
42
|
-
end
|
|
43
|
-
end
|
|
44
|
-
|
|
45
|
-
context 'with a custom ResponseMiddleware but empty response' do
|
|
46
|
-
let(:custom_middleware) do
|
|
47
|
-
Class.new(Faraday::Response::Middleware) do
|
|
48
|
-
def parse(_body)
|
|
49
|
-
raise 'this should not be called'
|
|
50
|
-
end
|
|
51
|
-
end
|
|
52
|
-
end
|
|
53
|
-
|
|
54
|
-
it 'raises exception for 200 responses' do
|
|
55
|
-
expect { conn.get('ok') }.to raise_error(StandardError)
|
|
56
|
-
end
|
|
57
|
-
|
|
58
|
-
it 'doesn\'t call the middleware for 204 responses' do
|
|
59
|
-
expect_any_instance_of(custom_middleware).not_to receive(:parse)
|
|
60
|
-
expect(conn.get('no_content').body).to be_nil
|
|
61
|
-
end
|
|
62
|
-
|
|
63
|
-
it 'doesn\'t call the middleware for 304 responses' do
|
|
64
|
-
expect_any_instance_of(custom_middleware).not_to receive(:parse)
|
|
65
|
-
expect(conn.get('not_modified').body).to be_nil
|
|
66
|
-
end
|
|
67
|
-
end
|
|
68
|
-
end
|
|
@@ -1,68 +0,0 @@
|
|
|
1
|
-
# frozen_string_literal: true
|
|
2
|
-
|
|
3
|
-
# Rack app used to test the Rack adapter.
|
|
4
|
-
# Uses Webmock to check if requests are registered, in which case it returns
|
|
5
|
-
# the registered response.
|
|
6
|
-
class WebmockRackApp
|
|
7
|
-
def call(env)
|
|
8
|
-
req_signature = WebMock::RequestSignature.new(
|
|
9
|
-
req_method(env),
|
|
10
|
-
req_uri(env),
|
|
11
|
-
body: req_body(env),
|
|
12
|
-
headers: req_headers(env)
|
|
13
|
-
)
|
|
14
|
-
|
|
15
|
-
WebMock::RequestRegistry
|
|
16
|
-
.instance
|
|
17
|
-
.requested_signatures
|
|
18
|
-
.put(req_signature)
|
|
19
|
-
|
|
20
|
-
process_response(req_signature)
|
|
21
|
-
end
|
|
22
|
-
|
|
23
|
-
def req_method(env)
|
|
24
|
-
env['REQUEST_METHOD'].downcase.to_sym
|
|
25
|
-
end
|
|
26
|
-
|
|
27
|
-
def req_uri(env)
|
|
28
|
-
scheme = env['rack.url_scheme']
|
|
29
|
-
host = env['SERVER_NAME']
|
|
30
|
-
port = env['SERVER_PORT']
|
|
31
|
-
path = env['PATH_INFO']
|
|
32
|
-
query = env['QUERY_STRING']
|
|
33
|
-
|
|
34
|
-
url = +"#{scheme}://#{host}:#{port}#{path}"
|
|
35
|
-
url += "?#{query}" if query
|
|
36
|
-
|
|
37
|
-
uri = WebMock::Util::URI.heuristic_parse(url)
|
|
38
|
-
uri.path = uri.normalized_path.gsub('[^:]//', '/')
|
|
39
|
-
uri
|
|
40
|
-
end
|
|
41
|
-
|
|
42
|
-
def req_headers(env)
|
|
43
|
-
http_headers = env.select { |k, _| k.start_with?('HTTP_') }
|
|
44
|
-
.map { |k, v| [k[5..-1], v] }
|
|
45
|
-
.to_h
|
|
46
|
-
|
|
47
|
-
special_headers = Faraday::Adapter::Rack::SPECIAL_HEADERS
|
|
48
|
-
http_headers.merge(env.select { |k, _| special_headers.include?(k) })
|
|
49
|
-
end
|
|
50
|
-
|
|
51
|
-
def req_body(env)
|
|
52
|
-
env['rack.input'].read
|
|
53
|
-
end
|
|
54
|
-
|
|
55
|
-
def process_response(req_signature)
|
|
56
|
-
res = WebMock::StubRegistry.instance.response_for_request(req_signature)
|
|
57
|
-
|
|
58
|
-
if res.nil? && req_signature.uri.host == 'localhost'
|
|
59
|
-
raise Faraday::ConnectionFailed, 'Trying to connect to localhost'
|
|
60
|
-
end
|
|
61
|
-
|
|
62
|
-
raise WebMock::NetConnectNotAllowedError, req_signature unless res
|
|
63
|
-
|
|
64
|
-
raise Faraday::TimeoutError if res.should_timeout
|
|
65
|
-
|
|
66
|
-
[res.status[0], res.headers || {}, [res.body || '']]
|
|
67
|
-
end
|
|
68
|
-
end
|