phantom_client 1.1.0 → 1.2.0

data/bin/phantom_client

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

data/lib/phantom_client/phantom_client.rb

@@ -16,7 +16,7 @@ module PhantomJSProxy
     attr_accessor :hmac
     attr_accessor :hmac_activated
 		
-		def initialize(addr_list=[], con = PhantomJSClientConnection.new, key=nil)
+		def initialize(addr_list=[], key=nil, con = PhantomJSClientConnection.new)
 			@proxy_list = addr_list
 			@connection = con
 			@hmac_activated = key ? true : false
@@ -47,10 +47,7 @@ module PhantomJSProxy
 			end
 			
 			if hmac_activated
-			  t = Time.now
-			  req['Hmac-Key'] = hmac.update(addr+t.to_s).hexdigest
-			  req['Hmac-Time'] = t
-        puts "Encode: #{addr} to #{req['Hmac-Key']}"
+			  update_hmac_head addr, req, hmac
 			end
 			#::Proxy(@proxy_addr, @proxy_port)
 			
@@ -62,6 +59,14 @@ module PhantomJSProxy
 			#end
       do_get(url, req, 10)
 		end
+		
+		private
+		def update_hmac_head(addr, req, hmac_keygen)
+		  t = Time.now
+      req['Hmac-Key'] = hmac_keygen.update(addr+t.to_s).hexdigest
+      req['Hmac-Time'] = t
+      puts "Encode: #{addr} to #{req['Hmac-Key']}"
+		end
     
     def do_get(url, req, count)
         element = get_proxy()	

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: phantom_client
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 31
   prerelease: 
   segments: 
   - 1
-  - 1
+  - 2
   - 0
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Daniel Sudmann
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-02 00:00:00 +02:00
+date: 2012-05-09 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency