sevenwire-rest-client 0.9.3 → 0.9.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.
- data/VERSION.yml +1 -1
- data/lib/restclient/request.rb +3 -23
- data/spec/request_spec.rb +12 -23
- metadata +1 -1
data/VERSION.yml
CHANGED
data/lib/restclient/request.rb
CHANGED
@@ -164,29 +164,9 @@ module RestClient
|
|
164
164
|
end
|
165
165
|
|
166
166
|
def process_result(res)
|
167
|
-
|
168
|
-
|
169
|
-
|
170
|
-
decode res['content-encoding'], res.body if res.body
|
171
|
-
end
|
172
|
-
elsif %w(301 302 303).include? res.code
|
173
|
-
url = res.header['Location']
|
174
|
-
|
175
|
-
if url !~ /^http/
|
176
|
-
uri = URI.parse(@url)
|
177
|
-
uri.path = "/#{url}".squeeze('/')
|
178
|
-
url = uri.to_s
|
179
|
-
end
|
180
|
-
|
181
|
-
"Redirected to: #{url}"
|
182
|
-
elsif res.code == "304"
|
183
|
-
"Not Modified"
|
184
|
-
elsif res.code == "401"
|
185
|
-
"Unauthorized"
|
186
|
-
elsif res.code == "404"
|
187
|
-
"Not Found"
|
188
|
-
else
|
189
|
-
"Failed"
|
167
|
+
# We don't decode raw requests
|
168
|
+
unless @raw_response
|
169
|
+
decode res['content-encoding'], res.body if res.body
|
190
170
|
end
|
191
171
|
end
|
192
172
|
|
data/spec/request_spec.rb
CHANGED
@@ -206,35 +206,24 @@ describe RestClient::Request do
|
|
206
206
|
RestClient::Request.execute(1 => 2)
|
207
207
|
end
|
208
208
|
|
209
|
-
it "
|
210
|
-
res = mock('response', :code => '301', :
|
211
|
-
@request.process_result(res).should ==
|
209
|
+
it "handles a 301" do
|
210
|
+
res = mock('response', :code => '301', :body => 'body', :[] => nil)
|
211
|
+
@request.process_result(res).should == res.body
|
212
212
|
end
|
213
213
|
|
214
|
-
it "
|
215
|
-
res = mock('response', :code => '
|
216
|
-
@request.process_result(res).should ==
|
214
|
+
it "handle a 401" do
|
215
|
+
res = mock('response', :code => '401', :body => 'body', :[] => nil)
|
216
|
+
@request.process_result(res).should == res.body
|
217
217
|
end
|
218
218
|
|
219
|
-
it "
|
220
|
-
|
221
|
-
res
|
222
|
-
@request.process_result(res).should == 'Redirected to: http://some/index'
|
219
|
+
it "handle a 404" do
|
220
|
+
res = mock('response', :code => '404', :body => 'body', :[] => nil)
|
221
|
+
@request.process_result(res).should == res.body
|
223
222
|
end
|
224
223
|
|
225
|
-
it "
|
226
|
-
res = mock('response', :code => '
|
227
|
-
@request.process_result(res).should ==
|
228
|
-
end
|
229
|
-
|
230
|
-
it "raises ResourceNotFound when the response is 404" do
|
231
|
-
res = mock('response', :code => '404')
|
232
|
-
@request.process_result(res).should == 'Not Found'
|
233
|
-
end
|
234
|
-
|
235
|
-
it "raises RequestFailed otherwise" do
|
236
|
-
res = mock('response', :code => '500')
|
237
|
-
@request.process_result(res).should == "Failed"
|
224
|
+
it "handle a 500" do
|
225
|
+
res = mock('response', :code => '500', :body => 'body', :[] => nil)
|
226
|
+
@request.process_result(res).should == res.body
|
238
227
|
end
|
239
228
|
|
240
229
|
it "creates a proxy class if a proxy url is given" do
|