faraday-http 1.1.0 → 2.0.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/faraday/adapter/http.rb +34 -25
- data/lib/faraday/http/version.rb +1 -1
- metadata +6 -5
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: a05570eef6dd08482c54a0a61075c54d3d16be4593d74916455f0776b31363d3
|
4
|
+
data.tar.gz: 91b37ec14ae375e91dc93305b8f7ae5f8d143784458091617c53268e81dd3fa7
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: e44331b34e0bb87f3232dfdab12aaa592df0cb3ec2498012b8a16fdc4dae28d06c7ce370e23de3e33a75591ce70875a2b70a217aa133c35a9313e82b9199764b
|
7
|
+
data.tar.gz: 18824e03bebea59b963c754210f5fc3e4904e44e07b0c9106987f383c4af4a87305e3562cea5ebdef015e0a368248bad3585d0ed3499139025c7f8c17f0b6ae6
|
data/lib/faraday/adapter/http.rb
CHANGED
@@ -1,11 +1,11 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
+
require 'http'
|
4
|
+
|
3
5
|
module Faraday
|
4
6
|
class Adapter
|
5
7
|
# HTTP.rb adapter.
|
6
8
|
class HTTP < Faraday::Adapter
|
7
|
-
dependency 'http'
|
8
|
-
|
9
9
|
# Takes the environment and performs the request.
|
10
10
|
#
|
11
11
|
# @param env [Faraday::Env] the request environment.
|
@@ -20,13 +20,22 @@ module Faraday
|
|
20
20
|
private
|
21
21
|
|
22
22
|
def perform_request(env)
|
23
|
-
|
23
|
+
connection = setup_connection(env)
|
24
24
|
|
25
|
-
|
26
|
-
|
27
|
-
|
25
|
+
response = connection.request env[:method], env[:url],
|
26
|
+
body: env[:body],
|
27
|
+
ssl_context: ssl_context(env[:ssl])
|
28
|
+
|
29
|
+
if env.stream_response?
|
30
|
+
env.stream_response do |&on_data|
|
31
|
+
request_with_wrapped_block(response, env, &on_data)
|
32
|
+
end
|
33
|
+
body = ''
|
34
|
+
else
|
35
|
+
body = response.body.to_s
|
36
|
+
end
|
28
37
|
|
29
|
-
save_response(env,
|
38
|
+
save_response(env, response.code, body, response.headers, response.status.reason)
|
30
39
|
rescue ::HTTP::TimeoutError
|
31
40
|
raise Faraday::TimeoutError, $ERROR_INFO
|
32
41
|
rescue ::HTTP::ConnectionError
|
@@ -37,6 +46,14 @@ module Faraday
|
|
37
46
|
raise
|
38
47
|
end
|
39
48
|
|
49
|
+
def request_with_wrapped_block(response, env)
|
50
|
+
return unless block_given?
|
51
|
+
|
52
|
+
while (chunk = response.body.readpartial)
|
53
|
+
yield(chunk, env)
|
54
|
+
end
|
55
|
+
end
|
56
|
+
|
40
57
|
def setup_connection(env)
|
41
58
|
conn = ::HTTP
|
42
59
|
|
@@ -97,27 +114,19 @@ module Faraday
|
|
97
114
|
end
|
98
115
|
|
99
116
|
def ssl_client_cert(cert)
|
100
|
-
|
101
|
-
|
102
|
-
|
103
|
-
|
104
|
-
|
105
|
-
cert
|
106
|
-
else
|
107
|
-
raise Faraday::Error, "invalid ssl.client_cert: #{cert.inspect}"
|
108
|
-
end
|
117
|
+
return nil if cert.nil?
|
118
|
+
return OpenSSL::X509::Certificate.new(File.read(cert)) if cert.is_a(String)
|
119
|
+
return cert if cert.is_a?(OpenSSL::X509::Certificate)
|
120
|
+
|
121
|
+
raise Faraday::Error, "invalid ssl.client_cert: #{cert.inspect}"
|
109
122
|
end
|
110
123
|
|
111
124
|
def ssl_client_key(cert)
|
112
|
-
|
113
|
-
|
114
|
-
|
115
|
-
|
116
|
-
|
117
|
-
cert
|
118
|
-
else
|
119
|
-
raise Faraday::Error, "invalid ssl.client_key: #{cert.inspect}"
|
120
|
-
end
|
125
|
+
return nil if cert.nil?
|
126
|
+
return OpenSSL::PKey::RSA.new(File.read(cert)) if cert.is_a(String)
|
127
|
+
return cert if cert.is_a?(OpenSSL::PKey::RSA, OpenSSL::PKey::DSA)
|
128
|
+
|
129
|
+
raise Faraday::Error, "invalid ssl.client_key: #{cert.inspect}"
|
121
130
|
end
|
122
131
|
end
|
123
132
|
end
|
data/lib/faraday/http/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: faraday-http
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version:
|
4
|
+
version: 2.0.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- iMacTia
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2022-10-22 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: faraday
|
@@ -16,14 +16,14 @@ dependencies:
|
|
16
16
|
requirements:
|
17
17
|
- - "~>"
|
18
18
|
- !ruby/object:Gem::Version
|
19
|
-
version: '
|
19
|
+
version: '2.5'
|
20
20
|
type: :runtime
|
21
21
|
prerelease: false
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
23
23
|
requirements:
|
24
24
|
- - "~>"
|
25
25
|
- !ruby/object:Gem::Version
|
26
|
-
version: '
|
26
|
+
version: '2.5'
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
28
|
name: http
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
@@ -133,6 +133,7 @@ metadata:
|
|
133
133
|
homepage_uri: https://github.com/lostisland/faraday-http
|
134
134
|
source_code_uri: https://github.com/lostisland/faraday-http
|
135
135
|
changelog_uri: https://github.com/lostisland/faraday-http/releases
|
136
|
+
rubygems_mfa_required: 'true'
|
136
137
|
post_install_message:
|
137
138
|
rdoc_options: []
|
138
139
|
require_paths:
|
@@ -141,7 +142,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
141
142
|
requirements:
|
142
143
|
- - ">="
|
143
144
|
- !ruby/object:Gem::Version
|
144
|
-
version: '2.
|
145
|
+
version: '2.6'
|
145
146
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
146
147
|
requirements:
|
147
148
|
- - ">="
|