grabzit 3.2.6 → 3.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 700e28b31c62af28d995d0216e0651163583231a
-  data.tar.gz: ab739b9a8bf416a40b502def792aca8b80a06615
+  metadata.gz: 5a3201c51d99c10fd1c9df9b98cf71505776fd71
+  data.tar.gz: 0f835d0e1887efb9a9f3002f888f55ed9897e55e
 SHA512:
-  metadata.gz: 135c983b0a7831b401261b2b678a866ad823210c3d13f4da2a1ba775583637b092d5f2aa4cb1f8dd727a0fda32db42075795e0656f17b4b065610be146e5a732
-  data.tar.gz: acd10da565b98cf59582fe9820bdc5cb883d086c3bea7fbec7f5e76e1c7f5b7b29e5f6bca71b521443f88c20a4f20ada9d52c26db67c888c3809c7d96a264869
+  metadata.gz: cc3aec7572f02f292eee573350fe583c41f4c9ffacdf50906da93ed16a4e8b86717307c5e22c672ac537d32ebd5b089fd8d03921158936719f1c060e4da85d7a
+  data.tar.gz: 36e8e0ad000d09ab7553595b9828668084785fda0cb76020a389cbd71eef0c2e03a09634d06513592c25d1eeee8f8abbb39f65663df06efa5b98d4ce597b68e1

data/lib/grabzit/animationoptions.rb

@@ -6,6 +6,7 @@ module GrabzIt
 	# @author GrabzIt
 	class AnimationOptions < BaseOptions
 		def initialize()
+			super()
 			@width = 0
 			@height = 0
 			@start = 0
@@ -27,7 +28,7 @@ module GrabzIt
 		#
 		# @param value [Integer] the width
 		# @return [void]		
-		def width(value)
+		def width=(value)
 			@width = value
 		end	
 
@@ -40,7 +41,7 @@ module GrabzIt
 		#
 		# @param value [Integer] the height
 		# @return [void]		
-		def height(value)
+		def height=(value)
 			@height = value
 		end		
 
@@ -53,7 +54,7 @@ module GrabzIt
 		#
 		# @param value [Integer] the second to start at
 		# @return [void]		
-		def start(value)
+		def start=(value)
 			@start = value
 		end		
 		
@@ -66,7 +67,7 @@ module GrabzIt
 		#
 		# @param value [Integer] the number of seconds
 		# @return [void]		
-		def duration(value)
+		def duration=(value)
 			@duration = value
 		end				
 		
@@ -79,7 +80,7 @@ module GrabzIt
 		#
 		# @param value [Float] the speed
 		# @return [void]		
-		def speed(value)
+		def speed=(value)
 			@speed = value
 		end					
 		
@@ -92,7 +93,7 @@ module GrabzIt
 		#
 		# @param value [Float] the number of frames per second
 		# @return [void]		
-		def framesPerSecond(value)
+		def framesPerSecond=(value)
 			@framesPerSecond = value
 		end			
 		
@@ -105,7 +106,7 @@ module GrabzIt
 		#
 		# @param value [Integer] the number of times to loop
 		# @return [void]		
-		def repeat(value)
+		def repeat=(value)
 			@repeat = value
 		end				
 		
@@ -118,7 +119,7 @@ module GrabzIt
 		#
 		# @param value [Boolean] reverse value
 		# @return [void]		
-		def reverse(value)
+		def reverse=(value)
 			@reverse = value
 		end					
 		
@@ -131,7 +132,7 @@ module GrabzIt
 		#
 		# @param value [String] custom watermark id
 		# @return [void]		
-		def customWaterMarkId(value)
+		def customWaterMarkId=(value)
 			@customWaterMarkId = value
 		end					
 		
@@ -144,28 +145,21 @@ module GrabzIt
 		#
 		# @param value [Integer] the custom identifier
 		# @return [void]		
-		def quality(value)
+		def quality=(value)
 			@quality = value
 		end		
 		
 		# @!visibility private
 		def _getSignatureString(applicationSecret, callBackURL, url = nil)
-			urlParam = ''
-			if (url != nil)
-				urlParam = GrabzIt::Utility.nil_check(url)+"|"
-			end		
+			items = [applicationSecret]
 			
-			callBackURLParam = ''
-			if (callBackURL != nil)
-				callBackURLParam = GrabzIt::Utility.nil_check(callBackURL)
-			end				
+			if(url != nil)
+				items.push(GrabzIt::Utility.nil_check(url))
+			end
 			
-			return applicationSecret+"|"+ urlParam + callBackURLParam +
-			"|"+GrabzIt::Utility.nil_int_check(@height)+"|"+GrabzIt::Utility.nil_int_check(@width)+"|"+GrabzIt::Utility.nil_check(@customId)+"|"+
-			GrabzIt::Utility.nil_float_check(@framesPerSecond)+"|"+GrabzIt::Utility.nil_float_check(@speed)+"|"+GrabzIt::Utility.nil_int_check(@duration)+
-			"|"+GrabzIt::Utility.nil_int_check(@repeat)+"|"+GrabzIt::Utility.b_to_str(@reverse)+"|"+GrabzIt::Utility.nil_int_check(@start)+
-			"|"+GrabzIt::Utility.nil_check(@customWaterMarkId)+"|"+GrabzIt::Utility.nil_check(@country)+"|"+GrabzIt::Utility.nil_int_check(@quality)+
-			"|"+GrabzIt::Utility.nil_check(@exportURL)+"|"+GrabzIt::Utility.nil_check(@encryptionKey)
+			items.push(GrabzIt::Utility.nil_check(callBackURL),GrabzIt::Utility.nil_int_check(@height),GrabzIt::Utility.nil_int_check(@width),GrabzIt::Utility.nil_check(@customId),GrabzIt::Utility.nil_float_check(@framesPerSecond),GrabzIt::Utility.nil_float_check(@speed),GrabzIt::Utility.nil_int_check(@duration),GrabzIt::Utility.nil_int_check(@repeat),GrabzIt::Utility.b_to_str(@reverse),GrabzIt::Utility.nil_int_check(@start),GrabzIt::Utility.nil_check(@customWaterMarkId),GrabzIt::Utility.nil_check(@country),GrabzIt::Utility.nil_int_check(@quality),GrabzIt::Utility.nil_check(@exportURL),GrabzIt::Utility.nil_check(@encryptionKey),GrabzIt::Utility.nil_check(@proxy))
+
+			return items.join("|")
 		end		
 
 		# @!visibility private

