phantom_client 1.2.5 → 1.2.6

data/lib/phantom_client/phantom_client.rb

@@ -111,9 +111,15 @@ module PhantomJSProxy
         
         begin
           @connection.do_request(element, url, req)
-        rescue Exception => e
+        rescue Net::HTTPBadResponse => e
+          raise ProxyErrorLoadingPage, "Proxy could not load Page: #{e}"
+          resp = DummyResponse.new()
+          resp.code = 500
+          resp.body = "Bad Server response"
+          return resp
+        rescue Timeout::Error, Errno::ECONNREFUSED => e
           if count == 0
-            raise NoProxy, "Could not reach any Proxy"
+            raise NoProxy, "Could not reach any Proxy: #{e}"
             resp = DummyResponse.new()
             resp.code = 500
             resp.body ="Could not connect to proxy"

data/lib/phantom_client/phantom_client_connection.rb

@@ -4,7 +4,9 @@ require 'uri'
 module PhantomJSProxy
 	class PhantomJSClientConnection
 		def do_request(proxy, url, req)
-				res = Net::HTTP::Proxy(proxy[:addr], proxy[:port]).start(url.host, url.port) {|http|
+				conn = Net::HTTP::Proxy(proxy[:addr], proxy[:port]).new(url.host, url.port)
+				conn.read_timeout = 180
+				res = conn.start() {|http|
 					http.request(req)
 				}
 				return res

data/lib/phantom_client/phantom_client_no_proxy.rb

@@ -1,5 +1,8 @@
 module PhantomJSProxy
-  class NoProxy < Exception
-    
+  class PhantomError < Exception
   end
-end
+  class NoProxy < PhantomError
+  end
+  class ProxyErrorLoadingPage < PhantomError
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: phantom_client
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 1
   - 2
-  - 5
-  version: 1.2.5
+  - 6
+  version: 1.2.6
 platform: ruby
 authors: 
 - Daniel Sudmann
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-04-23 00:00:00 +02:00
+date: 2013-04-25 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency