From d89952cebc79660f57c94c9dda53d6eb05db5357 Mon Sep 17 00:00:00 2001
From: Ezekiel Templin <zeke@templ.in>
Date: Sun, 1 Apr 2012 15:14:26 -0400
Subject: [PATCH] Cleanup Patron proxy integration

---
 lib/faraday/adapter/patron.rb | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/faraday/adapter/patron.rb b/lib/faraday/adapter/patron.rb
index e8dc9cce..84cf51cd 100644
--- a/lib/faraday/adapter/patron.rb
+++ b/lib/faraday/adapter/patron.rb
@@ -16,9 +16,9 @@ module Faraday
           session.connect_timeout = req[:open_timeout]              if req[:open_timeout]
                     
           if proxy = req[:proxy]
-            session.proxy = "http://#{proxy[:uri].host}:#{proxy[:uri].port}"
-            if proxy[:username] && proxy[:password]
-              session.proxy.insert(7, "#{proxy[:username]}:#{proxy[:password]}@")
+            session.proxy = proxy[:uri].to_s
+            if proxy[:user] && proxy[:password]
+              prepend_proxy_auth_string(proxy, session)
             end
           end
         end
@@ -46,5 +46,9 @@ module Faraday
         end
       end
     end
+    
+    def prepend_proxy_auth_string(proxy, session)
+      session.proxy.insert(7, "#{proxy[:user]}:#{proxy[:password]}@")
+    end
   end
 end