polipus 0.3.4 → 0.3.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjkyMTAxZWU0ODJmMzI5OTcwZjI0ZTFlNzZjOTYxNzY1MGUxOTJjZQ==
+    NGY4NjA2MTVlYmY1ZGJlYzJhMGRmYjc3M2Y4MjFiMmFkZWQ0OGYwNg==
   data.tar.gz: !binary |-
-    OTg4M2UzY2I2ODNkMWMxZDYwMzkxOGI5MmRhMWJkN2I0N2ViYTMyMg==
+    Njg1ZDVjYzI0YWNmMmJhYTVlZTMwOTBkYTc0MzU3MDI5MjI0ZDkxOA==
 SHA512:
   metadata.gz: !binary |-
-    YWE4ZjM0NDA1NWJiMGVkYzUyMTM5ZWJjN2I3YTU5YTI2NDIwNmI0ZTNkZTRl
-    NTg0MzQyOTgxMGYzZjBlZGVkMmE2ODJkZTA0ZTg3NzY0MTJjZTljYWEwN2Fm
-    YTc4MjI3NGViMmNlMjQzNWIxODVlMmNlNWJjNDFhMzE1MzQxMjk=
+    NTM3MjFhOWNjNWY4MTZmYjdiMGUwYzEwNGRhNjdkOGE2NDY1MjkzZTFmOTIw
+    MmExOGU0MGRjNWEwYjM0MTA2OTE5YmUzMDM2ZDUzOWExOTc1YWFmOWJhNzQ5
+    N2IyZTc4NzQyYTkzN2I5MjdhOTJmMmMwMzI0ZjA3MGZiYjY4N2I=
   data.tar.gz: !binary |-
-    YjRlMmVjYzA4MDVlYzAxMmM0NGYwMWFiYWMwNmYxNDg3MmMyOTY4YzQzZDQ2
-    OWZjNWUzYjJlMzk3MDg5NjE4ZmQxYTk5MWQ1Y2M0ZmQ5MjhkYjQxZjdkNzRk
-    ZjZjNzkyMjJmM2M0MzNiNDNkOTQxOWYyMDc2MDdhZTJlNWE1Y2M=
+    ZWEwZWFjNjEwOTJiZGRkMjAyOTM2OTM0NzlhNjEwMjdlYjlmNDZiOWRiZmU5
+    ZDQ2YjJlYzJiZTM5NzM0ZWM0ZTQ4MDhhNWQ1YjgzZDRkYTFmNjgzMmU4YmMz
+    NzZiMWQ3MzdmOGE2ZjI2MDUzNzk2ODMzMmM4ODA1MWI5OGFhODQ=

data/lib/polipus.rb

@@ -35,6 +35,10 @@ module Polipus
       proxy_host: nil,
       # proxy server port number
       proxy_port: false,
+      # proxy server username
+      proxy_user: nil,
+      # proxy server password
+      proxy_pass: nil,
       # HTTP read timeout in seconds
       read_timeout: 30,
       # HTTP open connection timeout in seconds

data/lib/polipus/http.rb

@@ -95,13 +95,29 @@ module Polipus
     # The proxy port
     #
     def proxy_port
-      return proxy_host_port.last unless @opts[:proxy_host_port].nil?
+      return proxy_host_port[1] unless @opts[:proxy_host_port].nil?
       @opts[:proxy_port].respond_to?(:call) ? @opts[:proxy_port].call(self) : @opts[:proxy_port]
     end
 
+    #
+    # The proxy username
+    #
+    def proxy_user
+      return proxy_host_port[2] unless @opts[:proxy_host_port].nil?
+      @opts[:proxy_user].respond_to?(:call) ? @opts[:proxy_user].call(self) : @opts[:proxy_user]
+    end
+
+    #
+    # The proxy password
+    #
+    def proxy_pass
+      return proxy_host_port[3] unless @opts[:proxy_host_port].nil?
+      @opts[:proxy_pass].respond_to?(:call) ? @opts[:proxy_pass].call(self) : @opts[:proxy_pass]
+    end
+
     #
     # Shorthand to get proxy info with a single call
-    # It returns an array of ['addr', port]
+    # It returns an array of ['addr', port, 'user', 'pass']
     #
     def proxy_host_port
       @opts[:proxy_host_port].respond_to?(:call) ? @opts[:proxy_host_port].call(self) : @opts[:proxy_host_port]
@@ -175,6 +191,11 @@ module Polipus
         req = Net::HTTP::Get.new(full_path, opts)
         # HTTP Basic authentication
         req.basic_auth url.user, url.password if url.user
+        if @opts[:http_user]
+          req.basic_auth @opts[:http_user], @opts[:http_password]
+        end
+        # urls auth schema has higher priority
+        req.basic_auth url.user, url.password if url.user
         response = connection(url).request(req)
         finish = Time.now
         response_time = ((finish - start) * 1000).round
@@ -213,7 +234,7 @@ module Polipus
         @opts[:logger].debug { "Request #{url} using proxy: #{proxy_host}:#{proxy_port}" }
       end
 
-      http = Net::HTTP.new(url.host, url.port, proxy_host, proxy_port)
+      http = Net::HTTP.new(url.host, url.port, proxy_host, proxy_port, proxy_user, proxy_pass)
 
       http.read_timeout = read_timeout if read_timeout
       http.open_timeout = open_timeout if open_timeout

data/lib/polipus/version.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
 module Polipus
-  VERSION = '0.3.4'
+  VERSION = '0.3.5'
   HOMEPAGE = 'https://github.com/taganaka/polipus'
 end

data/spec/http_spec.rb

@@ -45,10 +45,21 @@ describe Polipus::HTTP do
       http.proxy_host.should eq '127.0.0.0'
     end
 
+    it 'should set proxy w/ auth correctly using shorthand method' do
+      http = Polipus::HTTP.new(proxy_host_port: -> _con { ['127.0.0.0', 8080, 'a', 'b'] })
+      http.proxy_host_port.should eq ['127.0.0.0', 8080, 'a', 'b']
+      http.proxy_port.should be 8080
+      http.proxy_host.should eq '127.0.0.0'
+      http.proxy_user.should eq 'a'
+      http.proxy_pass.should eq 'b'
+    end
+
     it 'should set proxy settings' do
-      http = Polipus::HTTP.new(proxy_host: '127.0.0.0', proxy_port:  8080)
+      http = Polipus::HTTP.new(proxy_host: '127.0.0.0', proxy_port:  8080, proxy_user: 'a', proxy_pass: 'b')
       http.proxy_port.should be 8080
       http.proxy_host.should eq '127.0.0.0'
+      http.proxy_user.should eq 'a'
+      http.proxy_pass.should eq 'b'
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polipus
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Francesco Laurita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-23 00:00:00.000000000 Z
+date: 2014-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis-bloomfilter