adamwiggins-rest-client 1.0.2 → 1.0.3

data/README.rdoc

@@ -141,7 +141,7 @@ Patches contributed by: Chris Anderson, Greg Borenstein, Ardekantur, Pedro
 Belo, Rafael Souza, Rick Olson, Aman Gupta, Blake Mizerany, Brian Donovan, Ivan
 Makfinsky, Marc-André Cournoyer, Coda Hale, Tetsuo Watanabe, Dusty Doris,
 Lennon Day-Reynolds, James Edward Gray II, Cyril Rohr, Juan Alvarez, and Adam
-Jacob, and Paul Dlug
+Jacob, Paul Dlug, and Brad Ediger
 
 Released under the MIT License: http://www.opensource.org/licenses/mit-license.php
 

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.0.3

data/lib/restclient.rb

@@ -1,8 +1,14 @@
 require 'uri'
-require 'net/https'
 require 'zlib'
 require 'stringio'
 
+begin
+	require 'net/https'
+rescue LoadError => e
+	raise e unless RUBY_PLATFORM =~ /linux/
+	raise LoadError, "no such file to load -- net/https. Try running apt-get install libopenssl-ruby"
+end
+
 require File.dirname(__FILE__) + '/restclient/request'
 require File.dirname(__FILE__) + '/restclient/mixin/response'
 require File.dirname(__FILE__) + '/restclient/response'

data/lib/restclient/exceptions.rb

@@ -18,6 +18,10 @@ module RestClient
 		def http_code
 			@response.code.to_i if @response
 		end
+
+		def http_body
+			RestClient::Request.decode(@response['content-encoding'], @response.body) if @response
+		end
 	end
 
 	# A redirect was encountered; caught by execute to retry with the new url.

data/lib/restclient/request.rb

@@ -39,6 +39,8 @@ module RestClient
 			execute_inner
 		rescue Redirect => e
 			@url = e.url
+			@method = :get
+			@payload = nil
 			execute
 		end
 
@@ -171,7 +173,7 @@ module RestClient
 			if res.code =~ /\A2\d{2}\z/ 
 				# We don't decode raw requests
 				unless @raw_response
-					decode res['content-encoding'], res.body if res.body
+					self.class.decode res['content-encoding'], res.body if res.body
 				end
 			elsif %w(301 302 303).include? res.code
 				url = res.header['Location']
@@ -194,7 +196,7 @@ module RestClient
 			end
 		end
 
-		def decode(content_encoding, body)
+		def self.decode(content_encoding, body)
 			if content_encoding == 'gzip' and not body.empty?
 				Zlib::GzipReader.new(StringIO.new(body)).read
 			elsif content_encoding == 'deflate'

data/spec/exceptions_spec.rb

@@ -12,6 +12,10 @@ describe RestClient::Exception do
 end
 
 describe RestClient::RequestFailed do
+	before do
+		@response = mock('HTTP Response', :code => '502')
+	end
+
 	it "stores the http response on the exception" do
 		begin
 			raise RestClient::RequestFailed, :response
@@ -21,11 +25,18 @@ describe RestClient::RequestFailed do
 	end
 
 	it "http_code convenience method for fetching the code as an integer" do
-		RestClient::RequestFailed.new(mock('res', :code => '502')).http_code.should == 502
+		RestClient::RequestFailed.new(@response).http_code.should == 502
+	end
+
+	it "http_body convenience method for fetching the body (decoding when necessary)" do
+		@response.stub!(:[]).with('content-encoding').and_return('gzip')
+		@response.stub!(:body).and_return('compressed body')
+		RestClient::Request.should_receive(:decode).with('gzip', 'compressed body').and_return('plain body')
+		RestClient::RequestFailed.new(@response).http_body.should == 'plain body'
 	end
 
 	it "shows the status code in the message" do
-		RestClient::RequestFailed.new(mock('res', :code => '502')).to_s.should match(/502/)
+		RestClient::RequestFailed.new(@response).to_s.should match(/502/)
 	end
 end
 

data/spec/request_spec.rb

@@ -22,19 +22,19 @@ describe RestClient::Request do
 	end
 
 	it "decodes an uncompressed result body by passing it straight through" do
-		@request.decode(nil, 'xyz').should == 'xyz'
+		RestClient::Request.decode(nil, 'xyz').should == 'xyz'
 	end
 
 	it "decodes a gzip body" do
-		@request.decode('gzip', "\037\213\b\b\006'\252H\000\003t\000\313T\317UH\257\312,HM\341\002\000G\242(\r\v\000\000\000").should == "i'm gziped\n"
+		RestClient::Request.decode('gzip', "\037\213\b\b\006'\252H\000\003t\000\313T\317UH\257\312,HM\341\002\000G\242(\r\v\000\000\000").should == "i'm gziped\n"
 	end
 
 	it "ingores gzip for empty bodies" do
-		@request.decode('gzip', '').should be_empty
+		RestClient::Request.decode('gzip', '').should be_empty
 	end
 
 	it "decodes a deflated body" do
-		@request.decode('deflate', "x\234+\316\317MUHIM\313I,IMQ(I\255(\001\000A\223\006\363").should == "some deflated text"
+		RestClient::Request.decode('deflate', "x\234+\316\317MUHIM\313I,IMQ(I\255(\001\000A\223\006\363").should == "some deflated text"
 	end
 
 	it "processes a successful result" do
@@ -222,6 +222,20 @@ describe RestClient::Request do
 		lambda { @request.process_result(res) }.should raise_error(RestClient::Redirect) { |e| e.url.should == 'http://some/index' }
 	end
 
+	it "uses GET and clears payload when following 30x redirects" do
+		url = "http://example.com/redirected"
+
+		@request.should_receive(:execute_inner).once.ordered.and_raise(RestClient::Redirect.new(url))
+
+		@request.should_receive(:execute_inner).once.ordered do
+			@request.url.should == url
+			@request.method.should == :get
+			@request.payload.should be_nil
+		end
+
+		@request.execute
+	end
+
 	it "raises Unauthorized when the response is 401" do
 		res = mock('response', :code => '401')
 		lambda { @request.process_result(res) }.should raise_error(RestClient::Unauthorized)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: adamwiggins-rest-client
 version: !ruby/object:Gem::Version 
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors: 
 - Adam Wiggins
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-20 00:00:00 -07:00
+date: 2009-06-29 00:00:00 -07:00
 default_executable: restclient
 dependencies: []