Merge pull request #132 from acidlabs/fix-circular-require

Fix a few warnings, among which a circular require

lib/httpi.rb

@@ -109,7 +109,7 @@ def query_builder=(builder)
         builder_name = builder.to_s.capitalize
         begin
           builder = HTTPI::QueryBuilder.const_get(builder_name)
-        rescue NameError => ex
+        rescue NameError
           raise ArgumentError, "Invalid builder. Available builders are: [:flat, :nested]"
         end
       end

lib/httpi/adapter/base.rb

@@ -1,4 +1,3 @@
-require "httpi"
 require "httpi/adapter"
 
 module HTTPI

lib/httpi/adapter/curb.rb

@@ -118,7 +118,7 @@ def setup_ssl_auth
       end
 
       def respond_with(client)
-        status, headers = parse_header_string(client.header_str)
+        headers = parse_header_string(client.header_str).last
         Response.new client.response_code, headers, client.body_str
       end
 

lib/httpi/adapter/net_http.rb

@@ -170,7 +170,7 @@ def request_client(type)
         end
 
         request_client = request_class.new @request.url.request_uri, @request.headers
-        request_client.basic_auth *@request.auth.credentials if @request.auth.basic?
+        request_client.basic_auth(*@request.auth.credentials) if @request.auth.basic?
 
         if @request.auth.digest?
           raise NotSupportedError, "Net::HTTP does not support HTTP digest authentication"

lib/httpi/request.rb

@@ -82,9 +82,9 @@ def gzip
     # or an Array of `HTTPI::Cookie` objects.
     def set_cookies(object_or_array)
       if object_or_array.respond_to?(:cookies)
-        cookie_store.add *object_or_array.cookies
+        cookie_store.add(*object_or_array.cookies)
       else
-        cookie_store.add *object_or_array
+        cookie_store.add(*object_or_array)
       end
 
       cookies = cookie_store.fetch

lib/httpi/response.rb

@@ -24,7 +24,8 @@ def initialize(code, headers, body)
       self.raw_body = body
     end
 
-    attr_accessor :code, :headers, :raw_body, :attachments
+    attr_accessor :code, :headers, :raw_body
+    attr_writer :attachments
 
     # Returns whether the HTTP response is considered successful.
     def error?