lib/httpi.rb in httpi-0.4.1 vs lib/httpi.rb in httpi-0.5.0

@@ -73,51 +73,51 @@
 
     # Executes an HTTP GET request.
     def get(request, adapter = nil)
       request = Request.new :url => request if request.kind_of? String
       
-      with adapter do |adapter|
+      with request, adapter do |adapter|
         yield adapter.client if block_given?
         adapter.get request
       end
     end
 
     # Executes an HTTP POST request.
     def post(*args)
       request, adapter = request_and_adapter_from(args)
       
-      with adapter do |adapter|
+      with request, adapter do |adapter|
         yield adapter.client if block_given?
         adapter.post request
       end
     end
 
     # Executes an HTTP HEAD request.
     def head(request, adapter = nil)
       request = Request.new :url => request if request.kind_of? String
       
-      with adapter do |adapter|
+      with request, adapter do |adapter|
         yield adapter.client if block_given?
         adapter.head request
       end
     end
 
     # Executes an HTTP PUT request.
     def put(*args)
       request, adapter = request_and_adapter_from(args)
       
-      with adapter do |adapter|
+      with request, adapter do |adapter|
         yield adapter.client if block_given?
         adapter.put request
       end
     end
 
     # Executes an HTTP DELETE request.
     def delete(request, adapter = nil)
       request = Request.new :url => request if request.kind_of? String
       
-      with adapter do |adapter|
+      with request, adapter do |adapter|
         yield adapter.client if block_given?
         adapter.delete request
       end
     end
 
@@ -129,14 +129,14 @@
     def request_and_adapter_from(args)
       return args if args[0].kind_of? Request
       [Request.new(:url => args[0], :body => args[1]), args[2]]
     end
 
-    # Accepts an +adapter+ (defaults to <tt>Adapter.use</tt>) and yields a
-    # new instance of the adapter to a given block.
-    def with(adapter)
+    # Expects a +request+ and an +adapter+ (defaults to <tt>Adapter.use</tt>)
+    # and yields a new instance of the adapter to a given block.
+    def with(request, adapter)
       adapter ||= Adapter.use
-      yield Adapter.find(adapter).new
+      yield Adapter.find(adapter).new(request)
     end
 
   end
 end