faraday 0.17.5 → 2.3.0

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.
Files changed (124) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +350 -8
  3. data/LICENSE.md +1 -1
  4. data/README.md +24 -364
  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 +127 -72
  9. data/lib/faraday/adapter.rb +69 -22
  10. data/lib/faraday/adapter_registry.rb +30 -0
  11. data/lib/faraday/connection.rb +309 -232
  12. data/lib/faraday/encoders/flat_params_encoder.rb +105 -0
  13. data/lib/faraday/encoders/nested_params_encoder.rb +183 -0
  14. data/lib/faraday/error.rb +31 -42
  15. data/lib/faraday/logging/formatter.rb +106 -0
  16. data/lib/faraday/methods.rb +6 -0
  17. data/lib/faraday/middleware.rb +18 -25
  18. data/lib/faraday/middleware_registry.rb +83 -0
  19. data/lib/faraday/options/connection_options.rb +22 -0
  20. data/lib/faraday/options/env.rb +181 -0
  21. data/lib/faraday/options/proxy_options.rb +32 -0
  22. data/lib/faraday/options/request_options.rb +22 -0
  23. data/lib/faraday/options/ssl_options.rb +59 -0
  24. data/lib/faraday/options.rb +38 -193
  25. data/lib/faraday/parameters.rb +4 -197
  26. data/lib/faraday/rack_builder.rb +91 -76
  27. data/lib/faraday/request/authorization.rb +37 -29
  28. data/lib/faraday/request/instrumentation.rb +47 -27
  29. data/lib/faraday/request/json.rb +55 -0
  30. data/lib/faraday/request/url_encoded.rb +48 -24
  31. data/lib/faraday/request.rb +64 -44
  32. data/lib/faraday/response/json.rb +54 -0
  33. data/lib/faraday/response/logger.rb +22 -69
  34. data/lib/faraday/response/raise_error.rb +57 -18
  35. data/lib/faraday/response.rb +25 -32
  36. data/lib/faraday/utils/headers.rb +139 -0
  37. data/lib/faraday/utils/params_hash.rb +61 -0
  38. data/lib/faraday/utils.rb +47 -251
  39. data/lib/faraday/version.rb +5 -0
  40. data/lib/faraday.rb +108 -198
  41. data/spec/external_adapters/faraday_specs_setup.rb +14 -0
  42. data/spec/faraday/adapter/test_spec.rb +377 -0
  43. data/spec/faraday/adapter_registry_spec.rb +28 -0
  44. data/spec/faraday/adapter_spec.rb +55 -0
  45. data/spec/faraday/connection_spec.rb +787 -0
  46. data/spec/faraday/error_spec.rb +12 -54
  47. data/spec/faraday/middleware_registry_spec.rb +31 -0
  48. data/spec/faraday/middleware_spec.rb +52 -0
  49. data/spec/faraday/options/env_spec.rb +70 -0
  50. data/spec/faraday/options/options_spec.rb +297 -0
  51. data/spec/faraday/options/proxy_options_spec.rb +44 -0
  52. data/spec/faraday/options/request_options_spec.rb +19 -0
  53. data/spec/faraday/params_encoders/flat_spec.rb +42 -0
  54. data/spec/faraday/params_encoders/nested_spec.rb +150 -0
  55. data/spec/faraday/rack_builder_spec.rb +317 -0
  56. data/spec/faraday/request/authorization_spec.rb +83 -0
  57. data/spec/faraday/request/instrumentation_spec.rb +74 -0
  58. data/spec/faraday/request/json_spec.rb +111 -0
  59. data/spec/faraday/request/url_encoded_spec.rb +93 -0
  60. data/spec/faraday/request_spec.rb +109 -0
  61. data/spec/faraday/response/json_spec.rb +117 -0
  62. data/spec/faraday/response/logger_spec.rb +220 -0
  63. data/spec/faraday/response/raise_error_spec.rb +81 -15
  64. data/spec/faraday/response_spec.rb +75 -0
  65. data/spec/faraday/utils/headers_spec.rb +82 -0
  66. data/spec/faraday/utils_spec.rb +117 -0
  67. data/spec/faraday_spec.rb +37 -0
  68. data/spec/spec_helper.rb +63 -36
  69. data/spec/support/disabling_stub.rb +14 -0
  70. data/spec/support/fake_safe_buffer.rb +15 -0
  71. data/spec/support/helper_methods.rb +96 -0
  72. data/spec/support/shared_examples/adapter.rb +104 -0
  73. data/spec/support/shared_examples/params_encoder.rb +18 -0
  74. data/spec/support/shared_examples/request_method.rb +249 -0
  75. data/spec/support/streaming_response_checker.rb +35 -0
  76. metadata +74 -63
  77. data/lib/faraday/adapter/em_http.rb +0 -243
  78. data/lib/faraday/adapter/em_http_ssl_patch.rb +0 -56
  79. data/lib/faraday/adapter/em_synchrony/parallel_manager.rb +0 -66
  80. data/lib/faraday/adapter/em_synchrony.rb +0 -106
  81. data/lib/faraday/adapter/excon.rb +0 -82
  82. data/lib/faraday/adapter/httpclient.rb +0 -128
  83. data/lib/faraday/adapter/net_http.rb +0 -153
  84. data/lib/faraday/adapter/net_http_persistent.rb +0 -68
  85. data/lib/faraday/adapter/patron.rb +0 -95
  86. data/lib/faraday/adapter/rack.rb +0 -58
  87. data/lib/faraday/adapter/typhoeus.rb +0 -12
  88. data/lib/faraday/autoload.rb +0 -84
  89. data/lib/faraday/deprecate.rb +0 -109
  90. data/lib/faraday/request/basic_authentication.rb +0 -13
  91. data/lib/faraday/request/multipart.rb +0 -68
  92. data/lib/faraday/request/retry.rb +0 -213
  93. data/lib/faraday/request/token_authentication.rb +0 -15
  94. data/lib/faraday/upload_io.rb +0 -67
  95. data/spec/faraday/deprecate_spec.rb +0 -147
  96. data/test/adapters/default_test.rb +0 -14
  97. data/test/adapters/em_http_test.rb +0 -30
  98. data/test/adapters/em_synchrony_test.rb +0 -32
  99. data/test/adapters/excon_test.rb +0 -30
  100. data/test/adapters/httpclient_test.rb +0 -34
  101. data/test/adapters/integration.rb +0 -263
  102. data/test/adapters/logger_test.rb +0 -136
  103. data/test/adapters/net_http_persistent_test.rb +0 -114
  104. data/test/adapters/net_http_test.rb +0 -79
  105. data/test/adapters/patron_test.rb +0 -40
  106. data/test/adapters/rack_test.rb +0 -38
  107. data/test/adapters/test_middleware_test.rb +0 -157
  108. data/test/adapters/typhoeus_test.rb +0 -38
  109. data/test/authentication_middleware_test.rb +0 -65
  110. data/test/composite_read_io_test.rb +0 -109
  111. data/test/connection_test.rb +0 -738
  112. data/test/env_test.rb +0 -268
  113. data/test/helper.rb +0 -75
  114. data/test/live_server.rb +0 -67
  115. data/test/middleware/instrumentation_test.rb +0 -88
  116. data/test/middleware/retry_test.rb +0 -282
  117. data/test/middleware_stack_test.rb +0 -260
  118. data/test/multibyte.txt +0 -1
  119. data/test/options_test.rb +0 -333
  120. data/test/parameters_test.rb +0 -157
  121. data/test/request_middleware_test.rb +0 -126
  122. data/test/response_middleware_test.rb +0 -72
  123. data/test/strawberry.rb +0 -2
  124. data/test/utils_test.rb +0 -98