data/lib/grabzit/baseoptions.rb

@@ -10,6 +10,7 @@ module GrabzIt
 			@encryptionKey = nil
 			@delay = nil
 			@post = nil
+			@proxy = nil
 		end	
 		
 		# @return [String] the custom identifier that you can pass through to the web service.
@@ -21,7 +22,7 @@ module GrabzIt
 		#
 		# @param value [String] the custom identifier
 		# @return [void]
-		def customId(value)
+		def customId=(value)
 			@customId = value
 		end		
 		
@@ -34,7 +35,7 @@ module GrabzIt
 		#
 		# @param value [String] the country to use
 		# @return [void]
-		def country(value)
+		def country=(value)
 			@country = value
 		end
 		
@@ -47,7 +48,7 @@ module GrabzIt
 		#
 		# @param value [String] export URL to use
 		# @return [void]
-		def exportURL(value)
+		def exportURL=(value)
 			@exportURL = value
 		end
 		
@@ -60,9 +61,22 @@ module GrabzIt
 		#
 		# @param value [String] encryption key to use
 		# @return [void]
-		def encryptionKey(value)
+		def encryptionKey=(value)
 			@encryptionKey = value
-		end		
+		end	
+		
+		# @return [String] the HTTP proxy that should be used to create the capture.
+		def proxy
+			@proxy
+		end
+
+		# Set the HTTP proxy that should be used to create the capture.
+		#
+		# @param value [String] HTTP proxy to use
+		# @return [void]
+		def proxy=(value)
+			@proxy = value
+		end			
 		
 		# @!visibility private
 		def startDelay
@@ -105,6 +119,7 @@ module GrabzIt
 			params['callback'] = GrabzIt::Utility.nil_check(callBackURL)
 			params['export'] = GrabzIt::Utility.nil_check(@exportURL)
 			params['encryption'] = GrabzIt::Utility.nil_check(@encryptionKey)
+			params['proxy'] = GrabzIt::Utility.nil_check(@proxy)
 			params['sig'] = sig
 			params[dataName] = GrabzIt::Utility.nil_check(dataValue)
 

data/lib/grabzit/client.rb

@@ -353,7 +353,12 @@ module GrabzIt
 		def get_cookies(domain)
 			sig = encode(GrabzIt::Utility.nil_check(@applicationSecret)+"|"+GrabzIt::Utility.nil_check(domain))               
 
-			qs = "key=" +CGI.escape(GrabzIt::Utility.nil_check(@applicationKey))+"&domain="+CGI.escape(GrabzIt::Utility.nil_check(domain))+"&sig="+sig
+			qs = "key="
+			qs.concat(CGI.escape(GrabzIt::Utility.nil_check(@applicationKey)))
+			qs.concat("&domain=")
+			qs.concat(CGI.escape(GrabzIt::Utility.nil_check(domain)))
+			qs.concat("&sig=")
+			qs.concat(sig)
 
 			result = get(@protocol + WebServicesBaseURLGet + "getcookies.ashx?" + qs)
 
@@ -393,9 +398,22 @@ module GrabzIt
 			"|"+GrabzIt::Utility.nil_check(value)+"|"+GrabzIt::Utility.nil_check(path)+"|"+GrabzIt::Utility.b_to_str(httponly)+
 			"|"+GrabzIt::Utility.nil_check(expires)+"|0")
 
-			qs = "key=" +CGI.escape(GrabzIt::Utility.nil_check(@applicationKey))+"&domain="+CGI.escape(GrabzIt::Utility.nil_check(domain))+"&name="+
-			CGI.escape(GrabzIt::Utility.nil_check(name))+"&value="+CGI.escape(GrabzIt::Utility.nil_check(value))+"&path="+CGI.escape(GrabzIt::Utility.nil_check(path))+
-			"&httponly="+GrabzIt::Utility.b_to_str(httponly)+"&expires="+CGI.escape(GrabzIt::Utility.nil_check(expires))+"&sig="+sig
+			qs = "key="
+			qs.concat(CGI.escape(GrabzIt::Utility.nil_check(@applicationKey)))
+			qs.concat("&domain=")
+			qs.concat(CGI.escape(GrabzIt::Utility.nil_check(domain)))
+			qs.concat("&name=")
+			qs.concat(CGI.escape(GrabzIt::Utility.nil_check(name)))
+			qs.concat("&value=")
+			qs.concat(CGI.escape(GrabzIt::Utility.nil_check(value)))
+			qs.concat("&path=")
+			qs.concat(CGI.escape(GrabzIt::Utility.nil_check(path)))
+			qs.concat("&httponly=")
+			qs.concat(GrabzIt::Utility.b_to_str(httponly))
+			qs.concat("&expires=")
+			qs.concat(CGI.escape(GrabzIt::Utility.nil_check(expires)))
+			qs.concat("&sig=")
+			qs.concat(sig)
 
 			return (get_result_value(get(@protocol + WebServicesBaseURLGet + "setcookie.ashx?" + qs), "Result") == TrueString)
 		end
@@ -410,8 +428,14 @@ module GrabzIt
 			sig = encode(GrabzIt::Utility.nil_check(@applicationSecret)+"|"+GrabzIt::Utility.nil_check(name)+
 			"|"+GrabzIt::Utility.nil_check(domain)+"|1")
 
-			qs = "key=" + CGI.escape(GrabzIt::Utility.nil_check(@applicationKey))+"&domain="+CGI.escape(GrabzIt::Utility.nil_check(domain))+
-			"&name="+CGI.escape(GrabzIt::Utility.nil_check(name))+"&delete=1&sig="+sig
+			qs = "key="
+			qs.concat(CGI.escape(GrabzIt::Utility.nil_check(@applicationKey)))
+			qs.concat("&domain=")
+			qs.concat(CGI.escape(GrabzIt::Utility.nil_check(domain)))
+			qs.concat("&name=")
+			qs.concat(CGI.escape(GrabzIt::Utility.nil_check(name)))
+			qs.concat("&delete=1&sig=")
+			qs.concat(sig)
 
 			return (get_result_value(get(@protocol + WebServicesBaseURLGet + "setcookie.ashx?" + qs), "Result") == TrueString)
 		end
@@ -421,7 +445,7 @@ module GrabzIt
 		# @param identifier [String, nil] the identifier of a particular custom watermark you want to view
 		# @return [WaterMark] the watermark with the specified identifier
 		def get_watermark(identifier)
-			watermarks = get_watermarks(identifier)
+			watermarks = find_watermarks(identifier)
 			if watermarks.length == 1
 				return watermarks[0]
 			end
@@ -433,7 +457,7 @@ module GrabzIt
 		#
 		# @return [Array<WaterMark>] an array of uploaded watermarks
 		def get_watermarks()
-			return get_watermarks(nil)
+			return find_watermarks(nil)
 		end		
 
 		# Add a new custom watermark
@@ -488,10 +512,13 @@ module GrabzIt
 			request = Net::HTTP::Post.new(url)
 			request.content_type = "multipart/form-data, boundary="+boundary
 			request.body = post_body.join
-
-			response = Net::HTTP.new(uri.host, uri.port, :use_ssl => uri.scheme == 'https').start {|http| http.request(request) }	
+			
+			caller = Net::HTTP.new(uri.host, uri.port)
+			caller.use_ssl = uri.scheme == 'https'
+			response = caller.start {|http| http.request(request)}	
+			
 			response_check(response)
-
+			
 			return (get_result_value(response.body(), "Result") == TrueString)		
 		end
 
@@ -501,9 +528,14 @@ module GrabzIt
 		# @return [Boolean] returns true if the watermark was successfully deleted
 		# @raise [RuntimeError] if the GrabzIt service reports an error with the request it will be raised as a RuntimeError
 		def delete_watermark(identifier)
-			sig = encode(GrabzIt::Utility.nil_check(@applicationSecret)+"|"+GrabzIt::Utility.nil_check(identifier))               
+			sig = encode(GrabzIt::Utility.nil_check(@applicationSecret)+"|"+GrabzIt::Utility.nil_check(identifier))
 
-			qs = "key=" +CGI.escape(GrabzIt::Utility.nil_check(@applicationKey))+"&identifier="+CGI.escape(GrabzIt::Utility.nil_check(identifier))+"&sig="+sig
+			qs = "key="
+			qs.concat(CGI.escape(GrabzIt::Utility.nil_check(@applicationKey)))
+			qs.concat("&identifier=")
+			qs.concat(CGI.escape(GrabzIt::Utility.nil_check(identifier)))
+			qs.concat("&sig=")
+			qs.concat(sig)
 
 			return (get_result_value(get(@protocol + WebServicesBaseURLGet + "deletewatermark.ashx?" + qs), "Result") == TrueString)
 		end
@@ -558,10 +590,15 @@ module GrabzIt
 		end
 
 		private
-		def get_watermarks(identifier = nil)
+		def find_watermarks(identifier = nil)
 			sig = encode(GrabzIt::Utility.nil_check(@applicationSecret)+"|"+GrabzIt::Utility.nil_check(identifier))               
 
-			qs = "key=" +CGI.escape(GrabzIt::Utility.nil_check(@applicationKey))+"&identifier="+CGI.escape(GrabzIt::Utility.nil_check(identifier))+"&sig="+sig
+			qs = "key="
+			qs.concat(CGI.escape(GrabzIt::Utility.nil_check(@applicationKey)))
+			qs.concat("&identifier=")
+			qs.concat(CGI.escape(GrabzIt::Utility.nil_check(identifier)))
+			qs.concat("&sig=")
+			qs.concat(sig)
 
 			result = get(@protocol + WebServicesBaseURLGet + "getwatermarks.ashx?" + qs)
 
@@ -623,7 +660,7 @@ module GrabzIt
 
 		private
 		def encode(text)
-			return Digest::MD5.hexdigest(text.encode('ascii', {:invalid => :replace, :undef => :replace, :replace => '?'}))			
+			return Digest::MD5.hexdigest(text.encode('ascii', {:invalid => :replace, :undef => :replace, :replace => '?'}))
 		end
 
 		private

data/lib/grabzit/docxoptions.rb

@@ -6,6 +6,7 @@ module GrabzIt
 	# @author GrabzIt
 	class DOCXOptions < BaseOptions
 		def initialize()
+			super()
 			@includeBackground = true
 			@pagesize = 'A4'
 			@orientation = 'Portrait'
@@ -38,7 +39,7 @@ module GrabzIt
 		#
 		# @param value [Boolean] include background images
 		# @return [void]		
-		def includeBackground(value)
+		def includeBackground=(value)
 			@includeBackground = value
 		end
 
@@ -51,7 +52,7 @@ module GrabzIt
 		#
 		# @param value [String] page size
 		# @return [void]		
-		def pagesize(value)
+		def pagesize=(value)
 			value = GrabzIt::Utility.nil_check(value).upcase
 			@pagesize = value
 		end		
@@ -65,7 +66,7 @@ module GrabzIt
 		#
 		# @param value [String] page orientation
 		# @return [void]		
-		def orientation(value)
+		def orientation=(value)
 			value = GrabzIt::Utility.nil_check(value).capitalize
 			@orientation = value
 		end		
@@ -79,7 +80,7 @@ module GrabzIt
 		#
 		# @param value [Boolean] include links
 		# @return [void]		
-		def includeLinks(value)
+		def includeLinks=(value)
 			@includeLinks = value
 		end		
 		
@@ -92,7 +93,7 @@ module GrabzIt
 		#
 		# @param value [Boolean] include images
 		# @return [void]		
-		def includeImages(value)
+		def includeImages=(value)
 			@includeImages = value
 		end	
 		
@@ -105,7 +106,7 @@ module GrabzIt
 		#
 		# @param value [String] DOCX title
 		# @return [void]		
-		def title(value)
+		def title=(value)
 			@title = value
 		end	
 
@@ -118,7 +119,7 @@ module GrabzIt
 		#
 		# @param value [Integer] margin top
 		# @return [void]		
-		def marginTop(value)
+		def marginTop=(value)
 			@marginTop = value
 		end		
 		
@@ -131,7 +132,7 @@ module GrabzIt
 		#
 		# @param value [Integer] margin left
 		# @return [void]		
-		def marginLeft(value)
+		def marginLeft=(value)
 			@marginLeft = value
 		end	
 
