faraday-net_http 3.0.2 → 3.1.1

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 9cad2197cf7df07a668741fb5ae27309b6f7aee396b207268ba63076569ae59f
4
- data.tar.gz: 47fbe72a4c70f85b5659376f0a758088d26c8a6f2901a8320a22bfba872e2c1f
3
+ metadata.gz: e595625bf65cf66a44d366ec36d1b221c7fe62b1d53a572a8b3bd5d953b268e0
4
+ data.tar.gz: 5d7eea07713333aca4c4c8af94abf07b79c4e84a7e7d4fd79600a884a56d8711
5
5
  SHA512:
6
- metadata.gz: 7b6cb45789018beedcef079c136c213e6532aba87d2503bd6f1544cf30f3ab3cdda9c08e4164d0f93a056595622cdf9c8f125e19798f8147e3e52f1387c5c800
7
- data.tar.gz: 66131665eb559ad8b1bbba18c12916c3ace677b93a6055269c7def945dced9021f2864df22d9326880a8379602e0ac78fd44f49c137217e05978fa7377cedb3d
6
+ metadata.gz: dedd8d9936531d1413cef8619cfe9ff411737741e48cb21229cf0c8859d334c37b5a14d808aa0272714a3ac188b71e42d5d43c1e6afd66ab126cd6db749bdb26
7
+ data.tar.gz: ae77a363d57842f37d0cd68af730901e5c7fee5c8bc3a4efceec3df55012a0649eb66a4968eb73fe5317a2c565f604fe534e5ee5ba5600bae47490a4c978c04a
@@ -42,8 +42,7 @@ module Faraday
42
42
 
43
43
  def build_connection(env)
44
44
  net_http_connection(env).tap do |http|
45
- http.use_ssl = env[:url].scheme == 'https' if http.respond_to?(:use_ssl=)
46
- configure_ssl(http, env[:ssl])
45
+ configure_ssl(http, env[:ssl]) if env[:url].scheme == 'https' && env[:ssl]
47
46
  configure_request(http, env[:request])
48
47
  end
49
48
  end
@@ -106,18 +105,14 @@ module Faraday
106
105
  http_response
107
106
  end
108
107
 
109
- def request_with_wrapped_block(http, env)
108
+ def request_with_wrapped_block(http, env, &block)
110
109
  # Must use Net::HTTP#start and pass it a block otherwise the server's
111
110
  # TCP socket does not close correctly.
112
111
  http.start do |opened_http|
113
112
  opened_http.request create_request(env) do |response|
114
113
  save_http_response(env, response)
115
114
 
116
- if block_given?
117
- response.read_body do |chunk|
118
- yield(chunk)
119
- end
120
- end
115
+ response.read_body(&block) if block_given?
121
116
  end
122
117
  end
123
118
  end
@@ -133,7 +128,7 @@ module Faraday
133
128
  end
134
129
 
135
130
  def configure_ssl(http, ssl)
136
- return unless ssl
131
+ http.use_ssl = true if http.respond_to?(:use_ssl=)
137
132
 
138
133
  http.verify_mode = ssl_verify_mode(ssl)
139
134
  http.cert_store = ssl_cert_store(ssl)
@@ -172,20 +167,18 @@ module Faraday
172
167
  def ssl_cert_store(ssl)
173
168
  return ssl[:cert_store] if ssl[:cert_store]
174
169
 
175
- @ssl_cert_store ||= begin
176
- # Use the default cert store by default, i.e. system ca certs
177
- OpenSSL::X509::Store.new.tap(&:set_default_paths)
178
- end
170
+ # Use the default cert store by default, i.e. system ca certs
171
+ @ssl_cert_store ||= OpenSSL::X509::Store.new.tap(&:set_default_paths)
179
172
  end
180
173
 
181
174
  def ssl_verify_mode(ssl)
182
175
  ssl[:verify_mode] || begin
183
- if ssl.fetch(:verify, true)
184
- OpenSSL::SSL::VERIFY_PEER
185
- else
186
- OpenSSL::SSL::VERIFY_NONE
187
- end
188
- end
176
+ if ssl.fetch(:verify, true)
177
+ OpenSSL::SSL::VERIFY_PEER
178
+ else
179
+ OpenSSL::SSL::VERIFY_NONE
180
+ end
181
+ end
189
182
  end
190
183
 
191
184
  def encoded_body(http_response)
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Faraday
4
4
  module NetHttp
5
- VERSION = '3.0.2'
5
+ VERSION = '3.1.1'
6
6
  end
7
7
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: faraday-net_http
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.0.2
4
+ version: 3.1.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Jan van der Pas
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2022-11-11 00:00:00.000000000 Z
11
+ date: 2024-07-24 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: faraday
@@ -24,6 +24,20 @@ dependencies:
24
24
  - - ">="
25
25
  - !ruby/object:Gem::Version
26
26
  version: '2.5'
27
+ - !ruby/object:Gem::Dependency
28
+ name: net-http
29
+ requirement: !ruby/object:Gem::Requirement
30
+ requirements:
31
+ - - ">="
32
+ - !ruby/object:Gem::Version
33
+ version: '0'
34
+ type: :runtime
35
+ prerelease: false
36
+ version_requirements: !ruby/object:Gem::Requirement
37
+ requirements:
38
+ - - ">="
39
+ - !ruby/object:Gem::Version
40
+ version: '0'
27
41
  description: Faraday adapter for Net::HTTP
28
42
  email:
29
43
  - janvanderpas@gmail.com
@@ -42,7 +56,7 @@ licenses:
42
56
  metadata:
43
57
  homepage_uri: https://github.com/lostisland/faraday-net_http
44
58
  source_code_uri: https://github.com/lostisland/faraday-net_http
45
- changelog_uri: https://github.com/lostisland/faraday-net_http/releases/tag/v3.0.2
59
+ changelog_uri: https://github.com/lostisland/faraday-net_http/releases/tag/v3.1.1
46
60
  post_install_message:
47
61
  rdoc_options: []
48
62
  require_paths:
@@ -51,14 +65,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
51
65
  requirements:
52
66
  - - ">="
53
67
  - !ruby/object:Gem::Version
54
- version: 2.6.0
68
+ version: 3.0.0
55
69
  required_rubygems_version: !ruby/object:Gem::Requirement
56
70
  requirements:
57
71
  - - ">="
58
72
  - !ruby/object:Gem::Version
59
73
  version: '0'
60
74
  requirements: []
61
- rubygems_version: 3.1.6
75
+ rubygems_version: 3.5.3
62
76
  signing_key:
63
77
  specification_version: 4
64
78
  summary: Faraday adapter for Net::HTTP