phantom_client 1.2.3 → 1.2.5

data/bin/phantom_client

@@ -26,4 +26,4 @@ if url == nil
 end
 
 client = PhantomJSProxy::PhantomJSClient.new(proxy_list, hmac_key, nil, PhantomJSProxy::PhantomJSClientConnection.new)
-puts client.get_body(url, {:imageOnly => false, :withIframes => true})
+puts client.get_body(url, {"imageOnly" => false, "withIframes" => true})

data/lib/phantom_client/phantom_client.rb

@@ -1,6 +1,7 @@
 require 'net/http'
 require 'uri'
 require 'hmac-md5'
+require "base64"
 
 module PhantomJSProxy
   class DummyResponse
@@ -47,13 +48,8 @@ module PhantomJSProxy
 		  get(addr, options).body
 		end
 		
-		def get(addr, options=nil)			
-			url = URI.parse(addr)
-			req = Net::HTTP::Get.new(url.path)
-			req['User-Agent'] = "PhantomJSClient"
-			if /\?/.match(addr)
-				req.body = addr.split('?')[1]
-			end
+		def get(addr_in, options=nil)		
+			addr,url, req = generate_request(addr_in)
 			
 			if options && options['imageOnly']
 				req['Get-Page-As-Image'] = options['imageOnly']
@@ -86,7 +82,25 @@ module PhantomJSProxy
       req['Hmac-Time'] = t
       logger.info "Encode: #{addr} to #{req['Hmac-Key']}"
 		end
-    
+
+		def generate_request(addr)
+			begin	
+				url = URI.parse(addr)
+				req = Net::HTTP::Get.new(url.path)
+				req['User-Agent'] = "PhantomJSClient"
+				req.body = url.query
+				return addr, url, req
+			rescue URI::InvalidURIError
+				#this now means we got a bad url
+				addr_out = "http://phantomProxy.get/"
+				url = URI.parse(addr_out)
+				req = Net::HTTP::Get.new(url.path)
+				req['User-Agent'] = "PhantomJSClient"
+				req.body = "address="+Base64.encode64(addr)
+				return addr_out, url, req
+			end
+		end
+
     def do_get(url, req, count)
         element = get_proxy()	
         if element[:addr] && element[:port]

metadata

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