@@ -144,7 +145,7 @@ module GrabzIt
 		#
 		# @param value [Integer] margin bottom
 		# @return [void]		
-		def marginBottom(value)
+		def marginBottom=(value)
 			@marginBottom = value
 		end			
 		
@@ -157,7 +158,7 @@ module GrabzIt
 		#
 		# @param value [Integer] margin right
 		# @return [void]		
-		def marginRight(value)
+		def marginRight=(value)
 			@marginRight = value
 		end		
 		
@@ -170,7 +171,7 @@ module GrabzIt
 		#
 		# @param value [Integer] the browser width
 		# @return [void]		
-		def browserWidth(value)
+		def browserWidth=(value)
 			@browserWidth = value
 		end	
 		
@@ -183,7 +184,7 @@ module GrabzIt
 		#
 		# @param value [Integer] the width
 		# @return [void]		
-		def pageWidth(value)
+		def pageWidth=(value)
 			@width = value
 		end			
 		
@@ -196,7 +197,7 @@ module GrabzIt
 		#
 		# @param value [Integer] the height
 		# @return [void]		
-		def pageHeight(value)
+		def pageHeight=(value)
 			@height = value
 		end		
 
@@ -209,7 +210,7 @@ module GrabzIt
 		#
 		# @param value [Integer] delay
 		# @return [void]		
-		def delay(value)
+		def delay=(value)
 			@delay = value
 		end	
 
@@ -222,7 +223,7 @@ module GrabzIt
 		#
 		# @param value [Integer] the browser type
 		# @return [void]		
-		def requestAs(value)
+		def requestAs=(value)
 			@requestAs = value
 		end
 		
@@ -235,7 +236,7 @@ module GrabzIt
 		#
 		# @param value [String] template id
 		# @return [void]		
-		def templateId(value)
+		def templateId=(value)
 			@templateId = value
 		end		
 		
@@ -248,7 +249,7 @@ module GrabzIt
 		#
 		# @param value [Integer] quality
 		# @return [void]		
-		def quality(value)
+		def quality=(value)
 			@quality = value
 		end
 		
@@ -261,7 +262,7 @@ module GrabzIt
 		#
 		# @param value [String] the target element
 		# @return [void]		
-		def targetElement(value)
+		def targetElement=(value)
 			@targetElement = value
 		end
 		
@@ -274,7 +275,7 @@ module GrabzIt
 		#
 		# @param value [String] the element(s) to hide
 		# @return [void]		
-		def hideElement(value)
+		def hideElement=(value)
 			@hideElement = value
 		end
 		
@@ -287,7 +288,7 @@ module GrabzIt
 		#
 		# @param value [String] the element to wait for
 		# @return [void]		
-		def waitForElement(value)
+		def waitForElement=(value)
 			@waitForElement = value
 		end
 
@@ -300,7 +301,7 @@ module GrabzIt
 		#
 		# @param value [Boolean] hide adverts
 		# @return [void]		
-		def noAds(value)
+		def noAds=(value)
 			@noAds = value
 		end		
 
@@ -323,22 +324,14 @@ module GrabzIt
 		
 		# @!visibility private
 		def _getSignatureString(applicationSecret, callBackURL, url = nil)
-			urlParam = ''
-			if (url != nil)
-				urlParam = GrabzIt::Utility.nil_check(url)+"|"
-			end		
+			items = [applicationSecret]
 			
-			callBackURLParam = ''
-			if (callBackURL != nil)
-				callBackURLParam = GrabzIt::Utility.nil_check(callBackURL)
-			end					
-
-			return applicationSecret+"|"+ urlParam + callBackURLParam +
-			"|"+GrabzIt::Utility.nil_check(@customId)+"|"+GrabzIt::Utility.b_to_str(@includeBackground)+"|"+@pagesize +"|"+@orientation+"|"+
-			GrabzIt::Utility.b_to_str(@includeImages)+"|"+GrabzIt::Utility.b_to_str(@includeLinks)+"|"+
-			GrabzIt::Utility.nil_check(@title)+"|"+GrabzIt::Utility.nil_int_check(@marginTop)+"|"+GrabzIt::Utility.nil_int_check(@marginLeft)+
-			"|"+GrabzIt::Utility.nil_int_check(@marginBottom)+"|"+GrabzIt::Utility.nil_int_check(@marginRight)+"|"+GrabzIt::Utility.nil_int_check(@delay)+"|"+
-			GrabzIt::Utility.nil_int_check(@requestAs)+"|"+GrabzIt::Utility.nil_check(@country)+"|"+GrabzIt::Utility.nil_int_check(@quality)+"|"+GrabzIt::Utility.nil_check(@hideElement)+"|"+GrabzIt::Utility.nil_check(@exportURL)+"|"+GrabzIt::Utility.nil_check(@waitForElement)+"|"+GrabzIt::Utility.nil_check(@encryptionKey)+"|"+GrabzIt::Utility.b_to_str(@noAds)+"|"+GrabzIt::Utility.nil_check(@post)+"|"+GrabzIt::Utility.nil_check(@targetElement)+"|"+GrabzIt::Utility.nil_check(@templateId)+"|"+GrabzIt::Utility.nil_check(@templateVariables)+"|"+GrabzIt::Utility.nil_int_check(@height)+"|"+GrabzIt::Utility.nil_int_check(@width)+"|"+GrabzIt::Utility.nil_int_check(@browserWidth)
+			if(url != nil)
+				items.push(GrabzIt::Utility.nil_check(url))
+			end
+			
+			items.push(GrabzIt::Utility.nil_check(callBackURL),GrabzIt::Utility.nil_check(@customId),GrabzIt::Utility.b_to_str(@includeBackground),@pagesize ,@orientation,GrabzIt::Utility.b_to_str(@includeImages),GrabzIt::Utility.b_to_str(@includeLinks),GrabzIt::Utility.nil_check(@title),GrabzIt::Utility.nil_int_check(@marginTop),GrabzIt::Utility.nil_int_check(@marginLeft),GrabzIt::Utility.nil_int_check(@marginBottom),GrabzIt::Utility.nil_int_check(@marginRight),GrabzIt::Utility.nil_int_check(@delay),GrabzIt::Utility.nil_int_check(@requestAs),GrabzIt::Utility.nil_check(@country),GrabzIt::Utility.nil_int_check(@quality),GrabzIt::Utility.nil_check(@hideElement),GrabzIt::Utility.nil_check(@exportURL),GrabzIt::Utility.nil_check(@waitForElement),GrabzIt::Utility.nil_check(@encryptionKey),GrabzIt::Utility.b_to_str(@noAds),GrabzIt::Utility.nil_check(@post),GrabzIt::Utility.nil_check(@targetElement),GrabzIt::Utility.nil_check(@templateId),GrabzIt::Utility.nil_check(@templateVariables),GrabzIt::Utility.nil_int_check(@height),GrabzIt::Utility.nil_int_check(@width),GrabzIt::Utility.nil_int_check(@browserWidth),GrabzIt::Utility.nil_check(@proxy))
+			return items.join("|")
 		end
 		
 		# @!visibility private

