faraday 1.10.3 → 2.0.0.alpha.pre.1
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 +111 -1
- data/README.md +16 -9
- data/examples/client_test.rb +1 -1
- data/lib/faraday/adapter/test.rb +2 -0
- data/lib/faraday/adapter.rb +0 -5
- data/lib/faraday/connection.rb +3 -84
- data/lib/faraday/encoders/nested_params_encoder.rb +2 -2
- data/lib/faraday/error.rb +7 -0
- data/lib/faraday/file_part.rb +122 -0
- data/lib/faraday/logging/formatter.rb +1 -0
- data/lib/faraday/middleware.rb +0 -1
- data/lib/faraday/middleware_registry.rb +15 -79
- data/lib/faraday/options.rb +3 -3
- data/lib/faraday/param_part.rb +53 -0
- data/lib/faraday/rack_builder.rb +1 -1
- data/lib/faraday/request/authorization.rb +26 -40
- data/lib/faraday/request/instrumentation.rb +2 -0
- data/lib/faraday/request/multipart.rb +108 -0
- data/lib/faraday/request/retry.rb +241 -0
- data/lib/faraday/request/url_encoded.rb +2 -0
- data/lib/faraday/request.rb +8 -24
- 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 +9 -4
- data/lib/faraday/version.rb +1 -1
- data/lib/faraday.rb +6 -45
- data/spec/faraday/connection_spec.rb +78 -51
- data/spec/faraday/options/env_spec.rb +2 -2
- data/spec/faraday/rack_builder_spec.rb +5 -43
- data/spec/faraday/request/authorization_spec.rb +14 -36
- data/spec/faraday/request/instrumentation_spec.rb +5 -7
- data/spec/faraday/request/multipart_spec.rb +302 -0
- data/spec/faraday/request/retry_spec.rb +254 -0
- data/spec/faraday/request_spec.rb +0 -11
- data/spec/faraday/response/json_spec.rb +4 -6
- data/spec/faraday/response/raise_error_spec.rb +7 -4
- data/spec/faraday/utils_spec.rb +1 -1
- data/spec/spec_helper.rb +0 -2
- data/spec/support/fake_safe_buffer.rb +1 -1
- data/spec/support/shared_examples/request_method.rb +5 -5
- metadata +21 -152
- 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/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,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: faraday
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version:
|
4
|
+
version: 2.0.0.alpha.pre.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- "@technoweenie"
|
@@ -10,148 +10,28 @@ authors:
|
|
10
10
|
autorequire:
|
11
11
|
bindir: bin
|
12
12
|
cert_chain: []
|
13
|
-
date:
|
13
|
+
date: 2021-10-25 00:00:00.000000000 Z
|
14
14
|
dependencies:
|
15
15
|
- !ruby/object:Gem::Dependency
|
16
|
-
name:
|
16
|
+
name: multipart-post
|
17
17
|
requirement: !ruby/object:Gem::Requirement
|
18
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
|
-
- !ruby/object:Gem::Dependency
|
86
|
-
name: faraday-net_http
|
87
|
-
requirement: !ruby/object:Gem::Requirement
|
88
|
-
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
|
-
- - "~>"
|
111
|
-
- !ruby/object:Gem::Version
|
112
|
-
version: '1.0'
|
113
|
-
- !ruby/object:Gem::Dependency
|
114
|
-
name: faraday-patron
|
115
|
-
requirement: !ruby/object:Gem::Requirement
|
116
|
-
requirements:
|
117
|
-
- - "~>"
|
118
|
-
- !ruby/object:Gem::Version
|
119
|
-
version: '1.0'
|
120
|
-
type: :runtime
|
121
|
-
prerelease: false
|
122
|
-
version_requirements: !ruby/object:Gem::Requirement
|
123
|
-
requirements:
|
124
|
-
- - "~>"
|
19
|
+
- - ">="
|
125
20
|
- !ruby/object:Gem::Version
|
126
|
-
version: '1.
|
127
|
-
-
|
128
|
-
name: faraday-rack
|
129
|
-
requirement: !ruby/object:Gem::Requirement
|
130
|
-
requirements:
|
131
|
-
- - "~>"
|
21
|
+
version: '1.2'
|
22
|
+
- - "<"
|
132
23
|
- !ruby/object:Gem::Version
|
133
|
-
version: '
|
24
|
+
version: '3'
|
134
25
|
type: :runtime
|
135
26
|
prerelease: false
|
136
27
|
version_requirements: !ruby/object:Gem::Requirement
|
137
28
|
requirements:
|
138
|
-
- - "
|
139
|
-
- !ruby/object:Gem::Version
|
140
|
-
version: '1.0'
|
141
|
-
- !ruby/object:Gem::Dependency
|
142
|
-
name: faraday-retry
|
143
|
-
requirement: !ruby/object:Gem::Requirement
|
144
|
-
requirements:
|
145
|
-
- - "~>"
|
29
|
+
- - ">="
|
146
30
|
- !ruby/object:Gem::Version
|
147
|
-
version: '1.
|
148
|
-
|
149
|
-
prerelease: false
|
150
|
-
version_requirements: !ruby/object:Gem::Requirement
|
151
|
-
requirements:
|
152
|
-
- - "~>"
|
31
|
+
version: '1.2'
|
32
|
+
- - "<"
|
153
33
|
- !ruby/object:Gem::Version
|
154
|
-
version: '
|
34
|
+
version: '3'
|
155
35
|
- !ruby/object:Gem::Dependency
|
156
36
|
name: ruby2_keywords
|
157
37
|
requirement: !ruby/object:Gem::Requirement
|
@@ -181,15 +61,12 @@ files:
|
|
181
61
|
- lib/faraday.rb
|
182
62
|
- lib/faraday/adapter.rb
|
183
63
|
- lib/faraday/adapter/test.rb
|
184
|
-
- lib/faraday/adapter/typhoeus.rb
|
185
64
|
- lib/faraday/adapter_registry.rb
|
186
|
-
- lib/faraday/autoload.rb
|
187
65
|
- lib/faraday/connection.rb
|
188
|
-
- lib/faraday/dependency_loader.rb
|
189
|
-
- lib/faraday/deprecate.rb
|
190
66
|
- lib/faraday/encoders/flat_params_encoder.rb
|
191
67
|
- lib/faraday/encoders/nested_params_encoder.rb
|
192
68
|
- lib/faraday/error.rb
|
69
|
+
- lib/faraday/file_part.rb
|
193
70
|
- lib/faraday/logging/formatter.rb
|
194
71
|
- lib/faraday/methods.rb
|
195
72
|
- lib/faraday/middleware.rb
|
@@ -200,14 +77,15 @@ files:
|
|
200
77
|
- lib/faraday/options/proxy_options.rb
|
201
78
|
- lib/faraday/options/request_options.rb
|
202
79
|
- lib/faraday/options/ssl_options.rb
|
80
|
+
- lib/faraday/param_part.rb
|
203
81
|
- lib/faraday/parameters.rb
|
204
82
|
- lib/faraday/rack_builder.rb
|
205
83
|
- lib/faraday/request.rb
|
206
84
|
- lib/faraday/request/authorization.rb
|
207
|
-
- lib/faraday/request/basic_authentication.rb
|
208
85
|
- lib/faraday/request/instrumentation.rb
|
209
86
|
- lib/faraday/request/json.rb
|
210
|
-
- lib/faraday/request/
|
87
|
+
- lib/faraday/request/multipart.rb
|
88
|
+
- lib/faraday/request/retry.rb
|
211
89
|
- lib/faraday/request/url_encoded.rb
|
212
90
|
- lib/faraday/response.rb
|
213
91
|
- lib/faraday/response/json.rb
|
@@ -218,20 +96,11 @@ files:
|
|
218
96
|
- lib/faraday/utils/params_hash.rb
|
219
97
|
- lib/faraday/version.rb
|
220
98
|
- 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
99
|
- spec/faraday/adapter/test_spec.rb
|
229
|
-
- spec/faraday/adapter/typhoeus_spec.rb
|
230
100
|
- spec/faraday/adapter_registry_spec.rb
|
231
101
|
- spec/faraday/adapter_spec.rb
|
232
102
|
- spec/faraday/composite_read_io_spec.rb
|
233
103
|
- spec/faraday/connection_spec.rb
|
234
|
-
- spec/faraday/deprecate_spec.rb
|
235
104
|
- spec/faraday/error_spec.rb
|
236
105
|
- spec/faraday/middleware_spec.rb
|
237
106
|
- spec/faraday/options/env_spec.rb
|
@@ -244,11 +113,12 @@ files:
|
|
244
113
|
- spec/faraday/request/authorization_spec.rb
|
245
114
|
- spec/faraday/request/instrumentation_spec.rb
|
246
115
|
- spec/faraday/request/json_spec.rb
|
116
|
+
- spec/faraday/request/multipart_spec.rb
|
117
|
+
- spec/faraday/request/retry_spec.rb
|
247
118
|
- spec/faraday/request/url_encoded_spec.rb
|
248
119
|
- spec/faraday/request_spec.rb
|
249
120
|
- spec/faraday/response/json_spec.rb
|
250
121
|
- spec/faraday/response/logger_spec.rb
|
251
|
-
- spec/faraday/response/middleware_spec.rb
|
252
122
|
- spec/faraday/response/raise_error_spec.rb
|
253
123
|
- spec/faraday/response_spec.rb
|
254
124
|
- spec/faraday/utils/headers_spec.rb
|
@@ -262,13 +132,12 @@ files:
|
|
262
132
|
- spec/support/shared_examples/params_encoder.rb
|
263
133
|
- spec/support/shared_examples/request_method.rb
|
264
134
|
- spec/support/streaming_response_checker.rb
|
265
|
-
- spec/support/webmock_rack_app.rb
|
266
135
|
homepage: https://lostisland.github.io/faraday
|
267
136
|
licenses:
|
268
137
|
- MIT
|
269
138
|
metadata:
|
270
139
|
homepage_uri: https://lostisland.github.io/faraday
|
271
|
-
changelog_uri: https://github.com/lostisland/faraday/releases/tag/
|
140
|
+
changelog_uri: https://github.com/lostisland/faraday/releases/tag/v2.0.0.alpha.pre.1
|
272
141
|
source_code_uri: https://github.com/lostisland/faraday
|
273
142
|
bug_tracker_uri: https://github.com/lostisland/faraday/issues
|
274
143
|
post_install_message:
|
@@ -280,12 +149,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
280
149
|
requirements:
|
281
150
|
- - ">="
|
282
151
|
- !ruby/object:Gem::Version
|
283
|
-
version: '2.
|
152
|
+
version: '2.6'
|
284
153
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
285
154
|
requirements:
|
286
|
-
- - "
|
155
|
+
- - ">"
|
287
156
|
- !ruby/object:Gem::Version
|
288
|
-
version:
|
157
|
+
version: 1.3.1
|
289
158
|
requirements: []
|
290
159
|
rubygems_version: 3.1.6
|
291
160
|
signing_key:
|
@@ -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
|
@@ -1,49 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
RSpec.describe Faraday::Adapter::Excon do
|
4
|
-
features :request_body_on_query_methods, :reason_phrase_parse, :trace_method
|
5
|
-
|
6
|
-
it_behaves_like 'an adapter'
|
7
|
-
|
8
|
-
it 'allows to provide adapter specific configs' do
|
9
|
-
url = URI('https://example.com:1234')
|
10
|
-
|
11
|
-
adapter = described_class.new(nil, debug_request: true)
|
12
|
-
|
13
|
-
conn = adapter.build_connection(url: url)
|
14
|
-
|
15
|
-
expect(conn.data[:debug_request]).to be_truthy
|
16
|
-
end
|
17
|
-
|
18
|
-
context 'config' do
|
19
|
-
let(:adapter) { Faraday::Adapter::Excon.new }
|
20
|
-
let(:request) { Faraday::RequestOptions.new }
|
21
|
-
let(:uri) { URI.parse('https://example.com') }
|
22
|
-
let(:env) { { request: request, url: uri } }
|
23
|
-
|
24
|
-
it 'sets timeout' do
|
25
|
-
request.timeout = 5
|
26
|
-
options = adapter.send(:opts_from_env, env)
|
27
|
-
expect(options[:read_timeout]).to eq(5)
|
28
|
-
expect(options[:write_timeout]).to eq(5)
|
29
|
-
expect(options[:connect_timeout]).to eq(5)
|
30
|
-
end
|
31
|
-
|
32
|
-
it 'sets timeout and open_timeout' do
|
33
|
-
request.timeout = 5
|
34
|
-
request.open_timeout = 3
|
35
|
-
options = adapter.send(:opts_from_env, env)
|
36
|
-
expect(options[:read_timeout]).to eq(5)
|
37
|
-
expect(options[:write_timeout]).to eq(5)
|
38
|
-
expect(options[:connect_timeout]).to eq(3)
|
39
|
-
end
|
40
|
-
|
41
|
-
it 'sets open_timeout' do
|
42
|
-
request.open_timeout = 3
|
43
|
-
options = adapter.send(:opts_from_env, env)
|
44
|
-
expect(options[:read_timeout]).to eq(nil)
|
45
|
-
expect(options[:write_timeout]).to eq(nil)
|
46
|
-
expect(options[:connect_timeout]).to eq(3)
|
47
|
-
end
|
48
|
-
end
|
49
|
-
end
|