0
@@ -80,11 +80,11 @@ module HTTParty
0
     end
0
 
0
     private
0
-      def perform_request(http_method, path, options)
0
+      def perform_request(http_method, path, options) #:nodoc:
0
         Request.new(http_method, path, default_options.merge(options)).perform
0
       end
0
     
0
-      # Makes it so uri is sure to parse stuff like google.com with the http
0
+      # Makes it so uri is sure to parse stuff like google.com without the http
0
       def normalize_base_uri(url) #:nodoc:
0
         use_ssl = (url =~ /^https/) || url.include?(':443')
0
         url.chop! if url.ends_with?('/')

0
@@ -37,16 +37,17 @@ describe HTTParty::Request do
0
     http.stub!(:request).and_return(response)
0
 
0
     @request.options[:format] = :xml
0
-    @request.send_request.should be_nil
0
+    @request.perform.should be_nil
0
 
0
     response.stub!(:body).and_return("")
0
-    @request.send_request.should be_nil
0
+    @request.perform.should be_nil
0
   end
0
 
0
   describe "that respond with redirects" do
0
     def setup_redirect
0
       @http = Net::HTTP.new('localhost', 80)
0
       @request.stub!(:http).and_return(@http)
0
+      @request.stub!(:uri).and_return(URI.parse("http://foo.com/foobar"))
0
       @redirect = Net::HTTPFound.new("1.1", 302, "")
0
       @redirect['location'] = '/foo'
0
     end
0
@@ -74,32 +75,32 @@ describe HTTParty::Request do
0
 
0
     it "should handle redirects for GET transparently" do
0
       setup_successful_redirect
0
-      @request.send_request.should == {"hash" => {"foo" => "bar"}}
0
+      @request.perform.should == {"hash" => {"foo" => "bar"}}
0
     end
0
 
0
     it "should handle redirects for POST transparently" do
0
       setup_successful_redirect
0
       @request.http_method = Net::HTTP::Post
0
-      @request.send_request.should == {"hash" => {"foo" => "bar"}}
0
+      @request.perform.should == {"hash" => {"foo" => "bar"}}
0
     end
0
 
0
     it "should handle redirects for DELETE transparently" do
0
       setup_successful_redirect
0
       @request.http_method = Net::HTTP::Delete
0
-      @request.send_request.should == {"hash" => {"foo" => "bar"}}
0
+      @request.perform.should == {"hash" => {"foo" => "bar"}}
0
     end
0
 
0
     it "should handle redirects for PUT transparently" do
0
       setup_successful_redirect
0
       @request.http_method = Net::HTTP::Put
0
-      @request.send_request.should == {"hash" => {"foo" => "bar"}}
0
+      @request.perform.should == {"hash" => {"foo" => "bar"}}
0
     end
0
 
0
     it "should prevent infinite loops" do
0
       setup_infinite_redirect
0
 
0
       lambda do
0
-        @request.send_request
0
+        @request.perform
0
       end.should raise_error(HTTParty::RedirectionTooDeep)
0
     end
0
   end

0
@@ -90,26 +90,6 @@ describe HTTParty do
0
       end.should raise_error(HTTParty::UnsupportedFormat)
0
     end
0
   end
0
-  
0
-  describe "sending requests" do
0
-    it "should not work with request method other than get, post, put, delete" do
0
-      lambda do
0
-        Foo.send(:send_request, 'foo', '/foo')
0
-      end.should raise_error(ArgumentError)
0
-    end
0
-    
0
-    it 'should require that :headers is a hash if present' do
0
-      lambda do
0
-        Foo.send(:send_request, 'get', '/foo', :headers => 'string')
0
-      end.should raise_error(ArgumentError)
0
-    end
0
-    
0
-    it 'should require that :basic_auth is a hash if present' do
0
-      lambda do
0
-        Foo.get('/foo', :basic_auth => 'string')
0
-      end.should raise_error(ArgumentError)
0
-    end
0
-  end
0
 
0
   describe "with explicit override of automatic redirect handling" do
0