nap 0.5 → 0.5.1

data/lib/rest/request.rb

@@ -73,21 +73,26 @@ module REST
       [url.path, url.query].compact.join('?')
     end
     
-    def http_proxy
-      ENV['HTTP_PROXY'] || ENV['http_proxy']
+    def proxy_env
+      {
+        'http'  => ENV['HTTP_PROXY']  || ENV['http_proxy'],
+        'https' => ENV['HTTPS_PROXY'] || ENV['https_proxy']
+      }
     end
     
     def proxy_settings
-      http_proxy ? URI.parse(http_proxy) : nil
+      proxy_env[url.scheme] ? URI.parse(proxy_env[url.scheme]) : nil
     end
     
-    def proxy
-      @proxy ||= Net::HTTP.Proxy(proxy_settings.host, proxy_settings.port, proxy_settings.user, proxy_settings.password)
+    def http_proxy
+      if settings = proxy_settings
+        Net::HTTP.Proxy(settings.host, settings.port, settings.user, settings.password)
+      end
     end
     
     def http_request
-      if proxy_settings
-        proxy.new(url.host, url.port)
+      if http_proxy
+        http_proxy.new(url.host, url.port)
       else
         Net::HTTP.new(url.host, url.port)
       end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: nap
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 9
   prerelease: 
   segments: 
   - 0
   - 5
-  version: "0.5"
+  - 1
+  version: 0.5.1
 platform: ruby
 authors: 
 - Manfred Stienstra
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-12 00:00:00 Z
+date: 2012-03-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake