faraday 0.17.4 → 1.8.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (135) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +156 -8
  3. data/LICENSE.md +1 -1
  4. data/README.md +16 -358
  5. data/Rakefile +1 -7
  6. data/examples/client_spec.rb +97 -0
  7. data/examples/client_test.rb +118 -0
  8. data/lib/faraday/adapter/test.rb +118 -69
  9. data/lib/faraday/adapter/typhoeus.rb +4 -1
  10. data/lib/faraday/adapter.rb +72 -22
  11. data/lib/faraday/adapter_registry.rb +30 -0
  12. data/lib/faraday/autoload.rb +39 -36
  13. data/lib/faraday/connection.rb +343 -185
  14. data/lib/faraday/dependency_loader.rb +37 -0
  15. data/lib/faraday/encoders/flat_params_encoder.rb +105 -0
  16. data/lib/faraday/encoders/nested_params_encoder.rb +176 -0
  17. data/lib/faraday/error.rb +29 -35
  18. data/lib/faraday/file_part.rb +128 -0
  19. data/lib/faraday/logging/formatter.rb +105 -0
  20. data/lib/faraday/methods.rb +6 -0
  21. data/lib/faraday/middleware.rb +19 -25
  22. data/lib/faraday/middleware_registry.rb +129 -0
  23. data/lib/faraday/options/connection_options.rb +22 -0
  24. data/lib/faraday/options/env.rb +181 -0
  25. data/lib/faraday/options/proxy_options.rb +32 -0
  26. data/lib/faraday/options/request_options.rb +22 -0
  27. data/lib/faraday/options/ssl_options.rb +59 -0
  28. data/lib/faraday/options.rb +36 -191
  29. data/lib/faraday/param_part.rb +53 -0
  30. data/lib/faraday/parameters.rb +4 -197
  31. data/lib/faraday/rack_builder.rb +76 -64
  32. data/lib/faraday/request/authorization.rb +51 -30
  33. data/lib/faraday/request/basic_authentication.rb +14 -7
  34. data/lib/faraday/request/instrumentation.rb +45 -27
  35. data/lib/faraday/request/multipart.rb +86 -48
  36. data/lib/faraday/request/retry.rb +197 -171
  37. data/lib/faraday/request/token_authentication.rb +15 -10
  38. data/lib/faraday/request/url_encoded.rb +43 -23
  39. data/lib/faraday/request.rb +86 -44
  40. data/lib/faraday/response/logger.rb +22 -69
  41. data/lib/faraday/response/raise_error.rb +49 -18
  42. data/lib/faraday/response.rb +24 -20
  43. data/lib/faraday/utils/headers.rb +139 -0
  44. data/lib/faraday/utils/params_hash.rb +61 -0
  45. data/lib/faraday/utils.rb +38 -247
  46. data/lib/faraday/version.rb +5 -0
  47. data/lib/faraday.rb +127 -189
  48. data/spec/external_adapters/faraday_specs_setup.rb +14 -0
  49. data/spec/faraday/adapter/em_http_spec.rb +49 -0
  50. data/spec/faraday/adapter/em_synchrony_spec.rb +18 -0
  51. data/spec/faraday/adapter/excon_spec.rb +49 -0
  52. data/spec/faraday/adapter/httpclient_spec.rb +73 -0
  53. data/spec/faraday/adapter/net_http_spec.rb +64 -0
  54. data/spec/faraday/adapter/patron_spec.rb +18 -0
  55. data/spec/faraday/adapter/rack_spec.rb +8 -0
  56. data/spec/faraday/adapter/test_spec.rb +377 -0
  57. data/spec/faraday/adapter/typhoeus_spec.rb +7 -0
  58. data/spec/faraday/adapter_registry_spec.rb +28 -0
  59. data/spec/faraday/adapter_spec.rb +55 -0
  60. data/spec/faraday/composite_read_io_spec.rb +80 -0
  61. data/spec/faraday/connection_spec.rb +736 -0
  62. data/spec/faraday/error_spec.rb +12 -54
  63. data/spec/faraday/middleware_spec.rb +52 -0
  64. data/spec/faraday/options/env_spec.rb +70 -0
  65. data/spec/faraday/options/options_spec.rb +297 -0
  66. data/spec/faraday/options/proxy_options_spec.rb +44 -0
  67. data/spec/faraday/options/request_options_spec.rb +19 -0
  68. data/spec/faraday/params_encoders/flat_spec.rb +42 -0
  69. data/spec/faraday/params_encoders/nested_spec.rb +142 -0
  70. data/spec/faraday/rack_builder_spec.rb +345 -0
  71. data/spec/faraday/request/authorization_spec.rb +96 -0
  72. data/spec/faraday/request/instrumentation_spec.rb +76 -0
  73. data/spec/faraday/request/multipart_spec.rb +302 -0
  74. data/spec/faraday/request/retry_spec.rb +242 -0
  75. data/spec/faraday/request/url_encoded_spec.rb +83 -0
  76. data/spec/faraday/request_spec.rb +120 -0
  77. data/spec/faraday/response/logger_spec.rb +220 -0
  78. data/spec/faraday/response/middleware_spec.rb +68 -0
  79. data/spec/faraday/response/raise_error_spec.rb +78 -15
  80. data/spec/faraday/response_spec.rb +75 -0
  81. data/spec/faraday/utils/headers_spec.rb +82 -0
  82. data/spec/faraday/utils_spec.rb +56 -0
  83. data/spec/faraday_spec.rb +37 -0
  84. data/spec/spec_helper.rb +63 -36
  85. data/spec/support/disabling_stub.rb +14 -0
  86. data/spec/support/fake_safe_buffer.rb +15 -0
  87. data/spec/support/helper_methods.rb +133 -0
  88. data/spec/support/shared_examples/adapter.rb +105 -0
  89. data/spec/support/shared_examples/params_encoder.rb +18 -0
  90. data/spec/support/shared_examples/request_method.rb +262 -0
  91. data/spec/support/streaming_response_checker.rb +35 -0
  92. data/spec/support/webmock_rack_app.rb +68 -0
  93. metadata +194 -48
  94. data/lib/faraday/adapter/em_http.rb +0 -243
  95. data/lib/faraday/adapter/em_http_ssl_patch.rb +0 -56
  96. data/lib/faraday/adapter/em_synchrony/parallel_manager.rb +0 -66
  97. data/lib/faraday/adapter/em_synchrony.rb +0 -106
  98. data/lib/faraday/adapter/excon.rb +0 -82
  99. data/lib/faraday/adapter/httpclient.rb +0 -128
  100. data/lib/faraday/adapter/net_http.rb +0 -153
  101. data/lib/faraday/adapter/net_http_persistent.rb +0 -68
  102. data/lib/faraday/adapter/patron.rb +0 -95
  103. data/lib/faraday/adapter/rack.rb +0 -58
  104. data/lib/faraday/deprecate.rb +0 -109
  105. data/lib/faraday/upload_io.rb +0 -67
  106. data/spec/faraday/deprecate_spec.rb +0 -147
  107. data/test/adapters/default_test.rb +0 -14
  108. data/test/adapters/em_http_test.rb +0 -30
  109. data/test/adapters/em_synchrony_test.rb +0 -32
  110. data/test/adapters/excon_test.rb +0 -30
  111. data/test/adapters/httpclient_test.rb +0 -34
  112. data/test/adapters/integration.rb +0 -263
  113. data/test/adapters/logger_test.rb +0 -136
  114. data/test/adapters/net_http_persistent_test.rb +0 -114
  115. data/test/adapters/net_http_test.rb +0 -79
  116. data/test/adapters/patron_test.rb +0 -40
  117. data/test/adapters/rack_test.rb +0 -38
  118. data/test/adapters/test_middleware_test.rb +0 -157
  119. data/test/adapters/typhoeus_test.rb +0 -38
  120. data/test/authentication_middleware_test.rb +0 -65
  121. data/test/composite_read_io_test.rb +0 -109
  122. data/test/connection_test.rb +0 -738
  123. data/test/env_test.rb +0 -268
  124. data/test/helper.rb +0 -75
  125. data/test/live_server.rb +0 -67
  126. data/test/middleware/instrumentation_test.rb +0 -88
  127. data/test/middleware/retry_test.rb +0 -282
  128. data/test/middleware_stack_test.rb +0 -260
  129. data/test/multibyte.txt +0 -1
  130. data/test/options_test.rb +0 -333
  131. data/test/parameters_test.rb +0 -157
  132. data/test/request_middleware_test.rb +0 -126
  133. data/test/response_middleware_test.rb +0 -72
  134. data/test/strawberry.rb +0 -2
  135. data/test/utils_test.rb +0 -98