@@ -0,0 +1,96 @@
1
+ # frozen_string_literal: true
2
+
3
+ module Faraday
4
+ module HelperMethods
5
+ def self.included(base)
6
+ base.extend ClassMethods
7
+ end
8
+
9
+ module ClassMethods
10
+ def features(*features)
11
+ @features = features
12
+ end
13
+
14
+ def on_feature(name)
15
+ yield if block_given? && feature?(name)
16
+ end
17
+
18
+ def feature?(name)
19
+ if @features.nil?
20
+ superclass.feature?(name) if superclass.respond_to?(:feature?)
21
+ elsif @features.include?(name)
22
+ true
23
+ end
24
+ end
25
+
26
+ def method_with_body?(method)
27
+ METHODS_WITH_BODY.include?(method.to_s)
28
+ end
29
+ end
30
+
31
+ def ssl_mode?
32
+ ENV['SSL'] == 'yes'
33
+ end
34
+
35
+ def normalize(url)
36
+ Faraday::Utils::URI(url)
37
+ end
38
+
39
+ def with_default_uri_parser(parser)
40
+ old_parser = Faraday::Utils.default_uri_parser
41
+ begin
42
+ Faraday::Utils.default_uri_parser = parser
43
+ yield
44
+ ensure
45
+ Faraday::Utils.default_uri_parser = old_parser
46
+ end
47
+ end
48
+
49
+ def with_env(new_env)
50
+ old_env = {}
51
+
52
+ new_env.each do |key, value|
53
+ old_env[key] = ENV.fetch(key, false)
54
+ ENV[key] = value
55
+ end
56
+
57
+ begin
58
+ yield
59
+ ensure
60
+ old_env.each do |key, value|
61
+ value == false ? ENV.delete(key) : ENV[key] = value
62
+ end
63
+ end
64
+ end
65
+
66
+ def with_env_proxy_disabled
67
+ Faraday.ignore_env_proxy = true
68
+
69
+ begin
70
+ yield
71
+ ensure
72
+ Faraday.ignore_env_proxy = false
73
+ end
74
+ end
75
+
76
+ def capture_warnings
77
+ old = $stderr
78
+ $stderr = StringIO.new
79
+ begin
80
+ yield
81
+ $stderr.string
82
+ ensure
83
+ $stderr = old
84
+ end
85
+ end
86
+
87
+ def method_with_body?(method)
88
+ self.class.method_with_body?(method)
89
+ end
90
+
91
+ def big_string
92
+ kb = 1024
93
+ (32..126).map(&:chr).cycle.take(50 * kb).join
94
+ end
95
+ end
96
+ end
@@ -0,0 +1,104 @@
1
+ # frozen_string_literal: true
2
+
3
+ shared_examples 'an adapter' do |**options|
4
+ before { skip } if options[:skip]
5
+
6
+ context 'with SSL enabled' do
7
+ before { ENV['SSL'] = 'yes' }
8
+ include_examples 'adapter examples', options
9
+ end
10
+
11
+ context 'with SSL disabled' do
12
+ before { ENV['SSL'] = 'no' }
13
+ include_examples 'adapter examples', options
14
+ end
15
+ end
16
+
17
+ shared_examples 'adapter examples' do |**options|
18
+ include Faraday::StreamingResponseChecker
19
+
20
+ let(:adapter) { described_class.name.split('::').last }
21
+
22
+ let(:conn_options) { { headers: { 'X-Faraday-Adapter' => adapter } }.merge(options[:conn_options] || {}) }
23
+
24
+ let(:adapter_options) do
25
+ return [] unless options[:adapter_options]
26
+
27
+ if options[:adapter_options].is_a?(Array)
28
+ options[:adapter_options]
29
+ else
30
+ [options[:adapter_options]]
31
+ end
32
+ end
33
+
34
+ let(:protocol) { ssl_mode? ? 'https' : 'http' }
35
+ let(:remote) { "#{protocol}://example.com" }
36
+ let(:stub_remote) { remote }
37
+
38
+ let(:conn) do
39
+ conn_options[:ssl] ||= {}
40
+ conn_options[:ssl][:ca_file] ||= ENV['SSL_FILE']
41
+
42
+ Faraday.new(remote, conn_options) do |conn|
43
+ conn.request :url_encoded
44
+ conn.response :raise_error
45
+ conn.adapter described_class, *adapter_options
46
+ end
47
+ end
48
+
49
+ let!(:request_stub) { stub_request(http_method, stub_remote) }
50
+
51
+ after do
52
+ expect(request_stub).to have_been_requested unless request_stub.disabled?
53
+ end
54
+
55
+ describe '#delete' do
56
+ let(:http_method) { :delete }
57
+
58
+ it_behaves_like 'a request method', :delete
59
+ end
60
+
61
+ describe '#get' do
62
+ let(:http_method) { :get }
63
+
64
+ it_behaves_like 'a request method', :get
65
+ end
66
+
67
+ describe '#head' do
68
+ let(:http_method) { :head }
69
+
70
+ it_behaves_like 'a request method', :head
71
+ end
72
+
73
+ describe '#options' do
74
+ let(:http_method) { :options }
75
+
76
+ it_behaves_like 'a request method', :options
77
+ end
78
+
79
+ describe '#patch' do
80
+ let(:http_method) { :patch }
81
+
82
+ it_behaves_like 'a request method', :patch
83
+ end
84
+
85
+ describe '#post' do
86
+ let(:http_method) { :post }
87
+
88
+ it_behaves_like 'a request method', :post
89
+ end
90
+
91
+ describe '#put' do
92
+ let(:http_method) { :put }
93
+
94
+ it_behaves_like 'a request method', :put
95
+ end
96
+
97
+ on_feature :trace_method do
98
+ describe '#trace' do
99
+ let(:http_method) { :trace }
100
+
101
+ it_behaves_like 'a request method', :trace
102
+ end
103
+ end
104
+ end
@@ -0,0 +1,18 @@
1
+ # frozen_string_literal: true
2
+
3
+ shared_examples 'a params encoder' do
4
+ it 'escapes safe buffer' do
5
+ monies = FakeSafeBuffer.new('$32,000.00')
6
+ expect(subject.encode('a' => monies)).to eq('a=%2432%2C000.00')
7
+ end
8
+
9
+ it 'raises type error for empty string' do
10
+ expect { subject.encode('') }.to raise_error(TypeError) do |error|
11
+ expect(error.message).to eq("Can't convert String into Hash.")
12
+ end
13
+ end
14
+
15
+ it 'encodes nil' do
16
+ expect(subject.encode('a' => nil)).to eq('a')
17
+ end
18
+ end
@@ -0,0 +1,249 @@
1
+ # frozen_string_literal: true
2
+
3
+ shared_examples 'proxy examples' do
4
+ it 'handles requests with proxy' do
5
+ res = conn.public_send(http_method, '/')
6
+
7
+ expect(res.status).to eq(200)
8
+ end
9
+
10
+ it 'handles proxy failures' do
11
+ request_stub.to_return(status: 407)
12
+
13
+ expect { conn.public_send(http_method, '/') }.to raise_error(Faraday::ProxyAuthError)
14
+ end
15
+ end
16
+
17
+ shared_examples 'a request method' do |http_method|
18
+ let(:query_or_body) { method_with_body?(http_method) ? :body : :query }
19
+ let(:response) { conn.public_send(http_method, '/') }
20
+
21
+ unless http_method == :head && feature?(:skip_response_body_on_head)
22
+ it 'retrieves the response body' do
23
+ res_body = 'test'
24
+ request_stub.to_return(body: res_body)
25
+ expect(conn.public_send(http_method, '/').body).to eq(res_body)
26
+ end
27
+ end
28
+
29
+ it 'handles headers with multiple values' do
30
+ request_stub.to_return(headers: { 'Set-Cookie' => 'name=value' })
31
+ expect(response.headers['set-cookie']).to eq('name=value')
32
+ end
33
+
34
+ it 'retrieves the response headers' do
35
+ request_stub.to_return(headers: { 'Content-Type' => 'text/plain' })
36
+ expect(response.headers['Content-Type']).to match(%r{text/plain})
37
+ expect(response.headers['content-type']).to match(%r{text/plain})
38
+ end
39
+
40
+ it 'sends user agent' do
41
+ request_stub.with(headers: { 'User-Agent' => 'Agent Faraday' })
42
+ conn.public_send(http_method, '/', nil, user_agent: 'Agent Faraday')
43
+ end
44
+
45
+ it 'represents empty body response as blank string' do
46
+ expect(response.body).to eq('')
47
+ end
48
+
49
+ it 'handles connection error' do
50
+ request_stub.disable
51
+ expect { conn.public_send(http_method, 'http://localhost:4') }.to raise_error(Faraday::ConnectionFailed)
52
+ end
53
+
54
+ on_feature :local_socket_binding do
55
+ it 'binds local socket' do
56
+ stub_request(http_method, 'http://example.com')
57
+
58
+ host = '1.2.3.4'
59
+ port = 1234
60
+ conn_options[:request] = { bind: { host: host, port: port } }
61
+
62
+ conn.public_send(http_method, '/')
63
+
64
+ expect(conn.options[:bind][:host]).to eq(host)
65
+ expect(conn.options[:bind][:port]).to eq(port)
66
+ end
67
+ end
68
+
69
+ # context 'when wrong ssl certificate is provided' do
70
+ # let(:ca_file_path) { 'tmp/faraday-different-ca-cert.crt' }
71
+ # before { conn_options.merge!(ssl: { ca_file: ca_file_path }) }
72
+ #
73
+ # it do
74
+ # expect { conn.public_send(http_method, '/') }.to raise_error(Faraday::SSLError) # do |ex|
75
+ # expect(ex.message).to include?('certificate')
76
+ # end
77
+ # end
78
+ # end
79
+
80
+ on_feature :request_body_on_query_methods do
81
+ it 'sends request body' do
82
+ request_stub.with({ body: 'test' })
83
+ res = if query_or_body == :body
84
+ conn.public_send(http_method, '/', 'test')
85
+ else
86
+ conn.public_send(http_method, '/') do |req|
87
+ req.body = 'test'
88
+ end
89
+ end
90
+ expect(res.env.request_body).to eq('test')
91
+ end
92
+ end
93
+
94
+ it 'sends url encoded parameters' do
95
+ payload = { name: 'zack' }
96
+ request_stub.with({ query_or_body => payload })
97
+ res = conn.public_send(http_method, '/', payload)
98
+ if query_or_body == :query
99
+ expect(res.env.request_body).to be_nil
100
+ else
101
+ expect(res.env.request_body).to eq('name=zack')
102
+ end
103
+ end
104
+
105
+ it 'sends url encoded nested parameters' do
106
+ payload = { name: { first: 'zack' } }
107
+ request_stub.with({ query_or_body => payload })
108
+ conn.public_send(http_method, '/', payload)
109
+ end
110
+
111
+ # TODO: This needs reimplementation: see https://github.com/lostisland/faraday/issues/718
112
+ # Should raise Faraday::TimeoutError
113
+ it 'supports timeout option' do
114
+ conn_options[:request] = { timeout: 1 }
115
+ request_stub.to_timeout
116
+ exc = adapter == 'NetHttp' ? Faraday::ConnectionFailed : Faraday::TimeoutError
117
+ expect { conn.public_send(http_method, '/') }.to raise_error(exc)
118
+ end
119
+
120
+ # TODO: This needs reimplementation: see https://github.com/lostisland/faraday/issues/718
121
+ # Should raise Faraday::ConnectionFailed
122
+ it 'supports open_timeout option' do
123
+ conn_options[:request] = { open_timeout: 1 }
124
+ request_stub.to_timeout
125
+ exc = adapter == 'NetHttp' ? Faraday::ConnectionFailed : Faraday::TimeoutError
126
+ expect { conn.public_send(http_method, '/') }.to raise_error(exc)
127
+ end
128
+
129
+ on_feature :reason_phrase_parse do
130
+ it 'parses the reason phrase' do
131
+ request_stub.to_return(status: [200, 'OK'])
132
+ expect(response.reason_phrase).to eq('OK')
133
+ end
134
+ end
135
+
136
+ on_feature :compression do
137
+ # Accept-Encoding header not sent for HEAD requests as body is not expected in the response.
138
+ unless http_method == :head
139
+ it 'handles gzip compression' do
140
+ request_stub.with(headers: { 'Accept-Encoding' => /\bgzip\b/ })
141
+ conn.public_send(http_method, '/')
142
+ end
143
+
144
+ it 'handles deflate compression' do
145
+ request_stub.with(headers: { 'Accept-Encoding' => /\bdeflate\b/ })
146
+ conn.public_send(http_method, '/')
147
+ end
148
+ end
149
+ end
150
+
151
+ on_feature :streaming do
152
+ describe 'streaming' do
153
+ let(:streamed) { [] }
154
+
155
+ context 'when response is empty' do
156
+ it do
157
+ conn.public_send(http_method, '/') do |req|
158
+ req.options.on_data = proc { |*args| streamed << args }
159
+ end
160
+
161
+ expect(streamed).to eq([['', 0]])
162
+ end
163
+ end
164
+
165
+ context 'when response contains big data' do
166
+ before { request_stub.to_return(body: big_string) }
167
+
168
+ it 'handles streaming' do
169
+ response = conn.public_send(http_method, '/') do |req|
170
+ req.options.on_data = proc { |*args| streamed << args }
171
+ end
172
+
173
+ expect(response.body).to eq('')
174
+ check_streaming_response(streamed, chunk_size: 16 * 1024)
175
+ end
176
+ end
177
+ end
178
+ end
179
+
180
+ on_feature :parallel do
181
+ context 'with parallel setup' do
182
+ before do
183
+ @resp1 = nil
184
+ @resp2 = nil
185
+ @payload1 = { a: '1' }
186
+ @payload2 = { b: '2' }
187
+
188
+ request_stub
189
+ .with({ query_or_body => @payload1 })
190
+ .to_return(body: @payload1.to_json)
191
+
192
+ stub_request(http_method, remote)
193
+ .with({ query_or_body => @payload2 })
194
+ .to_return(body: @payload2.to_json)
195
+
196
+ conn.in_parallel do
197
+ @resp1 = conn.public_send(http_method, '/', @payload1)
198
+ @resp2 = conn.public_send(http_method, '/', @payload2)
199
+
200
+ expect(conn.in_parallel?).to be_truthy
201
+ expect(@resp1.body).to be_nil
202
+ expect(@resp2.body).to be_nil
203
+ end
204
+
205
+ expect(conn.in_parallel?).to be_falsey
206
+ end
207
+
208
+ it 'handles parallel requests status' do
209
+ expect(@resp1&.status).to eq(200)
210
+ expect(@resp2&.status).to eq(200)
211
+ end
212
+
213
+ unless http_method == :head && feature?(:skip_response_body_on_head)
214
+ it 'handles parallel requests body' do
215
+ expect(@resp1&.body).to eq(@payload1.to_json)
216
+ expect(@resp2&.body).to eq(@payload2.to_json)
217
+ end
218
+ end
219
+ end
220
+ end
221
+
222
+ context 'when a proxy is provided as option' do
223
+ before do
224
+ conn_options[:proxy] = 'http://env-proxy.com:80'
225
+ end
226
+
227
+ include_examples 'proxy examples'
228
+ end
229
+
230
+ context 'when http_proxy env variable is set' do
231
+ let(:proxy_url) { 'http://env-proxy.com:80' }
232
+
233
+ around do |example|
234
+ with_env 'http_proxy' => proxy_url do
235
+ example.run
236
+ end
237
+ end
238
+
239
+ include_examples 'proxy examples'
240
+
241
+ context 'when the env proxy is ignored' do
242
+ around do |example|
243
+ with_env_proxy_disabled(&example)
244
+ end
245
+
246
+ include_examples 'proxy examples'
247
+ end
248
+ end
249
+ end
@@ -0,0 +1,35 @@
1
+ # frozen_string_literal: true
2
+
3
+ module Faraday
4
+ module StreamingResponseChecker
5
+ def check_streaming_response(streamed, options = {})
6
+ opts = {
7
+ prefix: '',
8
+ streaming?: true
9
+ }.merge(options)
10
+
11
+ expected_response = opts[:prefix] + big_string
12
+
13
+ chunks, sizes = streamed.transpose
14
+
15
+ # Check that the total size of the chunks (via the last size returned)
16
+ # is the same size as the expected_response
17
+ expect(sizes.last).to eq(expected_response.bytesize)
18
+
19
+ start_index = 0
20
+ expected_chunks = []
21
+ chunks.each do |actual_chunk|
22
+ expected_chunk = expected_response[start_index..((start_index + actual_chunk.bytesize) - 1)]
23
+ expected_chunks << expected_chunk
24
+ start_index += expected_chunk.bytesize
25
+ end
26
+
27
+ # it's easier to read a smaller portion, so we check that first
28
+ expect(expected_chunks[0][0..255]).to eq(chunks[0][0..255])
29
+
30
+ [expected_chunks, chunks].transpose.each do |expected, actual|
31
+ expect(actual).to eq(expected)
32
+ end
33
+ end
34
+ end
35
+ end