data/lib/grabzit/exception.rb

@@ -69,6 +69,7 @@ module GrabzIt
 		PARAMETER_INVALID_TRANSPARENT_VALUE = 170
 		PARAMETER_INVALID_ENCRYPTION_KEY = 171
 		PARAMETER_INVALID_NO_ADS = 172
+		PARAMETER_INVALID_PROXY = 173
 		NETWORK_SERVER_OFFLINE = 200
 		NETWORK_GENERAL_ERROR = 201
 		NETWORK_DDOS_ATTACK = 202

data/lib/grabzit/imageoptions.rb

@@ -6,6 +6,7 @@ module GrabzIt
 	# @author GrabzIt
 	class ImageOptions < BaseOptions
 		def initialize()
+			super()
 			@browserWidth = nil
 			@browserHeight = nil
 			@width = nil
@@ -30,7 +31,7 @@ module GrabzIt
 		#
 		# @param value [Integer] the browser width
 		# @return [void]		
-		def browserWidth(value)
+		def browserWidth=(value)
 			@browserWidth = value
 		end	
 		
@@ -43,7 +44,7 @@ module GrabzIt
 		#
 		# @param value [Integer] the browser height
 		# @return [void]		
-		def browserHeight(value)
+		def browserHeight=(value)
 			@browserHeight = value
 		end			
 		
@@ -56,7 +57,7 @@ module GrabzIt
 		#
 		# @param value [Integer] the width
 		# @return [void]		
-		def width(value)
+		def width=(value)
 			@width = value
 		end			
 		
@@ -69,7 +70,7 @@ module GrabzIt
 		#
 		# @param value [Integer] the height
 		# @return [void]		
-		def height(value)
+		def height=(value)
 			@height = value
 		end
 
@@ -82,7 +83,7 @@ module GrabzIt
 		#
 		# @param value [String] the format
 		# @return [void]		
-		def format(value)
+		def format=(value)
 			@format = value
 		end
 
@@ -95,7 +96,7 @@ module GrabzIt
 		#
 		# @param value [Integer] the delay
 		# @return [void]		
-		def delay(value)
+		def delay=(value)
 			@delay = value
 		end
 
@@ -108,7 +109,7 @@ module GrabzIt
 		#
 		# @param value [String] the target element
 		# @return [void]		
-		def targetElement(value)
+		def targetElement=(value)
 			@targetElement = value
 		end
 		
@@ -121,7 +122,7 @@ module GrabzIt
 		#
 		# @param value [String] the element(s) to hide
 		# @return [void]		
-		def hideElement(value)
+		def hideElement=(value)
 			@hideElement = value
 		end
 		
@@ -134,7 +135,7 @@ module GrabzIt
 		#
 		# @param value [String] the element to wait for
 		# @return [void]		
-		def waitForElement(value)
+		def waitForElement=(value)
 			@waitForElement = value
 		end		
 		
@@ -147,7 +148,7 @@ module GrabzIt
 		#
 		# @param value [Integer] the browser type
 		# @return [void]		
-		def requestAs(value)
+		def requestAs=(value)
 			@requestAs = value
 		end		
 		
@@ -160,7 +161,7 @@ module GrabzIt
 		#
 		# @param value [String] custom watermark id
 		# @return [void]		
-		def customWaterMarkId(value)
+		def customWaterMarkId=(value)
 			@customWaterMarkId = value
 		end					
 		
@@ -173,7 +174,7 @@ module GrabzIt
 		#
 		# @param value [Integer] the quality
 		# @return [void]		
-		def quality(value)
+		def quality=(value)
 			@quality = value
 		end	
 
@@ -186,7 +187,7 @@ module GrabzIt
 		#
 		# @param value [Boolean] true if the image should be transparent
 		# @return [void]
-		def transparent(value)
+		def transparent=(value)
 			@transparent = value
 		end			
 		
@@ -199,7 +200,7 @@ module GrabzIt
 		#
 		# @param value [Boolean] hide adverts
 		# @return [void]		
-		def noAds(value)
+		def noAds=(value)
 			@noAds = value
 		end		
 
@@ -214,20 +215,15 @@ module GrabzIt
 		
 		# @!visibility private
 		def _getSignatureString(applicationSecret, callBackURL, url = nil)
-			urlParam = ''
-			if (url != nil)
-				urlParam = GrabzIt::Utility.nil_check(url)+"|"
-			end
+			items = [applicationSecret]
 			
-			callBackURLParam = ''
-			if (callBackURL != nil)
-				callBackURLParam = GrabzIt::Utility.nil_check(callBackURL)
+			if(url != nil)
+				items.push(GrabzIt::Utility.nil_check(url))
 			end
