faraday 1.10.3 → 2.13.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 +198 -4
- data/LICENSE.md +1 -1
- data/README.md +34 -20
- data/Rakefile +6 -1
- data/examples/client_spec.rb +41 -19
- data/examples/client_test.rb +48 -22
- data/lib/faraday/adapter/test.rb +62 -13
- data/lib/faraday/adapter.rb +6 -10
- data/lib/faraday/connection.rb +72 -150
- data/lib/faraday/encoders/nested_params_encoder.rb +14 -7
- data/lib/faraday/error.rb +62 -9
- data/lib/faraday/logging/formatter.rb +29 -16
- data/lib/faraday/middleware.rb +43 -2
- data/lib/faraday/middleware_registry.rb +17 -63
- data/lib/faraday/options/connection_options.rb +7 -6
- data/lib/faraday/options/env.rb +85 -62
- data/lib/faraday/options/proxy_options.rb +11 -5
- data/lib/faraday/options/request_options.rb +7 -6
- data/lib/faraday/options/ssl_options.rb +62 -45
- data/lib/faraday/options.rb +7 -6
- data/lib/faraday/rack_builder.rb +44 -45
- data/lib/faraday/request/authorization.rb +33 -41
- data/lib/faraday/request/instrumentation.rb +5 -1
- data/lib/faraday/request/json.rb +18 -3
- data/lib/faraday/request/url_encoded.rb +5 -1
- data/lib/faraday/request.rb +15 -30
- data/lib/faraday/response/json.rb +25 -5
- data/lib/faraday/response/logger.rb +11 -3
- data/lib/faraday/response/raise_error.rb +45 -18
- data/lib/faraday/response.rb +9 -21
- data/lib/faraday/utils/headers.rb +15 -4
- data/lib/faraday/utils.rb +11 -7
- data/lib/faraday/version.rb +1 -1
- data/lib/faraday.rb +10 -45
- data/spec/faraday/adapter/test_spec.rb +65 -0
- data/spec/faraday/connection_spec.rb +165 -93
- data/spec/faraday/error_spec.rb +122 -7
- data/spec/faraday/middleware_registry_spec.rb +31 -0
- data/spec/faraday/middleware_spec.rb +161 -0
- data/spec/faraday/options/env_spec.rb +8 -2
- data/spec/faraday/options/options_spec.rb +1 -1
- data/spec/faraday/options/proxy_options_spec.rb +35 -0
- data/spec/faraday/params_encoders/nested_spec.rb +10 -1
- data/spec/faraday/rack_builder_spec.rb +26 -54
- data/spec/faraday/request/authorization_spec.rb +50 -28
- data/spec/faraday/request/instrumentation_spec.rb +5 -7
- data/spec/faraday/request/json_spec.rb +88 -0
- data/spec/faraday/request/url_encoded_spec.rb +12 -2
- data/spec/faraday/request_spec.rb +5 -15
- data/spec/faraday/response/json_spec.rb +93 -6
- data/spec/faraday/response/logger_spec.rb +77 -4
- data/spec/faraday/response/raise_error_spec.rb +119 -13
- data/spec/faraday/response_spec.rb +3 -1
- data/spec/faraday/utils/headers_spec.rb +31 -4
- data/spec/faraday/utils_spec.rb +65 -1
- data/spec/faraday_spec.rb +10 -4
- data/spec/spec_helper.rb +5 -6
- data/spec/support/fake_safe_buffer.rb +1 -1
- data/spec/support/faraday_middleware_subclasses.rb +18 -0
- data/spec/support/helper_methods.rb +0 -37
- data/spec/support/shared_examples/adapter.rb +2 -2
- data/spec/support/shared_examples/request_method.rb +22 -21
- metadata +24 -149
- data/lib/faraday/adapter/typhoeus.rb +0 -15
- data/lib/faraday/autoload.rb +0 -87
- data/lib/faraday/dependency_loader.rb +0 -39
- data/lib/faraday/deprecate.rb +0 -110
- 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/deprecate_spec.rb +0 -147
- data/spec/faraday/response/middleware_spec.rb +0 -68
- data/spec/support/webmock_rack_app.rb +0 -68
metadata
CHANGED
@@ -1,172 +1,64 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: faraday
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version:
|
4
|
+
version: 2.13.4
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- "@technoweenie"
|
8
8
|
- "@iMacTia"
|
9
9
|
- "@olleolleolle"
|
10
|
-
autorequire:
|
11
10
|
bindir: bin
|
12
11
|
cert_chain: []
|
13
|
-
date:
|
12
|
+
date: 1980-01-02 00:00:00.000000000 Z
|
14
13
|
dependencies:
|
15
|
-
- !ruby/object:Gem::Dependency
|
16
|
-
name: faraday-em_http
|
17
|
-
requirement: !ruby/object:Gem::Requirement
|
18
|
-
requirements:
|
19
|
-
- - "~>"
|
20
|
-
- !ruby/object:Gem::Version
|
21
|
-
version: '1.0'
|
22
|
-
type: :runtime
|
23
|
-
prerelease: false
|
24
|
-
version_requirements: !ruby/object:Gem::Requirement
|
25
|
-
requirements:
|
26
|
-
- - "~>"
|
27
|
-
- !ruby/object:Gem::Version
|
28
|
-
version: '1.0'
|
29
|
-
- !ruby/object:Gem::Dependency
|
30
|
-
name: faraday-em_synchrony
|
31
|
-
requirement: !ruby/object:Gem::Requirement
|
32
|
-
requirements:
|
33
|
-
- - "~>"
|
34
|
-
- !ruby/object:Gem::Version
|
35
|
-
version: '1.0'
|
36
|
-
type: :runtime
|
37
|
-
prerelease: false
|
38
|
-
version_requirements: !ruby/object:Gem::Requirement
|
39
|
-
requirements:
|
40
|
-
- - "~>"
|
41
|
-
- !ruby/object:Gem::Version
|
42
|
-
version: '1.0'
|
43
|
-
- !ruby/object:Gem::Dependency
|
44
|
-
name: faraday-excon
|
45
|
-
requirement: !ruby/object:Gem::Requirement
|
46
|
-
requirements:
|
47
|
-
- - "~>"
|
48
|
-
- !ruby/object:Gem::Version
|
49
|
-
version: '1.1'
|
50
|
-
type: :runtime
|
51
|
-
prerelease: false
|
52
|
-
version_requirements: !ruby/object:Gem::Requirement
|
53
|
-
requirements:
|
54
|
-
- - "~>"
|
55
|
-
- !ruby/object:Gem::Version
|
56
|
-
version: '1.1'
|
57
|
-
- !ruby/object:Gem::Dependency
|
58
|
-
name: faraday-httpclient
|
59
|
-
requirement: !ruby/object:Gem::Requirement
|
60
|
-
requirements:
|
61
|
-
- - "~>"
|
62
|
-
- !ruby/object:Gem::Version
|
63
|
-
version: '1.0'
|
64
|
-
type: :runtime
|
65
|
-
prerelease: false
|
66
|
-
version_requirements: !ruby/object:Gem::Requirement
|
67
|
-
requirements:
|
68
|
-
- - "~>"
|
69
|
-
- !ruby/object:Gem::Version
|
70
|
-
version: '1.0'
|
71
|
-
- !ruby/object:Gem::Dependency
|
72
|
-
name: faraday-multipart
|
73
|
-
requirement: !ruby/object:Gem::Requirement
|
74
|
-
requirements:
|
75
|
-
- - "~>"
|
76
|
-
- !ruby/object:Gem::Version
|
77
|
-
version: '1.0'
|
78
|
-
type: :runtime
|
79
|
-
prerelease: false
|
80
|
-
version_requirements: !ruby/object:Gem::Requirement
|
81
|
-
requirements:
|
82
|
-
- - "~>"
|
83
|
-
- !ruby/object:Gem::Version
|
84
|
-
version: '1.0'
|
85
14
|
- !ruby/object:Gem::Dependency
|
86
15
|
name: faraday-net_http
|
87
16
|
requirement: !ruby/object:Gem::Requirement
|
88
17
|
requirements:
|
89
|
-
- - "
|
90
|
-
- !ruby/object:Gem::Version
|
91
|
-
version: '1.0'
|
92
|
-
type: :runtime
|
93
|
-
prerelease: false
|
94
|
-
version_requirements: !ruby/object:Gem::Requirement
|
95
|
-
requirements:
|
96
|
-
- - "~>"
|
97
|
-
- !ruby/object:Gem::Version
|
98
|
-
version: '1.0'
|
99
|
-
- !ruby/object:Gem::Dependency
|
100
|
-
name: faraday-net_http_persistent
|
101
|
-
requirement: !ruby/object:Gem::Requirement
|
102
|
-
requirements:
|
103
|
-
- - "~>"
|
104
|
-
- !ruby/object:Gem::Version
|
105
|
-
version: '1.0'
|
106
|
-
type: :runtime
|
107
|
-
prerelease: false
|
108
|
-
version_requirements: !ruby/object:Gem::Requirement
|
109
|
-
requirements:
|
110
|
-
- - "~>"
|
18
|
+
- - ">="
|
111
19
|
- !ruby/object:Gem::Version
|
112
|
-
version: '
|
113
|
-
-
|
114
|
-
name: faraday-patron
|
115
|
-
requirement: !ruby/object:Gem::Requirement
|
116
|
-
requirements:
|
117
|
-
- - "~>"
|
20
|
+
version: '2.0'
|
21
|
+
- - "<"
|
118
22
|
- !ruby/object:Gem::Version
|
119
|
-
version: '
|
23
|
+
version: '3.5'
|
120
24
|
type: :runtime
|
121
25
|
prerelease: false
|
122
26
|
version_requirements: !ruby/object:Gem::Requirement
|
123
27
|
requirements:
|
124
|
-
- - "
|
125
|
-
- !ruby/object:Gem::Version
|
126
|
-
version: '1.0'
|
127
|
-
- !ruby/object:Gem::Dependency
|
128
|
-
name: faraday-rack
|
129
|
-
requirement: !ruby/object:Gem::Requirement
|
130
|
-
requirements:
|
131
|
-
- - "~>"
|
28
|
+
- - ">="
|
132
29
|
- !ruby/object:Gem::Version
|
133
|
-
version: '
|
134
|
-
|
135
|
-
prerelease: false
|
136
|
-
version_requirements: !ruby/object:Gem::Requirement
|
137
|
-
requirements:
|
138
|
-
- - "~>"
|
30
|
+
version: '2.0'
|
31
|
+
- - "<"
|
139
32
|
- !ruby/object:Gem::Version
|
140
|
-
version: '
|
33
|
+
version: '3.5'
|
141
34
|
- !ruby/object:Gem::Dependency
|
142
|
-
name:
|
35
|
+
name: json
|
143
36
|
requirement: !ruby/object:Gem::Requirement
|
144
37
|
requirements:
|
145
|
-
- - "
|
38
|
+
- - ">="
|
146
39
|
- !ruby/object:Gem::Version
|
147
|
-
version: '
|
40
|
+
version: '0'
|
148
41
|
type: :runtime
|
149
42
|
prerelease: false
|
150
43
|
version_requirements: !ruby/object:Gem::Requirement
|
151
44
|
requirements:
|
152
|
-
- - "
|
45
|
+
- - ">="
|
153
46
|
- !ruby/object:Gem::Version
|
154
|
-
version: '
|
47
|
+
version: '0'
|
155
48
|
- !ruby/object:Gem::Dependency
|
156
|
-
name:
|
49
|
+
name: logger
|
157
50
|
requirement: !ruby/object:Gem::Requirement
|
158
51
|
requirements:
|
159
52
|
- - ">="
|
160
53
|
- !ruby/object:Gem::Version
|
161
|
-
version: 0
|
54
|
+
version: '0'
|
162
55
|
type: :runtime
|
163
56
|
prerelease: false
|
164
57
|
version_requirements: !ruby/object:Gem::Requirement
|
165
58
|
requirements:
|
166
59
|
- - ">="
|
167
60
|
- !ruby/object:Gem::Version
|
168
|
-
version: 0
|
169
|
-
description:
|
61
|
+
version: '0'
|
170
62
|
email: technoweenie@gmail.com
|
171
63
|
executables: []
|
172
64
|
extensions: []
|
@@ -181,12 +73,8 @@ files:
|
|
181
73
|
- lib/faraday.rb
|
182
74
|
- lib/faraday/adapter.rb
|
183
75
|
- lib/faraday/adapter/test.rb
|
184
|
-
- lib/faraday/adapter/typhoeus.rb
|
185
76
|
- lib/faraday/adapter_registry.rb
|
186
|
-
- lib/faraday/autoload.rb
|
187
77
|
- lib/faraday/connection.rb
|
188
|
-
- lib/faraday/dependency_loader.rb
|
189
|
-
- lib/faraday/deprecate.rb
|
190
78
|
- lib/faraday/encoders/flat_params_encoder.rb
|
191
79
|
- lib/faraday/encoders/nested_params_encoder.rb
|
192
80
|
- lib/faraday/error.rb
|
@@ -204,10 +92,8 @@ files:
|
|
204
92
|
- lib/faraday/rack_builder.rb
|
205
93
|
- lib/faraday/request.rb
|
206
94
|
- lib/faraday/request/authorization.rb
|
207
|
-
- lib/faraday/request/basic_authentication.rb
|
208
95
|
- lib/faraday/request/instrumentation.rb
|
209
96
|
- lib/faraday/request/json.rb
|
210
|
-
- lib/faraday/request/token_authentication.rb
|
211
97
|
- lib/faraday/request/url_encoded.rb
|
212
98
|
- lib/faraday/response.rb
|
213
99
|
- lib/faraday/response/json.rb
|
@@ -218,21 +104,12 @@ files:
|
|
218
104
|
- lib/faraday/utils/params_hash.rb
|
219
105
|
- lib/faraday/version.rb
|
220
106
|
- spec/external_adapters/faraday_specs_setup.rb
|
221
|
-
- spec/faraday/adapter/em_http_spec.rb
|
222
|
-
- spec/faraday/adapter/em_synchrony_spec.rb
|
223
|
-
- spec/faraday/adapter/excon_spec.rb
|
224
|
-
- spec/faraday/adapter/httpclient_spec.rb
|
225
|
-
- spec/faraday/adapter/net_http_spec.rb
|
226
|
-
- spec/faraday/adapter/patron_spec.rb
|
227
|
-
- spec/faraday/adapter/rack_spec.rb
|
228
107
|
- spec/faraday/adapter/test_spec.rb
|
229
|
-
- spec/faraday/adapter/typhoeus_spec.rb
|
230
108
|
- spec/faraday/adapter_registry_spec.rb
|
231
109
|
- spec/faraday/adapter_spec.rb
|
232
|
-
- spec/faraday/composite_read_io_spec.rb
|
233
110
|
- spec/faraday/connection_spec.rb
|
234
|
-
- spec/faraday/deprecate_spec.rb
|
235
111
|
- spec/faraday/error_spec.rb
|
112
|
+
- spec/faraday/middleware_registry_spec.rb
|
236
113
|
- spec/faraday/middleware_spec.rb
|
237
114
|
- spec/faraday/options/env_spec.rb
|
238
115
|
- spec/faraday/options/options_spec.rb
|
@@ -248,7 +125,6 @@ files:
|
|
248
125
|
- spec/faraday/request_spec.rb
|
249
126
|
- spec/faraday/response/json_spec.rb
|
250
127
|
- spec/faraday/response/logger_spec.rb
|
251
|
-
- spec/faraday/response/middleware_spec.rb
|
252
128
|
- spec/faraday/response/raise_error_spec.rb
|
253
129
|
- spec/faraday/response_spec.rb
|
254
130
|
- spec/faraday/utils/headers_spec.rb
|
@@ -257,21 +133,21 @@ files:
|
|
257
133
|
- spec/spec_helper.rb
|
258
134
|
- spec/support/disabling_stub.rb
|
259
135
|
- spec/support/fake_safe_buffer.rb
|
136
|
+
- spec/support/faraday_middleware_subclasses.rb
|
260
137
|
- spec/support/helper_methods.rb
|
261
138
|
- spec/support/shared_examples/adapter.rb
|
262
139
|
- spec/support/shared_examples/params_encoder.rb
|
263
140
|
- spec/support/shared_examples/request_method.rb
|
264
141
|
- spec/support/streaming_response_checker.rb
|
265
|
-
- spec/support/webmock_rack_app.rb
|
266
142
|
homepage: https://lostisland.github.io/faraday
|
267
143
|
licenses:
|
268
144
|
- MIT
|
269
145
|
metadata:
|
270
146
|
homepage_uri: https://lostisland.github.io/faraday
|
271
|
-
changelog_uri: https://github.com/lostisland/faraday/releases/tag/
|
147
|
+
changelog_uri: https://github.com/lostisland/faraday/releases/tag/v2.13.4
|
272
148
|
source_code_uri: https://github.com/lostisland/faraday
|
273
149
|
bug_tracker_uri: https://github.com/lostisland/faraday/issues
|
274
|
-
|
150
|
+
rubygems_mfa_required: 'true'
|
275
151
|
rdoc_options: []
|
276
152
|
require_paths:
|
277
153
|
- lib
|
@@ -280,15 +156,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
280
156
|
requirements:
|
281
157
|
- - ">="
|
282
158
|
- !ruby/object:Gem::Version
|
283
|
-
version: '
|
159
|
+
version: '3.0'
|
284
160
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
285
161
|
requirements:
|
286
162
|
- - ">="
|
287
163
|
- !ruby/object:Gem::Version
|
288
164
|
version: '0'
|
289
165
|
requirements: []
|
290
|
-
rubygems_version: 3.
|
291
|
-
signing_key:
|
166
|
+
rubygems_version: 3.6.9
|
292
167
|
specification_version: 4
|
293
168
|
summary: HTTP/REST API client library.
|
294
169
|
test_files: []
|
@@ -1,15 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
module Faraday
|
4
|
-
class Adapter
|
5
|
-
# Typhoeus adapter. This class is just a stub, the real adapter is in
|
6
|
-
# https://github.com/typhoeus/typhoeus/blob/master/lib/typhoeus/adapters/faraday.rb
|
7
|
-
class Typhoeus < Faraday::Adapter
|
8
|
-
# Needs to define this method in order to support Typhoeus <= 1.3.0
|
9
|
-
def call; end
|
10
|
-
|
11
|
-
dependency 'typhoeus'
|
12
|
-
dependency 'typhoeus/adapters/faraday'
|
13
|
-
end
|
14
|
-
end
|
15
|
-
end
|
data/lib/faraday/autoload.rb
DELETED
@@ -1,87 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
module Faraday
|
4
|
-
# Adds the ability for other modules to manage autoloadable
|
5
|
-
# constants.
|
6
|
-
#
|
7
|
-
# @api private
|
8
|
-
module AutoloadHelper
|
9
|
-
# Registers the constants to be auto loaded.
|
10
|
-
#
|
11
|
-
# @param prefix [String] The require prefix. If the path is inside Faraday,
|
12
|
-
# then it will be prefixed with the root path of this loaded
|
13
|
-
# Faraday version.
|
14
|
-
# @param options [{ Symbol => String }] library names.
|
15
|
-
#
|
16
|
-
# @example
|
17
|
-
#
|
18
|
-
# Faraday.autoload_all 'faraday/foo',
|
19
|
-
# Bar: 'bar'
|
20
|
-
#
|
21
|
-
# # requires faraday/foo/bar to load Faraday::Bar.
|
22
|
-
# Faraday::Bar
|
23
|
-
#
|
24
|
-
# @return [void]
|
25
|
-
def autoload_all(prefix, options)
|
26
|
-
if prefix.match? %r{^faraday(/|$)}i
|
27
|
-
prefix = File.join(Faraday.root_path, prefix)
|
28
|
-
end
|
29
|
-
|
30
|
-
options.each do |const_name, path|
|
31
|
-
autoload const_name, File.join(prefix, path)
|
32
|
-
end
|
33
|
-
end
|
34
|
-
|
35
|
-
# Loads each autoloaded constant. If thread safety is a concern,
|
36
|
-
# wrap this in a Mutex.
|
37
|
-
#
|
38
|
-
# @return [void]
|
39
|
-
def load_autoloaded_constants
|
40
|
-
constants.each do |const|
|
41
|
-
const_get(const) if autoload?(const)
|
42
|
-
end
|
43
|
-
end
|
44
|
-
|
45
|
-
# Filters the module's contents with those that have been already
|
46
|
-
# autoloaded.
|
47
|
-
#
|
48
|
-
# @return [Array<Class, Module>]
|
49
|
-
def all_loaded_constants
|
50
|
-
constants
|
51
|
-
.map { |c| const_get(c) }
|
52
|
-
.select { |a| a.respond_to?(:loaded?) && a.loaded? }
|
53
|
-
end
|
54
|
-
end
|
55
|
-
|
56
|
-
# Adapter is the base class for all Faraday adapters.
|
57
|
-
# @see lib/faraday/adapter.rb Original class location
|
58
|
-
class Adapter
|
59
|
-
extend AutoloadHelper
|
60
|
-
autoload_all 'faraday/adapter',
|
61
|
-
Typhoeus: 'typhoeus',
|
62
|
-
Test: 'test'
|
63
|
-
end
|
64
|
-
|
65
|
-
# Request represents a single HTTP request for a Faraday adapter to make.
|
66
|
-
# @see lib/faraday/request.rb Original class location
|
67
|
-
class Request
|
68
|
-
extend AutoloadHelper
|
69
|
-
autoload_all 'faraday/request',
|
70
|
-
UrlEncoded: 'url_encoded',
|
71
|
-
Multipart: 'multipart',
|
72
|
-
Retry: 'retry',
|
73
|
-
Authorization: 'authorization',
|
74
|
-
BasicAuthentication: 'basic_authentication',
|
75
|
-
TokenAuthentication: 'token_authentication',
|
76
|
-
Instrumentation: 'instrumentation'
|
77
|
-
end
|
78
|
-
|
79
|
-
# Response represents the returned value of a sent Faraday request.
|
80
|
-
# @see lib/faraday/response.rb Original class location
|
81
|
-
class Response
|
82
|
-
extend AutoloadHelper
|
83
|
-
autoload_all 'faraday/response',
|
84
|
-
RaiseError: 'raise_error',
|
85
|
-
Logger: 'logger'
|
86
|
-
end
|
87
|
-
end
|
@@ -1,39 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
require 'ruby2_keywords'
|
4
|
-
|
5
|
-
module Faraday
|
6
|
-
# DependencyLoader helps Faraday adapters and middleware load dependencies.
|
7
|
-
module DependencyLoader
|
8
|
-
attr_reader :load_error
|
9
|
-
|
10
|
-
# Executes a block which should try to require and reference dependent
|
11
|
-
# libraries
|
12
|
-
def dependency(lib = nil)
|
13
|
-
lib ? require(lib) : yield
|
14
|
-
rescue LoadError, NameError => e
|
15
|
-
self.load_error = e
|
16
|
-
end
|
17
|
-
|
18
|
-
ruby2_keywords def new(*)
|
19
|
-
unless loaded?
|
20
|
-
raise "missing dependency for #{self}: #{load_error.message}"
|
21
|
-
end
|
22
|
-
|
23
|
-
super
|
24
|
-
end
|
25
|
-
|
26
|
-
def loaded?
|
27
|
-
load_error.nil?
|
28
|
-
end
|
29
|
-
|
30
|
-
def inherited(subclass)
|
31
|
-
super
|
32
|
-
subclass.send(:load_error=, load_error)
|
33
|
-
end
|
34
|
-
|
35
|
-
private
|
36
|
-
|
37
|
-
attr_writer :load_error
|
38
|
-
end
|
39
|
-
end
|
data/lib/faraday/deprecate.rb
DELETED
@@ -1,110 +0,0 @@
|
|
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 replacement is present.
|
80
|
-
# @param ver [String] the semver the method will be removed.
|
81
|
-
def deprecate(name, repl, ver, custom_message = nil)
|
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
|
-
custom_message,
|
100
|
-
"\n#{target}#{name} called from #{Gem.location_of_caller.join(':')}"
|
101
|
-
]
|
102
|
-
warn "#{msg.join}." unless Faraday::Deprecate.skip
|
103
|
-
send old, *args, &block
|
104
|
-
end
|
105
|
-
end
|
106
|
-
end
|
107
|
-
|
108
|
-
module_function :deprecate, :skip_during
|
109
|
-
end
|
110
|
-
end
|
@@ -1,20 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
require 'base64'
|
4
|
-
|
5
|
-
module Faraday
|
6
|
-
class Request
|
7
|
-
# Authorization middleware for Basic Authentication.
|
8
|
-
class BasicAuthentication < load_middleware(:authorization)
|
9
|
-
# @param login [String]
|
10
|
-
# @param pass [String]
|
11
|
-
#
|
12
|
-
# @return [String] a Basic Authentication header line
|
13
|
-
def self.header(login, pass)
|
14
|
-
value = Base64.encode64([login, pass].join(':'))
|
15
|
-
value.delete!("\n")
|
16
|
-
super(:Basic, value)
|
17
|
-
end
|
18
|
-
end
|
19
|
-
end
|
20
|
-
end
|
@@ -1,20 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
module Faraday
|
4
|
-
class Request
|
5
|
-
# TokenAuthentication is a middleware that adds a 'Token' header to a
|
6
|
-
# Faraday request.
|
7
|
-
class TokenAuthentication < load_middleware(:authorization)
|
8
|
-
# Public
|
9
|
-
def self.header(token, options = nil)
|
10
|
-
options ||= {}
|
11
|
-
options[:token] = token
|
12
|
-
super(:Token, options)
|
13
|
-
end
|
14
|
-
|
15
|
-
def initialize(app, token, options = nil)
|
16
|
-
super(app, token, options)
|
17
|
-
end
|
18
|
-
end
|
19
|
-
end
|
20
|
-
end
|
@@ -1,49 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
unless defined?(JRUBY_VERSION)
|
4
|
-
RSpec.describe Faraday::Adapter::EMHttp do
|
5
|
-
features :request_body_on_query_methods, :reason_phrase_parse, :trace_method,
|
6
|
-
:skip_response_body_on_head, :parallel, :local_socket_binding
|
7
|
-
|
8
|
-
it_behaves_like 'an adapter'
|
9
|
-
|
10
|
-
it 'allows to provide adapter specific configs' do
|
11
|
-
url = URI('https://example.com:1234')
|
12
|
-
adapter = described_class.new nil, inactivity_timeout: 20
|
13
|
-
req = adapter.create_request(url: url, request: {})
|
14
|
-
|
15
|
-
expect(req.connopts.inactivity_timeout).to eq(20)
|
16
|
-
end
|
17
|
-
|
18
|
-
context 'Options' do
|
19
|
-
let(:request) { Faraday::RequestOptions.new }
|
20
|
-
let(:env) { { request: request } }
|
21
|
-
let(:options) { {} }
|
22
|
-
let(:adapter) { Faraday::Adapter::EMHttp.new }
|
23
|
-
|
24
|
-
it 'configures timeout' do
|
25
|
-
request.timeout = 5
|
26
|
-
adapter.configure_timeout(options, env)
|
27
|
-
expect(options[:inactivity_timeout]).to eq(5)
|
28
|
-
expect(options[:connect_timeout]).to eq(5)
|
29
|
-
end
|
30
|
-
|
31
|
-
it 'configures timeout and open_timeout' do
|
32
|
-
request.timeout = 5
|
33
|
-
request.open_timeout = 1
|
34
|
-
adapter.configure_timeout(options, env)
|
35
|
-
expect(options[:inactivity_timeout]).to eq(5)
|
36
|
-
expect(options[:connect_timeout]).to eq(1)
|
37
|
-
end
|
38
|
-
|
39
|
-
it 'configures all timeout settings' do
|
40
|
-
request.timeout = 5
|
41
|
-
request.read_timeout = 3
|
42
|
-
request.open_timeout = 1
|
43
|
-
adapter.configure_timeout(options, env)
|
44
|
-
expect(options[:inactivity_timeout]).to eq(3)
|
45
|
-
expect(options[:connect_timeout]).to eq(1)
|
46
|
-
end
|
47
|
-
end
|
48
|
-
end
|
49
|
-
end
|
@@ -1,18 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
unless defined?(JRUBY_VERSION)
|
4
|
-
RSpec.describe Faraday::Adapter::EMSynchrony do
|
5
|
-
features :request_body_on_query_methods, :reason_phrase_parse,
|
6
|
-
:skip_response_body_on_head, :parallel, :local_socket_binding
|
7
|
-
|
8
|
-
it_behaves_like 'an adapter'
|
9
|
-
|
10
|
-
it 'allows to provide adapter specific configs' do
|
11
|
-
url = URI('https://example.com:1234')
|
12
|
-
adapter = described_class.new nil, inactivity_timeout: 20
|
13
|
-
req = adapter.create_request(url: url, request: {})
|
14
|
-
|
15
|
-
expect(req.connopts.inactivity_timeout).to eq(20)
|
16
|
-
end
|
17
|
-
end
|
18
|
-
end
|