Cleanup

lib/httparty/request.rb

@@ -66,7 +66,8 @@ module HTTParty
     def perform
       validate
       setup_raw_request
-      get_response
+      self.last_response = http.request(@raw_request)
+      handle_deflation
       handle_response
     end
 
@@ -158,14 +159,6 @@ module HTTParty
       end
     end
 
-    def perform_actual_request
-      http.request(@raw_request)
-    end
-
-    def get_response
-      self.last_response = perform_actual_request
-    end
-
     def query_string(uri)
       query_string_parts = []
       query_string_parts << uri.query unless uri.query.nil?
@@ -183,7 +176,6 @@ module HTTParty
 
     # Raises exception Net::XXX (http error code) if an http error occured
     def handle_response
-      handle_deflation
       case last_response
       when Net::HTTPMultipleChoice, # 300
         Net::HTTPMovedPermanently, # 301

spec/support/stub_response.rb

@@ -8,7 +8,7 @@ module HTTParty
       response.stub!(:body).and_return(data)
 
       http_request = HTTParty::Request.new(Net::HTTP::Get, 'http://localhost', :format => format)
-      http_request.stub!(:perform_actual_request).and_return(response)
+      http_request.stub_chain(:http, :request).and_return(response)
 
       HTTParty::Request.should_receive(:new).and_return(http_request)
     end