-
-			return applicationSecret+"|"+ urlParam + callBackURLParam +
-			"|"+GrabzIt::Utility.nil_check(@format)+"|"+GrabzIt::Utility.nil_int_check(@height)+"|"+GrabzIt::Utility.nil_int_check(@width)+"|"+GrabzIt::Utility.nil_int_check(@browserHeight)+
-			"|"+GrabzIt::Utility.nil_int_check(@browserWidth)+"|"+GrabzIt::Utility.nil_check(@customId)+"|"+GrabzIt::Utility.nil_int_check(@delay)+"|"+GrabzIt::Utility.nil_check(@targetElement)+
-			"|"+GrabzIt::Utility.nil_check(@customWaterMarkId)+"|"+GrabzIt::Utility.nil_int_check(@requestAs)+"|"+GrabzIt::Utility.nil_check(@country)+"|"+GrabzIt::Utility.nil_int_check(@quality)+"|"+GrabzIt::Utility.nil_check(@hideElement)+"|"+GrabzIt::Utility.nil_check(@exportURL)+"|"+GrabzIt::Utility.nil_check(@waitForElement)+"|"+GrabzIt::Utility.b_to_str(@transparent)+"|"+GrabzIt::Utility.nil_check(@encryptionKey)+"|"+GrabzIt::Utility.b_to_str(@noAds)+"|"+GrabzIt::Utility.nil_check(@post)
+			
+			items.push(GrabzIt::Utility.nil_check(callBackURL),GrabzIt::Utility.nil_check(@format),GrabzIt::Utility.nil_int_check(@height),GrabzIt::Utility.nil_int_check(@width),GrabzIt::Utility.nil_int_check(@browserHeight),GrabzIt::Utility.nil_int_check(@browserWidth),GrabzIt::Utility.nil_check(@customId),GrabzIt::Utility.nil_int_check(@delay),GrabzIt::Utility.nil_check(@targetElement),GrabzIt::Utility.nil_check(@customWaterMarkId),GrabzIt::Utility.nil_int_check(@requestAs),GrabzIt::Utility.nil_check(@country),GrabzIt::Utility.nil_int_check(@quality),GrabzIt::Utility.nil_check(@hideElement),GrabzIt::Utility.nil_check(@exportURL),GrabzIt::Utility.nil_check(@waitForElement),GrabzIt::Utility.b_to_str(@transparent),GrabzIt::Utility.nil_check(@encryptionKey),GrabzIt::Utility.b_to_str(@noAds),GrabzIt::Utility.nil_check(@post),GrabzIt::Utility.nil_check(@proxy))
+			
+			return items.join("|")
 		end
 	
 		# @!visibility private

data/lib/grabzit/pdfoptions.rb

@@ -6,6 +6,7 @@ module GrabzIt
 	# @author GrabzIt
 	class PDFOptions < BaseOptions
 		def initialize()
+			super()
 			@includeBackground = true
 			@pagesize = 'A4'
 			@orientation = 'Portrait'
@@ -40,7 +41,7 @@ module GrabzIt
 		#
 		# @param value [Boolean] include background
 		# @return [void]		
-		def includeBackground(value)
+		def includeBackground=(value)
 			@includeBackground = value
 		end
 
@@ -53,7 +54,7 @@ module GrabzIt
 		#
 		# @param value [String] page size
 		# @return [void]		
-		def pagesize(value)
+		def pagesize=(value)
 			value = GrabzIt::Utility.nil_check(value).upcase
 			@pagesize = value
 		end		
@@ -67,7 +68,7 @@ module GrabzIt
 		#
 		# @param value [String] page orientation
 		# @return [void]		
-		def orientation(value)
+		def orientation=(value)
 			value = GrabzIt::Utility.nil_check(value).capitalize
 			@orientation = value
 		end		
@@ -81,7 +82,7 @@ module GrabzIt
 		#
 		# @param value [Boolean] include links
 		# @return [void]		
-		def includeLinks(value)
+		def includeLinks=(value)
 			@includeLinks = value
 		end		
 		
@@ -94,7 +95,7 @@ module GrabzIt
 		#
 		# @param value [Boolean] include links
 		# @return [void]		
-		def includeOutline(value)
+		def includeOutline=(value)
 			@includeOutline = value
 		end			
 		
@@ -107,7 +108,7 @@ module GrabzIt
 		#
 		# @param value [String] PDF title
 		# @return [void]		
-		def title(value)
+		def title=(value)
 			@title = value
 		end	
 
@@ -120,7 +121,7 @@ module GrabzIt
 		#
 		# @param value [String] cover URL
 		# @return [void]		
-		def coverURL(value)
+		def coverURL=(value)
 			@coverURL = value
 		end
 
@@ -133,7 +134,7 @@ module GrabzIt
 		#
 		# @param value [Integer] margin top
 		# @return [void]		
-		def marginTop(value)
+		def marginTop=(value)
 			@marginTop = value
 		end		
 		
@@ -146,7 +147,7 @@ module GrabzIt
 		#
 		# @param value [Integer] margin left
 		# @return [void]		
-		def marginLeft(value)
+		def marginLeft=(value)
 			@marginLeft = value
 		end	
 
@@ -159,7 +160,7 @@ module GrabzIt
 		#
 		# @param value [Integer] margin bottom
 		# @return [void]		
-		def marginBottom(value)
+		def marginBottom=(value)
 			@marginBottom = value
 		end			
 		
@@ -172,7 +173,7 @@ module GrabzIt
 		#
 		# @param value [Integer] margin right
 		# @return [void]		
-		def marginRight(value)
+		def marginRight=(value)
 			@marginRight = value
 		end		
 		
@@ -185,7 +186,7 @@ module GrabzIt
 		#
 		# @param value [Integer] the browser width
 		# @return [void]		
-		def browserWidth(value)
+		def browserWidth=(value)
 			@browserWidth = value
 		end	
 		
@@ -198,7 +199,7 @@ module GrabzIt
 		#
 		# @param value [Integer] the width
 		# @return [void]		
-		def pageWidth(value)
+		def pageWidth=(value)
 			@width = value
 		end			
 		
@@ -211,7 +212,7 @@ module GrabzIt
 		#
 		# @param value [Integer] the height
 		# @return [void]		
-		def pageHeight(value)
+		def pageHeight=(value)
 			@height = value
 		end		
 		
@@ -224,7 +225,7 @@ module GrabzIt
 		#
 		# @param value [Integer] delay
 		# @return [void]		
-		def delay(value)
+		def delay=(value)
 			@delay = value
 		end	
 
@@ -237,7 +238,7 @@ module GrabzIt
 		#
 		# @param value [Integer] the browser type
 		# @return [void]		
-		def requestAs(value)
+		def requestAs=(value)
 			@requestAs = value
 		end
 
@@ -250,7 +251,7 @@ module GrabzIt
 		#
 		# @param value [String] template id
 		# @return [void]		
-		def templateId(value)
+		def templateId=(value)
 			@templateId = value
 		end		
 		
@@ -263,7 +264,7 @@ module GrabzIt
 		#
 		# @param value [String] custom watermark id
 		# @return [void]		
-		def customWaterMarkId(value)
+		def customWaterMarkId=(value)
 			@customWaterMarkId = value
 		end					
 		
@@ -276,7 +277,7 @@ module GrabzIt
 		#
 		# @param value [Integer] quality
 		# @return [void]		
-		def quality(value)
+		def quality=(value)
 			@quality = value
 		end
 		
@@ -289,7 +290,7 @@ module GrabzIt
 		#
 		# @param value [String] the target element
 		# @return [void]		
-		def targetElement(value)
+		def targetElement=(value)
 			@targetElement = value
 		end
 		
@@ -302,7 +303,7 @@ module GrabzIt
 		#
 		# @param value [String] the element(s) to hide
 		# @return [void]		
-		def hideElement(value)
+		def hideElement=(value)
 			@hideElement = value
 		end
 		
@@ -315,7 +316,7 @@ module GrabzIt
 		#
 		# @param value [String] the element to wait for
 		# @return [void]		
-		def waitForElement(value)
+		def waitForElement=(value)
 			@waitForElement = value
 		end		
 		
@@ -328,7 +329,7 @@ module GrabzIt
 		#
 		# @param value [Boolean] hide adverts
 		# @return [void]		
-		def noAds(value)
+		def noAds=(value)
 			@noAds = value
 		end		
 
@@ -351,26 +352,15 @@ module GrabzIt
 		
 		# @!visibility private
 		def _getSignatureString(applicationSecret, callBackURL, url = nil)
-			urlParam = ''
-			if (url != nil)
-				urlParam = GrabzIt::Utility.nil_check(url)+"|"
-			end		
+			items = [applicationSecret]
 			
-			callBackURLParam = ''
-			if (callBackURL != nil)
-				callBackURLParam = GrabzIt::Utility.nil_check(callBackURL)
-			end					
-
-			return applicationSecret+"|"+ urlParam + callBackURLParam +
-			"|"+GrabzIt::Utility.nil_check(@customId)+"|"+GrabzIt::Utility.b_to_str(@includeBackground)+"|"+@pagesize +"|"+@orientation+"|"+
-			GrabzIt::Utility.nil_check(@customWaterMarkId)+"|"+GrabzIt::Utility.b_to_str(@includeLinks)+"|"+GrabzIt::Utility.b_to_str(@includeOutline)+"|"+
-			GrabzIt::Utility.nil_check(@title)+"|"+GrabzIt::Utility.nil_check(@coverURL)+"|"+GrabzIt::Utility.nil_int_check(@marginTop)+"|"+GrabzIt::Utility.nil_int_check(@marginLeft)+
-			"|"+GrabzIt::Utility.nil_int_check(@marginBottom)+"|"+GrabzIt::Utility.nil_int_check(@marginRight)+"|"+GrabzIt::Utility.nil_int_check(@delay)+"|"+
-			GrabzIt::Utility.nil_int_check(@requestAs)+"|"+GrabzIt::Utility.nil_check(@country)+"|"+GrabzIt::Utility.nil_int_check(@quality)+"|"+
-			GrabzIt::Utility.nil_check(@templateId)+"|"+GrabzIt::Utility.nil_check(@hideElement)+"|"+GrabzIt::Utility.nil_check(@targetElement)+"|"+
-			GrabzIt::Utility.nil_check(@exportURL)+"|"+GrabzIt::Utility.nil_check(@waitForElement)+"|"+GrabzIt::Utility.nil_check(@encryptionKey)+"|"+
-			GrabzIt::Utility.b_to_str(@noAds)+"|"+GrabzIt::Utility.nil_check(@post)+"|"+GrabzIt::Utility.nil_int_check(@browserWidth)+"|"+
-			GrabzIt::Utility.nil_int_check(@height)+"|"+GrabzIt::Utility.nil_int_check(@width)+"|"+GrabzIt::Utility.nil_check(@templateVariables)
+			if(url != nil)
+				items.push(GrabzIt::Utility.nil_check(url))
+			end
+			
+			items.push(GrabzIt::Utility.nil_check(callBackURL),GrabzIt::Utility.nil_check(@customId),GrabzIt::Utility.b_to_str(@includeBackground),@pagesize ,@orientation,GrabzIt::Utility.nil_check(@customWaterMarkId),GrabzIt::Utility.b_to_str(@includeLinks),GrabzIt::Utility.b_to_str(@includeOutline),GrabzIt::Utility.nil_check(@title),GrabzIt::Utility.nil_check(@coverURL),GrabzIt::Utility.nil_int_check(@marginTop),GrabzIt::Utility.nil_int_check(@marginLeft),GrabzIt::Utility.nil_int_check(@marginBottom),GrabzIt::Utility.nil_int_check(@marginRight),GrabzIt::Utility.nil_int_check(@delay),GrabzIt::Utility.nil_int_check(@requestAs),GrabzIt::Utility.nil_check(@country),GrabzIt::Utility.nil_int_check(@quality),GrabzIt::Utility.nil_check(@templateId),GrabzIt::Utility.nil_check(@hideElement),GrabzIt::Utility.nil_check(@targetElement),GrabzIt::Utility.nil_check(@exportURL),GrabzIt::Utility.nil_check(@waitForElement),GrabzIt::Utility.nil_check(@encryptionKey),GrabzIt::Utility.b_to_str(@noAds),GrabzIt::Utility.nil_check(@post),GrabzIt::Utility.nil_int_check(@browserWidth),GrabzIt::Utility.nil_int_check(@height),GrabzIt::Utility.nil_int_check(@width),GrabzIt::Utility.nil_check(@templateVariables),GrabzIt::Utility.nil_check(@proxy))
+			
+			return items.join("|")
 		end
 		
 		# @!visibility private

data/lib/grabzit/tableoptions.rb

@@ -6,6 +6,7 @@ module GrabzIt
 	# @author GrabzIt
 	class TableOptions < BaseOptions
 		def initialize()
+			super()
 			@tableNumberToInclude = 1
 			@format = 'csv'
 			@includeHeaderNames = true
@@ -23,7 +24,7 @@ module GrabzIt
 		#
 		# @param value [Integer] the table number
 		# @return [void]		
-		def tableNumberToInclude(value)
+		def tableNumberToInclude=(value)
 			@tableNumberToInclude = value
 		end		
 		
@@ -36,7 +37,7 @@ module GrabzIt
 		#
 		# @param value [String] the format
 		# @return [void]		
