@@ -80,11 +80,11 @@ module HTTParty end private - def perform_request(http_method, path, options) + def perform_request(http_method, path, options) #:nodoc: Request.new(http_method, path, default_options.merge(options)).perform end - # Makes it so uri is sure to parse stuff like google.com with the http + # Makes it so uri is sure to parse stuff like google.com without the http def normalize_base_uri(url) #:nodoc: use_ssl = (url =~ /^https/) || url.include?(':443') url.chop! if url.ends_with?('/') lib/httparty.rb @@ -37,16 +37,17 @@ describe HTTParty::Request do http.stub!(:request).and_return(response) @request.options[:format] = :xml - @request.send_request.should be_nil + @request.perform.should be_nil response.stub!(:body).and_return("") - @request.send_request.should be_nil + @request.perform.should be_nil end describe "that respond with redirects" do def setup_redirect @http = Net::HTTP.new('localhost', 80) @request.stub!(:http).and_return(@http) + @request.stub!(:uri).and_return(URI.parse("http://foo.com/foobar")) @redirect = Net::HTTPFound.new("1.1", 302, "") @redirect['location'] = '/foo' end @@ -74,32 +75,32 @@ describe HTTParty::Request do it "should handle redirects for GET transparently" do setup_successful_redirect - @request.send_request.should == {"hash" => {"foo" => "bar"}} + @request.perform.should == {"hash" => {"foo" => "bar"}} end it "should handle redirects for POST transparently" do setup_successful_redirect @request.http_method = Net::HTTP::Post - @request.send_request.should == {"hash" => {"foo" => "bar"}} + @request.perform.should == {"hash" => {"foo" => "bar"}} end it "should handle redirects for DELETE transparently" do setup_successful_redirect @request.http_method = Net::HTTP::Delete - @request.send_request.should == {"hash" => {"foo" => "bar"}} + @request.perform.should == {"hash" => {"foo" => "bar"}} end it "should handle redirects for PUT transparently" do setup_successful_redirect @request.http_method = Net::HTTP::Put - @request.send_request.should == {"hash" => {"foo" => "bar"}} + @request.perform.should == {"hash" => {"foo" => "bar"}} end it "should prevent infinite loops" do setup_infinite_redirect lambda do - @request.send_request + @request.perform end.should raise_error(HTTParty::RedirectionTooDeep) end end spec/httparty/request_spec.rb @@ -90,26 +90,6 @@ describe HTTParty do end.should raise_error(HTTParty::UnsupportedFormat) end end - - describe "sending requests" do - it "should not work with request method other than get, post, put, delete" do - lambda do - Foo.send(:send_request, 'foo', '/foo') - end.should raise_error(ArgumentError) - end - - it 'should require that :headers is a hash if present' do - lambda do - Foo.send(:send_request, 'get', '/foo', :headers => 'string') - end.should raise_error(ArgumentError) - end - - it 'should require that :basic_auth is a hash if present' do - lambda do - Foo.get('/foo', :basic_auth => 'string') - end.should raise_error(ArgumentError) - end - end describe "with explicit override of automatic redirect handling" do spec/httparty_spec.rb e0cb4311d9a80bb3a44ac47e7355d2e24dc7307f John Nunemaker nunemaker@gmail.com http://github.com/jnunemaker/httparty/commit/9931e2a20dd579289407e28d1631ef319a5d3ad7 9931e2a20dd579289407e28d1631ef319a5d3ad7 2008-11-11T20:27:58-08:00 2008-11-11T20:27:58-08:00 Fixed failing specs. 22331d2d53930970dc63cd9121a3e9dceb60dff9 John Nunemaker nunemaker@gmail.com