data/test/env_test.rb DELETED
@@ -1,268 +0,0 @@
1
- require File.expand_path('../helper', __FILE__)
2
-
3
- class EnvTest < Faraday::TestCase
4
- def setup
5
- @conn = Faraday.new :url => 'http://sushi.com/api',
6
- :headers => {'Mime-Version' => '1.0'},
7
- :request => {:oauth => {:consumer_key => 'anonymous'}}
8
-
9
- @conn.options.timeout = 3
10
- @conn.options.open_timeout = 5
11
- @conn.ssl.verify = false
12
- @conn.proxy = 'http://proxy.com'
13
- end
14
-
15
- def test_request_create_stores_method
16
- env = make_env(:get)
17
- assert_equal :get, env.method
18
- end
19
-
20
- def test_request_create_stores_uri
21
- env = make_env do |req|
22
- req.url 'foo.json', 'a' => 1
23
- end
24
- assert_equal 'http://sushi.com/api/foo.json?a=1', env.url.to_s
25
- end
26
-
27
- def test_request_create_stores_uri_with_anchor
28
- env = make_env do |req|
29
- req.url 'foo.json?b=2&a=1#qqq'
30
- end
31
- assert_equal 'http://sushi.com/api/foo.json?a=1&b=2', env.url.to_s
32
- end
33
-
34
- def test_request_create_stores_headers
35
- env = make_env do |req|
36
- req['Server'] = 'Faraday'
37
- end
38
- headers = env.request_headers
39
- assert_equal '1.0', headers['mime-version']
40
- assert_equal 'Faraday', headers['server']
41
- end
42
-
43
- def test_request_create_stores_body
44
- env = make_env do |req|
45
- req.body = 'hi'
46
- end
47
- assert_equal 'hi', env.body
48
- end
49
-
50
- def test_global_request_options
51
- env = make_env
52
- assert_equal 3, env.request.timeout
53
- assert_equal 5, env.request.open_timeout
54
- end
55
-
56
- def test_per_request_options
57
- env = make_env do |req|
58
- req.options.timeout = 10
59
- req.options.boundary = 'boo'
60
- req.options.oauth[:consumer_secret] = 'xyz'
61
- req.options.context = {
62
- foo: 'foo',
63
- bar: 'bar'
64
- }
65
- end
66
-
67
- assert_equal 10, env.request.timeout
68
- assert_equal 5, env.request.open_timeout
69
- assert_equal 'boo', env.request.boundary
70
- assert_equal env.request.context, { foo: 'foo', bar: 'bar' }
71
-
72
- oauth_expected = {:consumer_secret => 'xyz', :consumer_key => 'anonymous'}
73
- assert_equal oauth_expected, env.request.oauth
74
- end
75
-
76
- def test_request_create_stores_ssl_options
77
- env = make_env
78
- assert_equal false, env.ssl.verify
79
- end
80
-
81
- def test_custom_members_are_retained
82
- env = make_env
83
- env[:foo] = "custom 1"
84
- env[:bar] = :custom_2
85
- env2 = Faraday::Env.from(env)
86
- assert_equal "custom 1", env2[:foo]
87
- assert_equal :custom_2, env2[:bar]
88
- env2[:baz] = "custom 3"
89
- assert_nil env[:baz]
90
- end
91
-
92
- private
93
-
94
- def make_env(method = :get, connection = @conn, &block)
95
- request = connection.build_request(method, &block)
96
- request.to_env(connection)
97
- end
98
- end
99
-
100
- class HeadersTest < Faraday::TestCase
101
- def setup
102
- @headers = Faraday::Utils::Headers.new
103
- end
104
-
105
- def test_normalizes_different_capitalizations
106
- @headers['Content-Type'] = 'application/json'
107
- assert_equal ['Content-Type'], @headers.keys
108
- assert_equal 'application/json', @headers['Content-Type']
109
- assert_equal 'application/json', @headers['CONTENT-TYPE']
110
- assert_equal 'application/json', @headers['content-type']
111
- assert @headers.include?('content-type')
112
-
113
- @headers['content-type'] = 'application/xml'
114
- assert_equal ['Content-Type'], @headers.keys
115
- assert_equal 'application/xml', @headers['Content-Type']
116
- assert_equal 'application/xml', @headers['CONTENT-TYPE']
117
- assert_equal 'application/xml', @headers['content-type']
118
- end
119
-
120
- def test_fetch_key
121
- @headers['Content-Type'] = 'application/json'
122
- block_called = false
123
- assert_equal 'application/json', @headers.fetch('content-type') { block_called = true }
124
- assert_equal 'application/json', @headers.fetch('Content-Type')
125
- assert_equal 'application/json', @headers.fetch('CONTENT-TYPE')
126
- assert_equal 'application/json', @headers.fetch(:content_type)
127
- assert_equal false, block_called
128
-
129
- assert_equal 'default', @headers.fetch('invalid', 'default')
130
- assert_equal false, @headers.fetch('invalid', false)
131
- assert_nil @headers.fetch('invalid', nil)
132
-
133
- assert_equal 'Invalid key', @headers.fetch('Invalid') { |key| "#{key} key" }
134
-
135
- expected_error = defined?(KeyError) ? KeyError : IndexError
136
- assert_raises(expected_error) { @headers.fetch('invalid') }
137
- end
138
-
139
- def test_delete_key
140
- @headers['Content-Type'] = 'application/json'
141
- assert_equal 1, @headers.size
142
- assert @headers.include?('content-type')
143
- assert_equal 'application/json', @headers.delete('content-type')
144
- assert_equal 0, @headers.size
145
- assert !@headers.include?('content-type')
146
- assert_nil @headers.delete('content-type')
147
- end
148
-
149
- def test_parse_response_headers_leaves_http_status_line_out
150
- @headers.parse("HTTP/1.1 200 OK\r\nContent-Type: text/html\r\n\r\n")
151
- assert_equal %w(Content-Type), @headers.keys
152
- end
153
-
154
- def test_parse_response_headers_parses_lower_cased_header_name_and_value
155
- @headers.parse("HTTP/1.1 200 OK\r\nContent-Type: text/html\r\n\r\n")
156
- assert_equal 'text/html', @headers['content-type']
157
- end
158
-
159
- def test_parse_response_headers_parses_lower_cased_header_name_and_value_with_colon
160
- @headers.parse("HTTP/1.1 200 OK\r\nContent-Type: text/html\r\nLocation: http://sushi.com/\r\n\r\n")
161
- assert_equal 'http://sushi.com/', @headers['location']
162
- end
163
-
164
- def test_parse_response_headers_parses_blank_lines
165
- @headers.parse("HTTP/1.1 200 OK\r\n\r\nContent-Type: text/html\r\n\r\n")
166
- assert_equal 'text/html', @headers['content-type']
167
- end
168
- end
169
-
170
- class ResponseTest < Faraday::TestCase
171
- def setup
172
- @env = Faraday::Env.from \
173
- :status => 404, :body => 'yikes',
174
- :response_headers => {'Content-Type' => 'text/plain'}
175
- @response = Faraday::Response.new @env
176
- end
177
-
178
- def test_finished
179
- assert @response.finished?
180
- end
181
-
182
- def test_error_on_finish
183
- assert_raises RuntimeError do
184
- @response.finish({})
185
- end
186
- end
187
-
188
- def test_body_is_parsed_on_finish
189
- response = Faraday::Response.new
190
- response.on_complete { |env| env[:body] = env[:body].upcase }
191
- response.finish(@env)
192
-
193
- assert_equal "YIKES", response.body
194
- end
195
-
196
- def test_response_body_is_available_during_on_complete
197
- response = Faraday::Response.new
198
- response.on_complete { |env| env[:body] = response.body.upcase }
199
- response.finish(@env)
200
-
201
- assert_equal "YIKES", response.body
202
- end
203
-
204
- def test_env_in_on_complete_is_identical_to_response_env
205
- response = Faraday::Response.new
206
- callback_env = nil
207
- response.on_complete { |env| callback_env = env }
208
- response.finish({})
209
-
210
- assert_same response.env, callback_env
211
- end
212
-
213
- def test_not_success
214
- assert !@response.success?
215
- end
216
-
217
- def test_status
218
- assert_equal 404, @response.status
219
- end
220
-
221
- def test_body
222
- assert_equal 'yikes', @response.body
223
- end
224
-
225
- def test_headers
226
- assert_equal 'text/plain', @response.headers['Content-Type']
227
- assert_equal 'text/plain', @response['content-type']
228
- end
229
-
230
- def test_apply_request
231
- @response.apply_request :body => 'a=b', :method => :post
232
- assert_equal 'yikes', @response.body
233
- assert_equal :post, @response.env[:method]
234
- end
235
-
236
- def test_marshal_response
237
- @response = Faraday::Response.new
238
- @response.on_complete { }
239
- @response.finish @env.merge(:params => 'moo')
240
-
241
- loaded = Marshal.load Marshal.dump(@response)
242
- assert_nil loaded.env[:params]
243
- assert_equal %w[body response_headers status], loaded.env.keys.map { |k| k.to_s }.sort
244
- end
245
-
246
- def test_marshal_request
247
- @request = Faraday::Request.create(:post) do |request|
248
- request.options = Faraday::RequestOptions.new
249
- request.params = Faraday::Utils::ParamsHash.new({ 'a' => 'c' })
250
- request.headers = { 'b' => 'd' }
251
- request.body = 'hello, world!'
252
- request.url 'http://localhost/foo'
253
- end
254
-
255
- loaded = Marshal.load(Marshal.dump(@request))
256
-
257
- assert_equal @request, loaded
258
- end
259
-
260
- def test_hash
261
- hash = @response.to_hash
262
- assert_kind_of Hash, hash
263
- assert_equal @env.to_hash, hash
264
- assert_equal hash[:status], @response.status
265
- assert_equal hash[:response_headers], @response.headers
266
- assert_equal hash[:body], @response.body
267
- end
268
- end
data/test/helper.rb DELETED
@@ -1,75 +0,0 @@
1
- require 'simplecov'
2
- require 'coveralls'
3
-
4
- SimpleCov.formatters = [SimpleCov::Formatter::HTMLFormatter, Coveralls::SimpleCov::Formatter]
5
-
6
- SimpleCov.start do
7
- add_filter '/bundle/'
8
- add_filter '/test/'
9
- minimum_coverage(87)
10
- end
11
-
12
- gem 'minitest' if defined? Bundler
13
- require 'minitest/autorun'
14
-
15
- require File.expand_path('../../lib/faraday', __FILE__)
16
-
17
- require 'stringio'
18
- require 'uri'
19
-
20
- module Faraday
21
- module LiveServerConfig
22
- def live_server=(value)
23
- @@live_server = case value
24
- when /^http/
25
- URI(value)
26
- when /./
27
- URI('http://127.0.0.1:4567')
28
- end
29
- end
30
-
31
- def live_server?
32
- defined? @@live_server
33
- end
34
-
35
- # Returns an object that responds to `host` and `port`.
36
- def live_server
37
- live_server? and @@live_server
38
- end
39
- end
40
-
41
- class TestCase < MiniTest::Test
42
- extend LiveServerConfig
43
- self.live_server = ENV['LIVE']
44
-
45
- def test_default
46
- assert true
47
- end unless defined? ::MiniTest
48
-
49
- def capture_warnings
50
- old, $stderr = $stderr, StringIO.new
51
- begin
52
- yield
53
- $stderr.string
54
- ensure
55
- $stderr = old
56
- end
57
- end
58
-
59
- def self.jruby?
60
- defined? RUBY_ENGINE and 'jruby' == RUBY_ENGINE
61
- end
62
-
63
- def self.rbx?
64
- defined? RUBY_ENGINE and 'rbx' == RUBY_ENGINE
65
- end
66
-
67
- def self.ruby_22_plus?
68
- RUBY_VERSION > '2.2'
69
- end
70
-
71
- def self.ssl_mode?
72
- ENV['SSL'] == 'yes'
73
- end
74
- end
75
- end
data/test/live_server.rb DELETED
@@ -1,67 +0,0 @@
1
- require 'sinatra/base'
2
-
3
- module Faraday
4
- class LiveServer < Sinatra::Base
5
- set :environment, :test
6
- disable :logging
7
- disable :protection
8
-
9
- [:get, :post, :put, :patch, :delete, :options].each do |method|
10
- send(method, '/echo') do
11
- kind = request.request_method.downcase
12
- out = kind.dup
13
- out << ' ?' << request.GET.inspect if request.GET.any?
14
- out << ' ' << request.POST.inspect if request.POST.any?
15
-
16
- content_type 'text/plain'
17
- return out
18
- end
19
- end
20
-
21
- get '/echo_header' do
22
- header = "HTTP_#{params[:name].tr('-', '_').upcase}"
23
- request.env.fetch(header) { 'NONE' }
24
- end
25
-
26
- post '/file' do
27
- if params[:uploaded_file].respond_to? :each_key
28
- "file %s %s %d" % [
29
- params[:uploaded_file][:filename],
30
- params[:uploaded_file][:type],
31
- params[:uploaded_file][:tempfile].size
32
- ]
33
- else
34
- status 400
35
- end
36
- end
37
-
38
- get '/multi' do
39
- [200, { 'Set-Cookie' => 'one, two' }, '']
40
- end
41
-
42
- get '/who-am-i' do
43
- request.env['REMOTE_ADDR']
44
- end
45
-
46
- get '/slow' do
47
- sleep 10
48
- [200, {}, 'ok']
49
- end
50
-
51
- get '/204' do
52
- status 204 # no content
53
- end
54
-
55
- get '/ssl' do
56
- request.secure?.to_s
57
- end
58
-
59
- error do |e|
60
- "#{e.class}\n#{e.to_s}\n#{e.backtrace.join("\n")}"
61
- end
62
- end
63
- end
64
-
65
- if $0 == __FILE__
66
- Faraday::LiveServer.run!
67
- end
@@ -1,88 +0,0 @@
1
- require File.expand_path("../../helper", __FILE__)
2
-
3
- module Middleware
4
- class InstrumentationTest < Faraday::TestCase
5
- def setup
6
- @instrumenter = FakeInstrumenter.new
7
- end
8
-
9
- def test_default_name
10
- assert_equal 'request.faraday', options.name
11
- end
12
-
13
- def test_default_instrumenter
14
- begin
15
- instrumenter = options.instrumenter
16
- rescue NameError => err
17
- assert_match 'ActiveSupport', err.to_s
18
- else
19
- assert_equal ActiveSupport::Notifications, instrumenter
20
- end
21
- end
22
-
23
- def test_name
24
- assert_equal 'booya', options(:name => 'booya').name
25
- end
26
-
27
- def test_instrumenter
28
- assert_equal :boom, options(:instrumenter => :boom).instrumenter
29
- end
30
-
31
- def test_instrumentation_with_default_name
32
- assert_equal 0, @instrumenter.instrumentations.size
33
-
34
- faraday = conn
35
- res = faraday.get '/'
36
- assert_equal 'ok', res.body
37
-
38
- assert_equal 1, @instrumenter.instrumentations.size
39
- name, env = @instrumenter.instrumentations.first
40
- assert_equal 'request.faraday', name
41
- assert_equal '/', env[:url].path
42
- end
43
-
44
- def test_instrumentation
45
- assert_equal 0, @instrumenter.instrumentations.size
46
-
47
- faraday = conn :name => 'booya'
48
- res = faraday.get '/'
49
- assert_equal 'ok', res.body
50
-
51
- assert_equal 1, @instrumenter.instrumentations.size
52
- name, env = @instrumenter.instrumentations.first
53
- assert_equal 'booya', name
54
- assert_equal '/', env[:url].path
55
- end
56
-
57
- class FakeInstrumenter
58
- attr_reader :instrumentations
59
-
60
- def initialize
61
- @instrumentations = []
62
- end
63
-
64
- def instrument(name, env)
65
- @instrumentations << [name, env]
66
- yield
67
- end
68
- end
69
-
70
- def options(hash = nil)
71
- Faraday::Request::Instrumentation::Options.from hash
72
- end
73
-
74
- def conn(hash = nil)
75
- hash ||= {}
76
- hash[:instrumenter] = @instrumenter
77
-
78
- Faraday.new do |f|
79
- f.request :instrumentation, hash
80
- f.adapter :test do |stub|
81
- stub.get '/' do
82
- [200, {}, 'ok']
83
- end
84
- end
85
- end
86
- end
87
- end
88
- end