-		def format(value)
+		def format=(value)
 			@format = value
 		end		
 		
@@ -49,7 +50,7 @@ module GrabzIt
 		#
 		# @param value [Boolean] include header names
 		# @return [void]		
-		def includeHeaderNames(value)
+		def includeHeaderNames=(value)
 			@includeHeaderNames = value
 		end		
 		
@@ -62,7 +63,7 @@ module GrabzIt
 		#
 		# @param value [Boolean] include all tables
 		# @return [void]		
-		def includeAllTables(value)
+		def includeAllTables=(value)
 			@includeAllTables = value
 		end		
 		
@@ -75,7 +76,7 @@ module GrabzIt
 		#
 		# @param value [String] target
 		# @return [void]		
-		def targetElement(value)
+		def targetElement=(value)
 			@targetElement = value
 		end		
 		
@@ -88,7 +89,7 @@ module GrabzIt
 		#
 		# @param value [Integer] the browser type
 		# @return [void]		
-		def requestAs(value)
+		def requestAs=(value)
 			@requestAs = value
 		end	
 
@@ -103,21 +104,15 @@ module GrabzIt
 		
 		# @!visibility private
 		def _getSignatureString(applicationSecret, callBackURL, url = nil)
-			urlParam = ''
-			if (url != nil)
-				urlParam = GrabzIt::Utility.nil_check(url)+"|"
-			end		
+			items = [applicationSecret]
 			
-			callBackURLParam = ''
-			if (callBackURL != nil)
-				callBackURLParam = GrabzIt::Utility.nil_check(callBackURL)
-			end					
-
-			return applicationSecret+"|"+ urlParam + callBackURLParam +
-			"|"+GrabzIt::Utility.nil_check(@customId)+"|"+GrabzIt::Utility.nil_int_check(@tableNumberToInclude)+"|"+GrabzIt::Utility.b_to_str(@includeAllTables)+
-			"|"+GrabzIt::Utility.b_to_str(@includeHeaderNames)+"|"+GrabzIt::Utility.nil_check(@targetElement)+"|"+GrabzIt::Utility.nil_check(@format)+"|"+
-			GrabzIt::Utility.nil_int_check(@requestAs)+"|"+GrabzIt::Utility.nil_check(@country)+"|"+GrabzIt::Utility.nil_check(@exportURL)+"|"+
-			GrabzIt::Utility.nil_check(@encryptionKey)+"|"+GrabzIt::Utility.nil_check(@post)
+			if(url != nil)
+				items.push(GrabzIt::Utility.nil_check(url))
+			end
+			
+			items.push(GrabzIt::Utility.nil_check(callBackURL),GrabzIt::Utility.nil_check(@customId),GrabzIt::Utility.nil_int_check(@tableNumberToInclude),GrabzIt::Utility.b_to_str(@includeAllTables),GrabzIt::Utility.b_to_str(@includeHeaderNames),GrabzIt::Utility.nil_check(@targetElement),GrabzIt::Utility.nil_check(@format),GrabzIt::Utility.nil_int_check(@requestAs),GrabzIt::Utility.nil_check(@country),GrabzIt::Utility.nil_check(@exportURL),GrabzIt::Utility.nil_check(@encryptionKey),GrabzIt::Utility.nil_check(@post),GrabzIt::Utility.nil_check(@proxy))
+			
+			return items.join("|")
 		end
 
 		# @!visibility private

data/test/test_grabzit.rb

@@ -120,7 +120,7 @@ class GrabzItTest < Test::Unit::TestCase
 	end		
 
 	def test_delete_watermark
-		assert_nothing_raised "An error occured when trying to add a watermark" do	
+		assert_nothing_raised "An error occured when trying to delete a watermark" do	
 			grabzItClient = GrabzIt::Client.new(@applicationKey, @applicationSecret)
 			begin
 				grabzItClient.delete_watermark(WaterMark_Identifier)
@@ -225,8 +225,8 @@ class GrabzItTest < Test::Unit::TestCase
 		assert_nothing_raised "An error occured when trying to take a pdf screenshot" do
 			grabzItClient = GrabzIt::Client.new(@applicationKey, @applicationSecret)
 			options = GrabzIt::PDFOptions.new()
-			options.hideElement(".ArevicoModal-bg,.ArevicoModal")
-			options.delay(30000)
+			options.hideElement = ".ArevicoModal-bg,.ArevicoModal"
+			options.delay = 30000
 			grabzItClient.url_to_pdf("http://www.itnews24hrs.com/2016/05/turnkey-lender/", options)
 			assert_not_nil(grabzItClient.save(), "Failed to take screenshot using test_take_pdf_hide_popup method")
 		end	
@@ -236,7 +236,7 @@ class GrabzItTest < Test::Unit::TestCase
 		assert_nothing_raised "An error occured when trying to take a image screenshot" do
 			grabzItClient = GrabzIt::Client.new(@applicationKey, @applicationSecret)
 			options = GrabzIt::ImageOptions.new()
-			options.customWaterMarkId("GrabzIt_Browser")
+			options.customWaterMarkId = "GrabzIt_Browser"
 			grabzItClient.url_to_image("http://www.google.com", options)
 			assert_not_nil(grabzItClient.save(), "Failed to take screenshot using url_to_image method")
 		end	
@@ -246,8 +246,8 @@ class GrabzItTest < Test::Unit::TestCase
 		assert_nothing_raised "An error occured when trying to take a image screenshot" do
 			grabzItClient = GrabzIt::Client.new(@applicationKey, @applicationSecret)
 			options = GrabzIt::ImageOptions.new()
-			options.hideElement(".ArevicoModal-bg,.ArevicoModal")
-			options.delay(30000)
+			options.hideElement = ".ArevicoModal-bg,.ArevicoModal"
+			options.delay = 30000
 			grabzItClient.url_to_image("http://www.itnews24hrs.com/2016/05/turnkey-lender/", options)
 			assert_not_nil(grabzItClient.save(), "Failed to take screenshot using test_take_image_hide_popup method")
 		end	

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grabzit
 version: !ruby/object:Gem::Version
-  version: 3.2.6
+  version: 3.2.8
 platform: ruby
 authors:
 - GrabzIt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-01 00:00:00.000000000 Z
+date: 2018-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake