grabzit 3.2.9.3 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b82627011969eb5c6140dcb1b69c7b5d6a0aeea
-  data.tar.gz: 03b36ec5a77c62f52fd240c071654f2d85c5ade9
+  metadata.gz: 09d6ec1f09ecdd48022de7301a78464e58d951e1
+  data.tar.gz: 4bc0cece63914f029c41d63edbb356129aea37b1
 SHA512:
-  metadata.gz: d1ae5931affeee30111f01b037427858f3b80e756cb76f1f700183d07820b1e299432cf199e6c3c9fd988b42a61bc0cfda17e6fd7498a2c813044ca075310edd
-  data.tar.gz: 56e96b8fe447cb40d7691aeab2841e6614f7bf69097796a7d59f7fb67653c734399e8384c472894d0511a83a90df19109f322b60b7b1e683c89530c3fcc1d24c
+  metadata.gz: cad38a6aa07db5e8f9f55317e66ac6338b55326b0f1f6e1d87ba51176806bc6188c36d4dd66bac4fdeff5854680ded8d792e47a5f8175dcd679894e6289d8f88
+  data.tar.gz: 9d3587e9c22066f83cccfda42c61984a807f1635c1e553988b305fa9e06d5e69beb148ed3b46874563c95a1737aed07b884eac3218405775a0588cf24db732a7

data/lib/grabzit/client.rb

@@ -19,6 +19,7 @@ module GrabzIt
 	require File.join(File.dirname(__FILE__), 'tableoptions')
 	require File.join(File.dirname(__FILE__), 'pdfoptions')
 	require File.join(File.dirname(__FILE__), 'docxoptions')
+	require File.join(File.dirname(__FILE__), 'proxy')
 	
 	# This client provides access to the GrabzIt web services
 	# This API allows you to take screenshot of websites for free and convert them into images, PDF's and tables.
@@ -57,6 +58,7 @@ module GrabzIt
 			@applicationKey = applicationKey
 			@applicationSecret = applicationSecret
 			@protocol = 'http'
+			@proxy = Proxy.new()
 		end
 
 		# This method specifies the URL of the online video that should be converted into a animated GIF
@@ -261,15 +263,6 @@ module GrabzIt
 
 			return get_result_value(data, "ID")
 		end
-		
-		private
-		def take(sig, callBackURL)
-			if !@request.isPost()
-				return get(@request.url() + "?" + URI.encode_www_form(@request.options()._getParameters(@applicationKey, sig, callBackURL, "url", @request.data())))
-			end
-			
-			return post(@request.url(), URI.encode_www_form(@request.options()._getParameters(@applicationKey, sig, callBackURL, "html", CGI.escape(@request.data()))))
-		end
 
 		# Calls the GrabzIt web service to take the screenshot and saves it to the target path provided. if no target path is provided
 		# it returns the screenshot byte data.
@@ -561,6 +554,18 @@ module GrabzIt
 				@protocol = 'http'
 			end
 		end
+	
+		# This method enables a local proxy server to be used for all requests
+		#
+		# @param value [String] the URL, which can include a port if required, of the proxy. Providing a null will remove any previously set proxy
+		def set_local_proxy(value)
+			if value
+				uri = URI.parse(value)
+				@proxy = Proxy.new(uri.host, uri.port, uri.user, uri.password)
+			else
+				@proxy = Proxy.new()
+			end
+		end		
 		
 		# This method creates a cryptographically secure encryption key to pass to the encryption key parameter.
 		#
@@ -599,6 +604,15 @@ module GrabzIt
 			decrypted << cipher.final();
 			return decrypted
 		end
+		
+		private
+		def take(sig, callBackURL)
+			if !@request.isPost()
+				return get(@request.url() + "?" + URI.encode_www_form(@request.options()._getParameters(@applicationKey, sig, callBackURL, "url", @request.data())))
+			end
+			
+			return post(@request.url(), URI.encode_www_form(@request.options()._getParameters(@applicationKey, sig, callBackURL, "html", CGI.escape(@request.data()))))
+		end		
 
 		private
 		def find_watermarks(identifier = nil)
@@ -631,7 +645,7 @@ module GrabzIt
 		private
 		def get(url)
 			uri = URI.parse(url)
-			response = Net::HTTP.start(uri.host, uri.port, :use_ssl => uri.scheme == 'https') { |http| http.get(uri.request_uri) }
+			response = Net::HTTP.start(uri.host, uri.port, @proxy.host(), @proxy.port(), @proxy.username(), @proxy.password(), :use_ssl => uri.scheme == 'https') { |http| http.get(uri.request_uri) }
 			response_check(response)
 			return response.body
 		end
@@ -640,7 +654,7 @@ module GrabzIt
 		def post(url, params)
 			headers = {'Content-Type' => 'application/x-www-form-urlencoded'}
 			uri = URI.parse(url)
-			response = Net::HTTP.start(uri.host, uri.port, :use_ssl => uri.scheme == 'https') { |http| http.post(uri.request_uri, params, headers) }
+			response = Net::HTTP.start(uri.host, uri.port, @proxy.host(), @proxy.port(), @proxy.username(), @proxy.password(), :use_ssl => uri.scheme == 'https') { |http| http.post(uri.request_uri, params, headers) }
 			response_check(response)
 			return response.body
 		end		

data/lib/grabzit/proxy.rb

@@ -0,0 +1,38 @@
+module GrabzIt
+	require 'cgi'
+	
+	# This class represents the local proxy
+	# @version 3.2
+	# @author GrabzIt
+	class Proxy
+		# @!visibility private
+		def initialize(host = nil, port = nil, username = nil, password = nil)
+			@Host = host
+			@Port = port
+			@Username = username
+			@Password = password
+		end
+		# @return [String] returns the host of the proxy
+		def host
+			@Host
+		end
+		# @return [String] returns the port of the proxy
+		def port
+			@Port
+		end
+		# @return [String] returns the username of the proxy
+		def username
+			if @Username == nil
+				return @Username
+			end
+			return CGI.unescape(@Username)
+		end
+		# @return [String] [String] returns the password of the proxy
+		def password
+			if @Password == nil
+				return @Password
+			end
+			return CGI.unescape(@Password)					
+		end
+	end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grabzit
 version: !ruby/object:Gem::Version
-  version: 3.2.9.3
+  version: 3.3.0
 platform: ruby
 authors:
 - GrabzIt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-10 00:00:00.000000000 Z
+date: 2018-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -44,6 +44,7 @@ files:
 - lib/grabzit/exception.rb
 - lib/grabzit/imageoptions.rb
 - lib/grabzit/pdfoptions.rb
+- lib/grabzit/proxy.rb
 - lib/grabzit/request.rb
 - lib/grabzit/screenshotstatus.rb
 - lib/grabzit/tableoptions.rb