polipus 0.0.3 → 0.0.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjU0MmViNGYzZWVjNDBkOTI1MDMwNjRlMTE0ZDVmN2RjODc4MGI2Mw==
+    ZTJkNWMwNzJlMzk1YTZkZTMwM2M3YTM0OTE1MzgyZjkwZWRiNTFiOQ==
   data.tar.gz: !binary |-
-    YjQ3OTZmMThiNjI3ZTRiNTUxNWFlZjA1MGFiOGRhZTcxYzdiYTY0Ng==
+    YTVmZmQ2ZDhkMGQ2ZTk2M2ZmNzYwZTk3YjYzM2I3MTg0ZWRmYTlmMw==
 SHA512:
   metadata.gz: !binary |-
-    Zjc0N2Q2NmM3Yzg0OTg5NTEwYjg2N2Q5ODk5ZjU2OWQzZWQyMzEwNjk4NmJi
-    NzAxYzFlNDhhZGE1YzA0MGFiYjJiOWVlZThhMTFmZTM0YzAxZDE0MWE4MzAw
-    NjU5NWI5OThjNWE2ZWMzNThmNDU5MmZkY2Q0ODAzNDdkYmNjOTU=
+    Y2MwNWI4ZGFlMDRiODkwYmFlNjE0Y2JmODQxOGU4OTIzYWI4MGM0NjNmOGVj
+    NGZjNzNmMDFkYzg4MzRlZTUxZDE1NzM3ZGRlZDRhNDkzZGI3YjBlMGM5MDQ2
+    ZmIxNzY1M2YzZDc4ZjE4MzFjODIzOWMzYzFhZWE4NTEzNDMwNTI=
   data.tar.gz: !binary |-
-    ZWQ0MzFiMWYxNGRkNzAxM2FmZmFlYmVmNDljYTJjOGQxZGU4NjZjYTQ1ZjZi
-    ZDU3ZGNjMDc4Njg1MzJkMjFjYjQwYjZjNGNlNTk2ODBjN2MxMTI1ZGMwY2Ix
-    NjM4ZWFlY2U1NWYzZGE0NjFjNWZlYWE5Y2Y2NTA4ODk3NTIwMzU=
+    NmIzMWNlZGJiZDhiM2VhNGI5YmMyMGRhMDYxMGQ2Yjc4NWNiMjRkMGExMmVm
+    M2NiYjQ3YmIzM2JmZTlhNzRmNjE1YmI4MGE2YzRhNzA0NWIzMjRlYWVkOGQ4
+    ZjBhMzUyNzRlNmU5YmUzZTgxZDI4MDQyMWNlZDMyODYxYjNkM2I=

data/lib/polipus/http.rb

@@ -74,14 +74,24 @@ module Polipus
     # The proxy address string
     #
     def proxy_host
-      @opts[: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
 
     #
     # The proxy port
     #
     def proxy_port
-      @opts[:proxy_port]
+      return proxy_host_port.last unless @opts[:proxy_host_port].nil?
+      @opts[:proxy_port].respond_to?(:call) ? @opts[:proxy_port].call(self) : @opts[:proxy_port]
+    end
+
+    #
+    # Shorthand to get proxy info with a single call
+    # It returns an array of ['addr', port]
+    #
+    def proxy_host_port
+      @opts[:proxy_host_port].respond_to?(:call) ? @opts[:proxy_host_port].call(self) : @opts[:proxy_host_port]
     end
 
     #
@@ -168,6 +178,8 @@ module Polipus
     end
 
     def refresh_connection(url)
+      proxy_host, proxy_port = proxy_host_port unless @opts[:proxy_host_port].nil?
+
       http = Net::HTTP.new(url.host, url.port, proxy_host, proxy_port)
 
       http.read_timeout = read_timeout if !!read_timeout

data/lib/polipus/version.rb

@@ -1,4 +1,4 @@
 module Polipus
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
   HOMEPAGE = "https://github.com/taganaka/polipus"
 end

data/spec/http_spec.rb

@@ -28,4 +28,26 @@ describe Polipus::HTTP do
     end
   end
 
+  describe 'proxy settings' do
+    it 'should set proxy correctly using a procedure' do
+      http = Polipus::HTTP.new({proxy_host: -> con { "127.0.0.0" }, proxy_port: -> con { 8080 }})
+      http.proxy_host.should eq "127.0.0.0"
+      http.proxy_port.should be 8080
+    end
+
+    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 settings' do
+      http = Polipus::HTTP.new({proxy_host: "127.0.0.0", proxy_port:  8080 })
+      http.proxy_port.should be 8080
+      http.proxy_host.should eq "127.0.0.0"
+    end
+
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polipus
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Francesco Laurita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-17 00:00:00.000000000 Z
+date: 2014-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis-bloomfilter