faraday 0.15.4 → 0.17.4
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 +232 -0
- data/README.md +15 -1
- data/Rakefile +13 -0
- data/lib/faraday/adapter/em_http.rb +9 -9
- data/lib/faraday/adapter/em_synchrony.rb +5 -5
- data/lib/faraday/adapter/excon.rb +3 -3
- data/lib/faraday/adapter/httpclient.rb +4 -4
- data/lib/faraday/adapter/net_http.rb +3 -2
- data/lib/faraday/adapter/net_http_persistent.rb +4 -4
- data/lib/faraday/adapter/patron.rb +5 -5
- data/lib/faraday/adapter/rack.rb +1 -1
- data/lib/faraday/deprecate.rb +109 -0
- data/lib/faraday/error.rb +127 -35
- data/lib/faraday/options.rb +3 -3
- data/lib/faraday/rack_builder.rb +2 -2
- data/lib/faraday/request/retry.rb +8 -5
- data/lib/faraday/response/raise_error.rb +7 -3
- data/lib/faraday/response.rb +3 -3
- data/lib/faraday.rb +2 -3
- data/spec/faraday/deprecate_spec.rb +147 -0
- data/spec/faraday/error_spec.rb +102 -0
- data/spec/faraday/response/raise_error_spec.rb +106 -0
- data/spec/spec_helper.rb +105 -0
- data/test/adapters/default_test.rb +14 -0
- data/test/adapters/em_http_test.rb +30 -0
- data/test/adapters/em_synchrony_test.rb +32 -0
- data/test/adapters/excon_test.rb +30 -0
- data/test/adapters/httpclient_test.rb +34 -0
- data/test/adapters/integration.rb +263 -0
- data/test/adapters/logger_test.rb +136 -0
- data/test/adapters/net_http_persistent_test.rb +114 -0
- data/test/adapters/net_http_test.rb +79 -0
- data/test/adapters/patron_test.rb +40 -0
- data/test/adapters/rack_test.rb +38 -0
- data/test/adapters/test_middleware_test.rb +157 -0
- data/test/adapters/typhoeus_test.rb +38 -0
- data/test/authentication_middleware_test.rb +65 -0
- data/test/composite_read_io_test.rb +109 -0
- data/test/connection_test.rb +738 -0
- data/test/env_test.rb +268 -0
- data/test/helper.rb +75 -0
- data/test/live_server.rb +67 -0
- data/test/middleware/instrumentation_test.rb +88 -0
- data/test/middleware/retry_test.rb +282 -0
- data/test/middleware_stack_test.rb +260 -0
- data/test/multibyte.txt +1 -0
- data/test/options_test.rb +333 -0
- data/test/parameters_test.rb +157 -0
- data/test/request_middleware_test.rb +126 -0
- data/test/response_middleware_test.rb +72 -0
- data/test/strawberry.rb +2 -0
- data/test/utils_test.rb +98 -0
- metadata +48 -7
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: b53b5c1f4239a1b798cc39d21c2ba204f1f1682c68650dfd5abd2a15acad8f4c
|
4
|
+
data.tar.gz: 494d3b48b2b5cbd07433d786e3dcac4570c5a8319b6bdbbba481957ec18ad667
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: e473d6f5f690de91f62283db0364e3a304077dd3445b924a9636a7691593d8d7abf715d5e1ccd7838364a85d4e8611bc4c7d6ab1195b5f0c30d24e32a9d6946c
|
7
|
+
data.tar.gz: 84f629bd1dce5dc09637fec05c46d8f78d018b7f89adc4b7a945e50f3edc0cc2077733ca74b41b92e5afb02876f25168b6e40832cf40bebe5c9b63d53fe6a9ac
|
data/CHANGELOG.md
ADDED
@@ -0,0 +1,232 @@
|
|
1
|
+
# Faraday Changelog
|
2
|
+
|
3
|
+
## v0.17.3
|
4
|
+
|
5
|
+
Fixes:
|
6
|
+
|
7
|
+
* Reverts changes in error classes hierarchy. #1092 (@iMacTia)
|
8
|
+
* Fix Ruby 1.9 syntax errors and improve Error class testing #1094 (@BanzaiMan,
|
9
|
+
@mrexox, @technoweenie)
|
10
|
+
|
11
|
+
Misc:
|
12
|
+
|
13
|
+
* Stops using `&Proc.new` for block forwarding. #1083 (@olleolleolle)
|
14
|
+
* Update CI to test against ruby 2.0-2.7 #1087, #1099 (@iMacTia, @olleolleolle,
|
15
|
+
@technoweenie)
|
16
|
+
* require FARADAY_DEPRECATE=warn to show Faraday v1.0 deprecation warnings
|
17
|
+
#1098 (@technoweenie)
|
18
|
+
|
19
|
+
## v0.17.1
|
20
|
+
|
21
|
+
Final release before Faraday v1.0, with important fixes for Ruby 2.7.
|
22
|
+
|
23
|
+
Fixes:
|
24
|
+
|
25
|
+
* RaiseError response middleware raises exception if HTTP client returns a nil
|
26
|
+
status. #1042 (@jonnyom, @BobbyMcWho)
|
27
|
+
|
28
|
+
Misc:
|
29
|
+
|
30
|
+
* Fix Ruby 2.7 warnings (#1009)
|
31
|
+
* Add `Faraday::Deprecate` to warn about upcoming v1.0 changes. (#1054, #1059,
|
32
|
+
#1076, #1077)
|
33
|
+
* Add release notes up to current in CHANGELOG.md (#1066)
|
34
|
+
* Port minimal rspec suite from main branch to run backported tests. (#1058)
|
35
|
+
|
36
|
+
## v0.17.0
|
37
|
+
|
38
|
+
This release is the same as v0.15.4. It was pushed to cover up releases
|
39
|
+
v0.16.0-v0.16.2.
|
40
|
+
|
41
|
+
## v0.15.4
|
42
|
+
|
43
|
+
* Expose `pool_size` as a option for the NetHttpPersistent adapter (#834)
|
44
|
+
|
45
|
+
## v0.15.3
|
46
|
+
|
47
|
+
* Make Faraday::Request serialisable with Marshal. (#803)
|
48
|
+
* Add DEFAULT_EXCEPTIONS constant to Request::Retry (#814)
|
49
|
+
* Add support for Ruby 2.6 Net::HTTP write_timeout (#824)
|
50
|
+
|
51
|
+
## v0.15.2
|
52
|
+
|
53
|
+
* Prevents `Net::HTTP` adapters to retry request internally by setting `max_retries` to 0 if available (Ruby 2.5+). (#799)
|
54
|
+
* Fixes `NestedParamsEncoder` handling of empty array values (#801)
|
55
|
+
|
56
|
+
## v0.15.1
|
57
|
+
|
58
|
+
* NetHttpPersistent adapter better reuse of SSL connections (#793)
|
59
|
+
* Refactor: inline cached_connection (#797)
|
60
|
+
* Logger middleware: use $stdout instead of STDOUT (#794)
|
61
|
+
* Fix: do not memoize/reuse Patron session (#796)
|
62
|
+
|
63
|
+
Also in this release:
|
64
|
+
|
65
|
+
* Allow setting min/max ssl version for Net::HTTP (#792)
|
66
|
+
* Allow setting min/max ssl version for Excon (#795)
|
67
|
+
|
68
|
+
## v0.15.0
|
69
|
+
|
70
|
+
Features:
|
71
|
+
|
72
|
+
* Added retry block option to retry middleware. (#770)
|
73
|
+
* Retry middleware improvements (honour Retry-After header, retry statuses) (#773)
|
74
|
+
* Improve response logger middleware output (#784)
|
75
|
+
|
76
|
+
Fixes:
|
77
|
+
|
78
|
+
* Remove unused class error (#767)
|
79
|
+
* Fix minor typo in README (#760)
|
80
|
+
* Reuse persistent connections when using net-http-persistent (#778)
|
81
|
+
* Fix Retry middleware documentation (#781)
|
82
|
+
* Returns the http response when giving up on retrying by status (#783)
|
83
|
+
|
84
|
+
## v0.14.0
|
85
|
+
|
86
|
+
Features:
|
87
|
+
|
88
|
+
* Allow overriding env proxy (#754)
|
89
|
+
* Remove legacy Typhoeus adapter (#715)
|
90
|
+
* External Typhoeus Adapter Compatibility (#748)
|
91
|
+
* Warn about missing adapter when making a request (#743)
|
92
|
+
* Faraday::Adapter::Test stubs now support entire urls (with host) (#741)
|
93
|
+
|
94
|
+
Fixes:
|
95
|
+
|
96
|
+
* If proxy is manually provided, this takes priority over `find_proxy` (#724)
|
97
|
+
* Fixes the behaviour for Excon's open_timeout (not setting write_timeout anymore) (#731)
|
98
|
+
* Handle all connection timeout messages in Patron (#687)
|
99
|
+
|
100
|
+
## v0.13.1
|
101
|
+
|
102
|
+
* Fixes an incompatibility with Addressable::URI being used as uri_parser
|
103
|
+
|
104
|
+
## v0.13.0
|
105
|
+
|
106
|
+
Features:
|
107
|
+
|
108
|
+
* Dynamically reloads the proxy when performing a request on an absolute domain (#701)
|
109
|
+
* Adapter support for Net::HTTP::Persistent v3.0.0 (#619)
|
110
|
+
|
111
|
+
Fixes:
|
112
|
+
|
113
|
+
* Prefer #hostname over #host. (#714)
|
114
|
+
* Fixes an edge-case issue with response headers parsing (missing HTTP header) (#719)
|
115
|
+
|
116
|
+
## v0.12.2
|
117
|
+
|
118
|
+
* Parse headers from aggregated proxy requests/responses (#681)
|
119
|
+
* Guard against invalid middleware configuration with warning (#685)
|
120
|
+
* Do not use :insecure option by default in Patron (#691)
|
121
|
+
* Fixes an issue with HTTPClient not raising a `Faraday::ConnectionFailed` (#702)
|
122
|
+
* Fixes YAML serialization/deserialization for `Faraday::Utils::Headers` (#690)
|
123
|
+
* Fixes an issue with Options having a nil value (#694)
|
124
|
+
* Fixes an issue with Faraday.default_connection not using Faraday.default_connection_options (#698)
|
125
|
+
* Fixes an issue with Options.merge! and Faraday instrumentation middleware (#710)
|
126
|
+
|
127
|
+
## v0.12.1
|
128
|
+
|
129
|
+
* Fix an issue with Patron tests failing on jruby
|
130
|
+
* Fix an issue with new `rewind_files` feature that was causing an exception when the body was not an Hash
|
131
|
+
* Expose wrapped_exception in all client errors
|
132
|
+
* Add Authentication Section to the ReadMe
|
133
|
+
|
134
|
+
## v0.12.0.1
|
135
|
+
|
136
|
+
* Hotfix release to address an issue with TravisCI deploy on Rubygems
|
137
|
+
|
138
|
+
## v0.12.0
|
139
|
+
|
140
|
+
Features:
|
141
|
+
|
142
|
+
* Proxy feature now relies on Ruby `URI::Generic#find_proxy` and can use `no_proxy` ENV variable (not compatible with ruby < 2.0)
|
143
|
+
* Adds support for `context` request option to pass arbitrary information to middlewares
|
144
|
+
|
145
|
+
Fixes:
|
146
|
+
|
147
|
+
* Fix an issue with options that was causing new options to override defaults ones unexpectedly
|
148
|
+
* Rewind `UploadIO`s on retry to fix a compatibility issue
|
149
|
+
* Make multipart boundary unique
|
150
|
+
* Improvements in `README.md`
|
151
|
+
|
152
|
+
## v0.11.0
|
153
|
+
|
154
|
+
Features:
|
155
|
+
|
156
|
+
* Add `filter` method to Logger middleware
|
157
|
+
* Add support for Ruby2.4 and Minitest 6
|
158
|
+
* Introduce block syntax to customise the adapter
|
159
|
+
|
160
|
+
Fixes:
|
161
|
+
|
162
|
+
* Fix an issue that was allowing to override `default_connection_options` from a connection instance
|
163
|
+
* Fix a bug that was causing newline escape characters ("\n") to be used when building the Authorization header
|
164
|
+
|
165
|
+
## v0.10.1
|
166
|
+
|
167
|
+
- Fix an issue with HTTPClient adapter that was causing the SSL to be reset on every request
|
168
|
+
- Rescue `IOError` instead of specific subclass
|
169
|
+
- `Faraday::Utils::Headers` can now be successfully serialised in YAML
|
170
|
+
- Handle `default_connection_options` set with hash
|
171
|
+
|
172
|
+
## v0.10.0
|
173
|
+
|
174
|
+
Breaking changes:
|
175
|
+
- Drop support for Ruby 1.8
|
176
|
+
|
177
|
+
Features:
|
178
|
+
- Include wrapped exception/reponse in ClientErrors
|
179
|
+
- Add `response.reason_phrase`
|
180
|
+
- Provide option to selectively skip logging request/response headers
|
181
|
+
- Add regex support for pattern matching in `test` adapter
|
182
|
+
|
183
|
+
Fixes:
|
184
|
+
- Add `Faraday.respond_to?` to find methods managed by `method_missing`
|
185
|
+
- em-http: `request.host` instead of `connection.host` should be taken for SSL validations
|
186
|
+
- Allow `default_connection_options` to be merged when options are passed as url parameter
|
187
|
+
- Improve splitting key-value pairs in raw HTTP headers
|
188
|
+
|
189
|
+
## v0.9.2
|
190
|
+
|
191
|
+
Adapters:
|
192
|
+
- Enable gzip compression for httpclient
|
193
|
+
- Fixes default certificate store for httpclient not having default paths.
|
194
|
+
- Make excon adapter compatible with 0.44 excon version
|
195
|
+
- Add compatibility with Patron 0.4.20
|
196
|
+
- Determine default port numbers in Net::HTTP adapters (Addressable compatibility)
|
197
|
+
- em-http: wrap "connection closed by server" as ConnectionFailed type
|
198
|
+
- Wrap Errno::ETIMEDOUT in Faraday::Error::TimeoutError
|
199
|
+
|
200
|
+
Utils:
|
201
|
+
- Add Rack-compatible support for parsing `a[][b]=c` nested queries
|
202
|
+
- Encode nil values in queries different than empty strings. Before: `a=`; now: `a`.
|
203
|
+
- Have `Faraday::Utils::Headers#replace` clear internal key cache
|
204
|
+
- Dup the internal key cache when a Headers hash is copied
|
205
|
+
|
206
|
+
Env and middleware:
|
207
|
+
- Ensure `env` stored on middleware response has reference to the response
|
208
|
+
- Ensure that Response properties are initialized during `on_complete` (VCR compatibility)
|
209
|
+
- Copy request options in Faraday::Connection#dup
|
210
|
+
- Env custom members should be copied by Env.from(env)
|
211
|
+
- Honour per-request `request.options.params_encoder`
|
212
|
+
- Fix `interval_randomness` data type for Retry middleware
|
213
|
+
- Add maximum interval option for Retry middleware
|
214
|
+
|
215
|
+
## v0.9.1
|
216
|
+
|
217
|
+
* Refactor Net:HTTP adapter so that with_net_http_connection can be overridden to allow pooled connections. (@Ben-M)
|
218
|
+
* Add configurable methods that bypass `retry_if` in the Retry request middleware. (@mike-bourgeous)
|
219
|
+
|
220
|
+
## v0.9.0
|
221
|
+
|
222
|
+
* Add HTTPClient adapter (@hakanensari)
|
223
|
+
* Improve Retry handler (@mislav)
|
224
|
+
* Remove autoloading by default (@technoweenie)
|
225
|
+
* Improve internal docs (@technoweenie, @mislav)
|
226
|
+
* Respect user/password in http proxy string (@mislav)
|
227
|
+
* Adapter options are structs. Reinforces consistent options across adapters
|
228
|
+
(@technoweenie)
|
229
|
+
* Stop stripping trailing / off base URLs in a Faraday::Connection. (@technoweenie)
|
230
|
+
* Add a configurable URI parser. (@technoweenie)
|
231
|
+
* Remove need to manually autoload when using the authorization header helpers on `Faraday::Connection`. (@technoweenie)
|
232
|
+
* `Faraday::Adapter::Test` respects the `Faraday::RequestOptions#params_encoder` option. (@technoweenie)
|
data/README.md
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
# Faraday
|
2
2
|
|
3
3
|
[](https://rubygems.org/gems/faraday)
|
4
|
-
[](https://travis-ci.org/lostisland/faraday)
|
4
|
+
[](https://travis-ci.org/lostisland/faraday)
|
5
5
|
[](https://coveralls.io/github/lostisland/faraday?branch=master)
|
6
6
|
[](https://codeclimate.com/github/lostisland/faraday)
|
7
7
|
[](https://gitter.im/lostisland/faraday?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
|
@@ -31,6 +31,17 @@ Rack::Test, and a Test adapter for stubbing requests by hand.
|
|
31
31
|
|
32
32
|
Available at [rubydoc.info](http://www.rubydoc.info/gems/faraday).
|
33
33
|
|
34
|
+
## Faraday 1.0
|
35
|
+
|
36
|
+
Faraday 1.0 will ship soon! Faraday 0.17 will be the last 0.x release, except for serious bugs or security issues.
|
37
|
+
Faraday 1.0 is a major release, but it will be mostly backwards-compatible with 0.x, so we strongly encourage you
|
38
|
+
to use it on your next projects and/or consider to upgrade your existing ones.
|
39
|
+
Upgrading is simple:
|
40
|
+
|
41
|
+
* Checkout the new code from [`master`](https://github.com/lostisland/faraday) and the new [Documentation Website](https://lostisland.github.io/faraday/).
|
42
|
+
* If you're upgrading an existing project, check the [UPGRADING](https://github.com/lostisland/faraday/blob/master/UPGRADING.md) file.
|
43
|
+
* You can also enable upgrade warnings on apps with Faraday 0.x if you run them with `FARADAY_DEPRECATE=warn` or `FARADAY_DEPRECATE=1` in ENV.
|
44
|
+
|
34
45
|
## Usage
|
35
46
|
|
36
47
|
### Basic Use
|
@@ -189,6 +200,9 @@ Faraday.new(...) do |conn|
|
|
189
200
|
# POST/PUT params encoders:
|
190
201
|
conn.request :multipart
|
191
202
|
conn.request :url_encoded
|
203
|
+
|
204
|
+
# add custom middleware
|
205
|
+
conn.use MyMiddleware
|
192
206
|
|
193
207
|
# Last middleware must be the adapter:
|
194
208
|
conn.adapter :net_http
|
data/Rakefile
ADDED
@@ -124,9 +124,9 @@ module Faraday
|
|
124
124
|
end
|
125
125
|
rescue EventMachine::Connectify::CONNECTError => err
|
126
126
|
if err.message.include?("Proxy Authentication Required")
|
127
|
-
raise
|
127
|
+
raise Faraday::ConnectionFailed, %{407 "Proxy Authentication Required "}
|
128
128
|
else
|
129
|
-
raise
|
129
|
+
raise Faraday::ConnectionFailed, err
|
130
130
|
end
|
131
131
|
rescue => err
|
132
132
|
if defined?(OpenSSL) && OpenSSL::SSL::SSLError === err
|
@@ -159,15 +159,15 @@ module Faraday
|
|
159
159
|
end
|
160
160
|
|
161
161
|
def raise_error(msg)
|
162
|
-
errklass = Faraday::
|
162
|
+
errklass = Faraday::ClientError
|
163
163
|
if msg == Errno::ETIMEDOUT
|
164
|
-
errklass = Faraday::
|
164
|
+
errklass = Faraday::TimeoutError
|
165
165
|
msg = "request timed out"
|
166
166
|
elsif msg == Errno::ECONNREFUSED
|
167
|
-
errklass = Faraday::
|
167
|
+
errklass = Faraday::ConnectionFailed
|
168
168
|
msg = "connection refused"
|
169
169
|
elsif msg == "connection closed by server"
|
170
|
-
errklass = Faraday::
|
170
|
+
errklass = Faraday::ConnectionFailed
|
171
171
|
end
|
172
172
|
raise errklass, msg
|
173
173
|
end
|
@@ -193,11 +193,11 @@ module Faraday
|
|
193
193
|
|
194
194
|
def running?() @running end
|
195
195
|
|
196
|
-
def add
|
196
|
+
def add(&block)
|
197
197
|
if running?
|
198
198
|
perform_request { yield }
|
199
199
|
else
|
200
|
-
@registered_procs <<
|
200
|
+
@registered_procs << block
|
201
201
|
end
|
202
202
|
@num_registered += 1
|
203
203
|
end
|
@@ -211,7 +211,7 @@ module Faraday
|
|
211
211
|
end
|
212
212
|
end
|
213
213
|
if @errors.size > 0
|
214
|
-
raise Faraday::
|
214
|
+
raise Faraday::ClientError, @errors.first || "connection failed"
|
215
215
|
end
|
216
216
|
end
|
217
217
|
ensure
|
@@ -65,18 +65,18 @@ module Faraday
|
|
65
65
|
|
66
66
|
@app.call env
|
67
67
|
rescue Errno::ECONNREFUSED
|
68
|
-
raise
|
68
|
+
raise Faraday::ConnectionFailed, $!
|
69
69
|
rescue EventMachine::Connectify::CONNECTError => err
|
70
70
|
if err.message.include?("Proxy Authentication Required")
|
71
|
-
raise
|
71
|
+
raise Faraday::ConnectionFailed, %{407 "Proxy Authentication Required "}
|
72
72
|
else
|
73
|
-
raise
|
73
|
+
raise Faraday::ConnectionFailed, err
|
74
74
|
end
|
75
75
|
rescue Errno::ETIMEDOUT => err
|
76
|
-
raise
|
76
|
+
raise Faraday::TimeoutError, err
|
77
77
|
rescue RuntimeError => err
|
78
78
|
if err.message == "connection closed by server"
|
79
|
-
raise
|
79
|
+
raise Faraday::ConnectionFailed, err
|
80
80
|
else
|
81
81
|
raise
|
82
82
|
end
|
@@ -59,14 +59,14 @@ module Faraday
|
|
59
59
|
@app.call env
|
60
60
|
rescue ::Excon::Errors::SocketError => err
|
61
61
|
if err.message =~ /\btimeout\b/
|
62
|
-
raise
|
62
|
+
raise Faraday::TimeoutError, err
|
63
63
|
elsif err.message =~ /\bcertificate\b/
|
64
64
|
raise Faraday::SSLError, err
|
65
65
|
else
|
66
|
-
raise
|
66
|
+
raise Faraday::ConnectionFailed, err
|
67
67
|
end
|
68
68
|
rescue ::Excon::Errors::Timeout => err
|
69
|
-
raise
|
69
|
+
raise Faraday::TimeoutError, err
|
70
70
|
end
|
71
71
|
|
72
72
|
def create_connection(env, opts)
|
@@ -43,15 +43,15 @@ module Faraday
|
|
43
43
|
|
44
44
|
@app.call env
|
45
45
|
rescue ::HTTPClient::TimeoutError, Errno::ETIMEDOUT
|
46
|
-
raise Faraday::
|
46
|
+
raise Faraday::TimeoutError, $!
|
47
47
|
rescue ::HTTPClient::BadResponseError => err
|
48
48
|
if err.message.include?('status 407')
|
49
|
-
raise Faraday::
|
49
|
+
raise Faraday::ConnectionFailed, %{407 "Proxy Authentication Required "}
|
50
50
|
else
|
51
|
-
raise Faraday::
|
51
|
+
raise Faraday::ClientError, $!
|
52
52
|
end
|
53
53
|
rescue Errno::ECONNREFUSED, IOError, SocketError
|
54
|
-
raise Faraday::
|
54
|
+
raise Faraday::ConnectionFailed, $!
|
55
55
|
rescue => err
|
56
56
|
if defined?(OpenSSL) && OpenSSL::SSL::SSLError === err
|
57
57
|
raise Faraday::SSLError, err
|
@@ -11,6 +11,7 @@ module Faraday
|
|
11
11
|
class NetHttp < Faraday::Adapter
|
12
12
|
NET_HTTP_EXCEPTIONS = [
|
13
13
|
IOError,
|
14
|
+
Errno::EADDRNOTAVAIL,
|
14
15
|
Errno::ECONNABORTED,
|
15
16
|
Errno::ECONNREFUSED,
|
16
17
|
Errno::ECONNRESET,
|
@@ -45,7 +46,7 @@ module Faraday
|
|
45
46
|
if defined?(OpenSSL) && OpenSSL::SSL::SSLError === err
|
46
47
|
raise Faraday::SSLError, err
|
47
48
|
else
|
48
|
-
raise
|
49
|
+
raise Faraday::ConnectionFailed, err
|
49
50
|
end
|
50
51
|
end
|
51
52
|
|
@@ -58,7 +59,7 @@ module Faraday
|
|
58
59
|
|
59
60
|
@app.call env
|
60
61
|
rescue Timeout::Error, Errno::ETIMEDOUT => err
|
61
|
-
raise Faraday::
|
62
|
+
raise Faraday::TimeoutError, err
|
62
63
|
end
|
63
64
|
|
64
65
|
private
|
@@ -10,7 +10,7 @@ module Faraday
|
|
10
10
|
if Net::HTTP::Persistent.instance_method(:initialize).parameters.first == [:key, :name]
|
11
11
|
options = {name: 'Faraday'}
|
12
12
|
options[:pool_size] = @connection_options[:pool_size] if @connection_options.key?(:pool_size)
|
13
|
-
Net::HTTP::Persistent.new(options)
|
13
|
+
Net::HTTP::Persistent.new(**options)
|
14
14
|
else
|
15
15
|
Net::HTTP::Persistent.new('Faraday')
|
16
16
|
end
|
@@ -37,12 +37,12 @@ module Faraday
|
|
37
37
|
def perform_request(http, env)
|
38
38
|
http.request env[:url], create_request(env)
|
39
39
|
rescue Errno::ETIMEDOUT => error
|
40
|
-
raise Faraday::
|
40
|
+
raise Faraday::TimeoutError, error
|
41
41
|
rescue Net::HTTP::Persistent::Error => error
|
42
42
|
if error.message.include? 'Timeout'
|
43
|
-
raise Faraday::
|
43
|
+
raise Faraday::TimeoutError, error
|
44
44
|
elsif error.message.include? 'connection refused'
|
45
|
-
raise Faraday::
|
45
|
+
raise Faraday::ConnectionFailed, error
|
46
46
|
else
|
47
47
|
raise
|
48
48
|
end
|
@@ -28,7 +28,7 @@ module Faraday
|
|
28
28
|
data = env[:body] ? env[:body].to_s : nil
|
29
29
|
session.request(env[:method], env[:url].to_s, env[:request_headers], :data => data)
|
30
30
|
rescue Errno::ECONNREFUSED, ::Patron::ConnectionFailed
|
31
|
-
raise
|
31
|
+
raise Faraday::ConnectionFailed, $!
|
32
32
|
end
|
33
33
|
|
34
34
|
# Remove the "HTTP/1.1 200", leaving just the reason phrase
|
@@ -39,15 +39,15 @@ module Faraday
|
|
39
39
|
@app.call env
|
40
40
|
rescue ::Patron::TimeoutError => err
|
41
41
|
if connection_timed_out_message?(err.message)
|
42
|
-
raise Faraday::
|
42
|
+
raise Faraday::ConnectionFailed, err
|
43
43
|
else
|
44
|
-
raise Faraday::
|
44
|
+
raise Faraday::TimeoutError, err
|
45
45
|
end
|
46
46
|
rescue ::Patron::Error => err
|
47
47
|
if err.message.include?("code 407")
|
48
|
-
raise
|
48
|
+
raise Faraday::ConnectionFailed, %{407 "Proxy Authentication Required "}
|
49
49
|
else
|
50
|
-
raise
|
50
|
+
raise Faraday::ConnectionFailed, err
|
51
51
|
end
|
52
52
|
end
|
53
53
|
|
data/lib/faraday/adapter/rack.rb
CHANGED
@@ -41,7 +41,7 @@ module Faraday
|
|
41
41
|
|
42
42
|
timeout = env[:request][:timeout] || env[:request][:open_timeout]
|
43
43
|
response = if timeout
|
44
|
-
Timer.timeout(timeout, Faraday::
|
44
|
+
Timer.timeout(timeout, Faraday::TimeoutError) { execute_request(env, rack_env) }
|
45
45
|
else
|
46
46
|
execute_request(env, rack_env)
|
47
47
|
end
|
@@ -0,0 +1,109 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module Faraday
|
4
|
+
# @param new_klass [Class] new Klass to use
|
5
|
+
#
|
6
|
+
# @return [Class] A modified version of new_klass that warns on
|
7
|
+
# usage about deprecation.
|
8
|
+
# @see Faraday::Deprecate
|
9
|
+
module DeprecatedClass
|
10
|
+
def self.proxy_class(origclass, ver = '1.0')
|
11
|
+
proxy = Class.new(origclass) do
|
12
|
+
const_set("ORIG_CLASS", origclass)
|
13
|
+
|
14
|
+
class << self
|
15
|
+
extend Faraday::Deprecate
|
16
|
+
|
17
|
+
def ===(other)
|
18
|
+
(superclass == const_get("ORIG_CLASS") && other.is_a?(superclass)) || super
|
19
|
+
end
|
20
|
+
end
|
21
|
+
end
|
22
|
+
proxy.singleton_class.send(:deprecate, :new, "#{origclass}.new", ver)
|
23
|
+
proxy.singleton_class.send(:deprecate, :inherited, origclass.name, ver)
|
24
|
+
proxy
|
25
|
+
end
|
26
|
+
end
|
27
|
+
|
28
|
+
# Deprecation using semver instead of date, based on Gem::Deprecate
|
29
|
+
# Provides a single method +deprecate+ to be used to declare when
|
30
|
+
# something is going away.
|
31
|
+
#
|
32
|
+
# class Legacy
|
33
|
+
# def self.klass_method
|
34
|
+
# # ...
|
35
|
+
# end
|
36
|
+
#
|
37
|
+
# def instance_method
|
38
|
+
# # ...
|
39
|
+
# end
|
40
|
+
#
|
41
|
+
# extend Faraday::Deprecate
|
42
|
+
# deprecate :instance_method, "X.z", '1.0'
|
43
|
+
#
|
44
|
+
# class << self
|
45
|
+
# extend Faraday::Deprecate
|
46
|
+
# deprecate :klass_method, :none, '1.0'
|
47
|
+
# end
|
48
|
+
# end
|
49
|
+
module Deprecate
|
50
|
+
def self.skip # :nodoc:
|
51
|
+
@skip ||= begin
|
52
|
+
case ENV['FARADAY_DEPRECATE'].to_s.downcase
|
53
|
+
when '1', 'warn' then :warn
|
54
|
+
else :skip
|
55
|
+
end
|
56
|
+
end
|
57
|
+
@skip == :skip
|
58
|
+
end
|
59
|
+
|
60
|
+
def self.skip=(value) # :nodoc:
|
61
|
+
@skip = value ? :skip : :warn
|
62
|
+
end
|
63
|
+
|
64
|
+
# Temporarily turn off warnings. Intended for tests only.
|
65
|
+
def skip_during
|
66
|
+
original = Faraday::Deprecate.skip
|
67
|
+
Faraday::Deprecate.skip, = true
|
68
|
+
yield
|
69
|
+
ensure
|
70
|
+
Faraday::Deprecate.skip = original
|
71
|
+
end
|
72
|
+
|
73
|
+
# Simple deprecation method that deprecates +name+ by wrapping it up
|
74
|
+
# in a dummy method. It warns on each call to the dummy method
|
75
|
+
# telling the user of +repl+ (unless +repl+ is :none) and the
|
76
|
+
# semver that it is planned to go away.
|
77
|
+
# @param name [Symbol] the method symbol to deprecate
|
78
|
+
# @param repl [#to_s, :none] the replacement to use, when `:none` it will
|
79
|
+
# alert the user that no replacemtent is present.
|
80
|
+
# @param ver [String] the semver the method will be removed.
|
81
|
+
def deprecate(name, repl, ver)
|
82
|
+
class_eval do
|
83
|
+
gem_ver = Gem::Version.new(ver)
|
84
|
+
old = "_deprecated_#{name}"
|
85
|
+
alias_method old, name
|
86
|
+
define_method name do |*args, &block|
|
87
|
+
mod = is_a? Module
|
88
|
+
target = mod ? "#{self}." : "#{self.class}#"
|
89
|
+
target_message = if name == :inherited
|
90
|
+
"Inheriting #{self}"
|
91
|
+
else
|
92
|
+
"#{target}#{name}"
|
93
|
+
end
|
94
|
+
|
95
|
+
msg = [
|
96
|
+
"NOTE: #{target_message} is deprecated",
|
97
|
+
repl == :none ? ' with no replacement' : "; use #{repl} instead. ",
|
98
|
+
"It will be removed in or after version #{gem_ver}",
|
99
|
+
"\n#{target}#{name} called from #{Gem.location_of_caller.join(':')}"
|
100
|
+
]
|
101
|
+
warn "#{msg.join}." unless Faraday::Deprecate.skip
|
102
|
+
send old, *args, &block
|
103
|
+
end
|
104
|
+
end
|
105
|
+
end
|
106
|
+
|
107
|
+
module_function :deprecate, :skip_during
|
108
|
+
end
|
109
|
+
end
|