polipus 0.3.5 → 0.3.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NGY4NjA2MTVlYmY1ZGJlYzJhMGRmYjc3M2Y4MjFiMmFkZWQ0OGYwNg==
+    NzFhNjEwZmMzMDMwNWRlZDMzODU1NDljMDBmNmUyZWQ5MDI1YmZlNQ==
   data.tar.gz: !binary |-
-    Njg1ZDVjYzI0YWNmMmJhYTVlZTMwOTBkYTc0MzU3MDI5MjI0ZDkxOA==
+    NGY4Njg0NzJkNWVkMDJlYWIxZWEyNzhmYTM3MDlmZGJkYmFlMGQ0MA==
 SHA512:
   metadata.gz: !binary |-
-    NTM3MjFhOWNjNWY4MTZmYjdiMGUwYzEwNGRhNjdkOGE2NDY1MjkzZTFmOTIw
-    MmExOGU0MGRjNWEwYjM0MTA2OTE5YmUzMDM2ZDUzOWExOTc1YWFmOWJhNzQ5
-    N2IyZTc4NzQyYTkzN2I5MjdhOTJmMmMwMzI0ZjA3MGZiYjY4N2I=
+    ZjJiMmU4YmI2NDRhMGMzNzJmNzlhZWRjNjg5YjQ0OGVkYWM5YTZhODk4NzEx
+    Y2JhNDEzMDMxMDE5ZDBkMDZlNjhlNGQ1NTI0OWE5YjlhNjAyZTM0NDc1N2Fk
+    MGIyNDIzOGRkMTZlODE1MmQwNzg4MTU4MzQ0ZDc1NjhiNzNhYzk=
   data.tar.gz: !binary |-
-    ZWEwZWFjNjEwOTJiZGRkMjAyOTM2OTM0NzlhNjEwMjdlYjlmNDZiOWRiZmU5
-    ZDQ2YjJlYzJiZTM5NzM0ZWM0ZTQ4MDhhNWQ1YjgzZDRkYTFmNjgzMmU4YmMz
-    NzZiMWQ3MzdmOGE2ZjI2MDUzNzk2ODMzMmM4ODA1MWI5OGFhODQ=
+    ZTQxOWFiNjI4YzI5MjhjMjQ0ODA3ODY0ZWNlZjZhZDE3YWE1OGJhMjdiN2Jm
+    NGY2YWJjNzE2OWFlZjAyYjM4Y2E2MzVlNTBlYzc5MjMwM2QyZTllNjg4OGVi
+    NzY5ZmRlZTliMTk1MWE4YmQ4MWNjYTA0OGFlZjhjZmRjZGU2M2I=

data/lib/polipus/http.rb

@@ -87,7 +87,6 @@ module Polipus
     # The proxy address string
     #
     def proxy_host
-      return proxy_host_port.first unless @opts[:proxy_host_port].nil?
       @opts[:proxy_host].respond_to?(:call) ? @opts[:proxy_host].call(self) : @opts[:proxy_host]
     end
 
@@ -95,7 +94,6 @@ module Polipus
     # The proxy port
     #
     def proxy_port
-      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
 
@@ -103,7 +101,6 @@ module Polipus
     # 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
 
@@ -111,7 +108,7 @@ module Polipus
     # The proxy password
     #
     def proxy_pass
-      return proxy_host_port[3] unless @opts[:proxy_host_port].nil?
+      #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
 
@@ -234,7 +231,17 @@ 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, proxy_user, proxy_pass)
+      # Block has higher priority
+      unless @opts[:proxy_host_port].nil?
+        p_host, p_port, p_user, p_pass = proxy_host_port 
+      else
+        p_host = proxy_host
+        p_port = proxy_port
+        p_user = proxy_user
+        p_pass = proxy_pass
+      end
+
+      http = Net::HTTP.new(url.host, url.port, p_host, p_port, p_user, p_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.5'
+  VERSION = '0.3.6'
   HOMEPAGE = 'https://github.com/taganaka/polipus'
 end

data/spec/http_spec.rb

@@ -41,17 +41,11 @@ describe Polipus::HTTP do
     it 'should set proxy correctly using shorthand method' do
       http = Polipus::HTTP.new(proxy_host_port: -> _con { ['127.0.0.0', 8080] })
       http.proxy_host_port.should eq ['127.0.0.0', 8080]
-      http.proxy_port.should be 8080
-      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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: polipus
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Francesco Laurita