grabzit 3.1.1 → 3.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjE1ZGZiMzE3NmRjMzY2MzJkZmRlNzE1MjRiOGQxNGJlN2Q1MDIwYQ==
+    YmRiZjBkODBkNjYxOTVhMzg3ZTI3NDM1MjY4NDEwYjcxNjkwNWM5Ng==
   data.tar.gz: !binary |-
-    YjI1ZTEzZWU4M2VhM2U0NWVkMDAwZDE0YzdmMTM2ZDkzMTIwYWMzNA==
+    MmMyN2FiMGJiNjEyZWEzOGZlYzVlN2FhZTA4YjQ5NGQwOTcwNjNiZg==
 SHA512:
   metadata.gz: !binary |-
-    ZDMzOTFhMmY0ZDUwMDgzMDA4ZTY4NjEzMGVlMTNkNTg3MTg1Y2M0ODE0Zjky
-    NmFjZWUwZDliNjkxMzhmYmYxYjE1MGY1NDg2ZDM2YmRiMzg3NDA4OGQ4MmNj
-    ZjA3OTdkNzRkMWI4M2NhM2Q2YmQ0YzhmM2FmMzdiYjVjNmFmYjg=
+    YjA1YzU2NjcyNDdmYjgzMzhkMTVkNTQyZTM0ZjY2MGQ0NTdhNTMzYTA2NWJk
+    ZjQwNTViMzk0NDFjNmE2NWE2MDBlNjFhMTBmMTcwMzZmOTk4ODk0MjhjNTAx
+    ZWIzNWFmODNiNmFlMGZlZjIwM2EzMzE2ZGE1ZjMxMDhjNDM2NjU=
   data.tar.gz: !binary |-
-    MDQ1YzY2YzU5YjA5ZGYyMjZjZWZhZTI0NGQ1Yjk0MmUzZDI4MmFmNWVlMmFl
-    NDUxZWU2ODA0YzQ3ZjRlMThiZjBmODEwMjkwZDM5ZGY5NzJjMzQxYTNmZmQ1
-    M2QyOTQwNWRiYjhhMWY2MjViOTdkMzczMWU4NTVmOGVmNTA0NDI=
+    ZTEwMWY2Y2VmYTNjNGI4ODIxOGQ1MjFhZWQ1NmNjZDQ1Y2NjOWI3YzJkNzNk
+    ZmY0OTk3YTdlN2Y2ODQzNmVjMTY1MjllMGZlZTMxYjJhMDJmNmMzZmYwYjBi
+    Y2Q2N2NlYWNlNTcyODJiOTNhY2FlNGViMDk2NGQ0ZjFhYzU2MGQ=

data/lib/grabzit/animationoptions.rb

@@ -9,7 +9,7 @@ module GrabzIt
 			@width = 0
 			@height = 0
 			@start = 0
-			@duration = 0
+			@duration = 1
 			@speed = 0
 			@framesPerSecond = 0
 			@repeat = 0
@@ -164,7 +164,8 @@ module GrabzIt
 			"|"+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(@customWaterMarkId)+"|"+GrabzIt::Utility.nil_check(@country)+"|"+GrabzIt::Utility.nil_int_check(@quality)+
+			"|"+GrabzIt::Utility.nil_check(@exportURL)
 		end		
 
 		# @!visibility private

data/lib/grabzit/baseoptions.rb

@@ -6,6 +6,7 @@ module GrabzIt
 		def initialize()
 			@customId = nil
 			@country = nil
+			@exportURL = nil
 			@delay = nil
 		end	
 		
@@ -27,13 +28,26 @@ module GrabzIt
 			@country
 		end
 
-		# Set the country the capture should be created from: Default = "", UK = "UK", US = "US".
+		# Set the country the capture should be created from: Default = "", Singapore = "SG", UK = "UK", US = "US".
 		#
 		# @param value [String] the country to use
 		# @return [void]				
 		def country(value)
 			@country = value
-		end		
+		end
+		
+		# @return [String] the export URL that should be used to transfer the capture to a third party location.
+		def exportURL
+			@exportURL
+		end
+
+		# Set the export URL that should be used to transfer the capture to a third party location
+		#
+		# @param value [String] export URL to use
+		# @return [void]				
+		def exportURL(value)
+			@exportURL = value
+		end
 		
 		# @!visibility private
 		def startDelay
@@ -46,12 +60,13 @@ module GrabzIt
 		protected
 		def createParameters(applicationKey, sig, callBackURL, dataName, dataValue)
 			params = Hash.new
-			params['key'] = GrabzIt::Utility.nil_check(applicationKey);
-			params['country'] = GrabzIt::Utility.nil_check(@country);
-			params['customid'] = GrabzIt::Utility.nil_check(@customId);
-			params['callback'] = GrabzIt::Utility.nil_check(callBackURL);
-			params['sig'] = sig;		
-			params[dataName] = GrabzIt::Utility.nil_check(dataValue);	
+			params['key'] = GrabzIt::Utility.nil_check(applicationKey)
+			params['country'] = GrabzIt::Utility.nil_check(@country)
+			params['customid'] = GrabzIt::Utility.nil_check(@customId)
+			params['callback'] = GrabzIt::Utility.nil_check(callBackURL)
+			params['export'] = GrabzIt::Utility.nil_check(@exportURL)
+			params['sig'] = sig
+			params[dataName] = GrabzIt::Utility.nil_check(dataValue)
 
 			return params
 		end

data/lib/grabzit/client.rb

@@ -30,9 +30,9 @@ module GrabzIt
 	# @see http://grabz.it/api/ruby/ GrabzIt Ruby API
 	class Client
 
-		WebServicesBaseURLGet = "http://api.grabz.it/services/"
+		WebServicesBaseURLGet = "://api.grabz.it/services/"
 		private_constant :WebServicesBaseURLGet	
-		WebServicesBaseURLPost = "http://grabz.it/services/"
+		WebServicesBaseURLPost = "://grabz.it/services/"
 		private_constant :WebServicesBaseURLPost
 		TakePicture = "takepicture.ashx"	
 		private_constant :TakePicture
@@ -53,6 +53,7 @@ module GrabzIt
 		def initialize(applicationKey, applicationSecret)
 			@applicationKey = applicationKey
 			@applicationSecret = applicationSecret
+			@protocol = 'http'
 		end
 
 		# This method specifies the URL of the online video that should be converted into a animated GIF
@@ -66,7 +67,7 @@ module GrabzIt
 				options = AnimationOptions.new()
 			end
 		
-			@request = Request.new(WebServicesBaseURLGet + "takeanimation.ashx", false, options, url)
+			@request = Request.new(@protocol + WebServicesBaseURLGet + "takeanimation.ashx", false, options, url)
 			return nil
 		end
 
@@ -81,7 +82,7 @@ module GrabzIt
 				options = ImageOptions.new()
 			end
 		
-			@request = Request.new(WebServicesBaseURLGet + TakePicture, false, options, url)
+			@request = Request.new(@protocol + WebServicesBaseURLGet + TakePicture, false, options, url)
 			return nil
 		end
 
@@ -96,7 +97,7 @@ module GrabzIt
 				options = ImageOptions.new()
 			end
 		
-			@request = Request.new(WebServicesBaseURLPost + TakePicture, true, options, html)
+			@request = Request.new(@protocol + WebServicesBaseURLPost + TakePicture, true, options, html)
 			return nil
 		end		
 
@@ -120,7 +121,7 @@ module GrabzIt
 				options = TableOptions.new()
 			end
 		
-			@request = Request.new(WebServicesBaseURLGet + TakeTable, false, options, url)
+			@request = Request.new(@protocol + WebServicesBaseURLGet + TakeTable, false, options, url)
 			return nil			
 		end	
 		
@@ -135,7 +136,7 @@ module GrabzIt
 				options = TableOptions.new()
 			end
 		
-			@request = Request.new(WebServicesBaseURLPost + TakeTable, true, options, html)
+			@request = Request.new(@protocol + WebServicesBaseURLPost + TakeTable, true, options, html)
 			return nil
 		end		
 
@@ -159,7 +160,7 @@ module GrabzIt
 				options = PDFOptions.new()
 			end
 		
-			@request = Request.new(WebServicesBaseURLGet + TakePDF, false, options, url)
+			@request = Request.new(@protocol + WebServicesBaseURLGet + TakePDF, false, options, url)
 			return nil			
 		end	
 		
@@ -174,7 +175,7 @@ module GrabzIt
 				options = PDFOptions.new()
 			end
 		
-			@request = Request.new(WebServicesBaseURLPost + TakePDF, true, options, html)
+			@request = Request.new(@protocol + WebServicesBaseURLPost + TakePDF, true, options, html)
 			return nil
 		end		
 
@@ -198,7 +199,7 @@ module GrabzIt
 				options = DOCXOptions.new()
 			end
 		
-			@request = Request.new(WebServicesBaseURLGet + TakeDOCX, false, options, url)
+			@request = Request.new(@protocol + WebServicesBaseURLGet + TakeDOCX, false, options, url)
 			return nil			
 		end	
 		
@@ -213,7 +214,7 @@ module GrabzIt
 				options = DOCXOptions.new()
 			end
 		
-			@request = Request.new(WebServicesBaseURLPost + TakeDOCX, true, options, html)
+			@request = Request.new(@protocol + WebServicesBaseURLPost + TakeDOCX, true, options, html)
 			return nil
 		end		
 
@@ -316,7 +317,7 @@ module GrabzIt
 				return nil
 			end			
 			
-			result = get(WebServicesBaseURLGet + "getstatus.ashx?id=" + GrabzIt::Utility.nil_check(id))
+			result = get(@protocol + WebServicesBaseURLGet + "getstatus.ashx?id=" + GrabzIt::Utility.nil_check(id))
 
 			doc = REXML::Document.new(result)
 
@@ -338,7 +339,7 @@ module GrabzIt
 				return nil
 			end
 			
-			return get(WebServicesBaseURLGet + "getfile.ashx?id=" + GrabzIt::Utility.nil_check(id))
+			return get(@protocol + WebServicesBaseURLGet + "getfile.ashx?id=" + GrabzIt::Utility.nil_check(id))
 		end
 
 		# Get all the cookies that GrabzIt is using for a particular domain. This may include your user set cookies as well
@@ -351,7 +352,7 @@ module GrabzIt
 
 			qs = "key=" +CGI.escape(GrabzIt::Utility.nil_check(@applicationKey))+"&domain="+CGI.escape(GrabzIt::Utility.nil_check(domain))+"&sig="+sig
 
-			result = get(WebServicesBaseURLGet + "getcookies.ashx?" + qs)
+			result = get(@protocol + WebServicesBaseURLGet + "getcookies.ashx?" + qs)
 
 			doc = REXML::Document.new(result)
 
@@ -393,7 +394,7 @@ module GrabzIt
 			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
 
-			return (get_result_value(get(WebServicesBaseURLGet + "setcookie.ashx?" + qs), "Result") == TrueString)
+			return (get_result_value(get(@protocol + WebServicesBaseURLGet + "setcookie.ashx?" + qs), "Result") == TrueString)
 		end
 
 		# Delete a custom cookie or block a global cookie from being used
@@ -409,7 +410,7 @@ module GrabzIt
 			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
 
-			return (get_result_value(get(WebServicesBaseURLGet + "setcookie.ashx?" + qs), "Result") == TrueString)
+			return (get_result_value(get(@protocol + WebServicesBaseURLGet + "setcookie.ashx?" + qs), "Result") == TrueString)
 		end
 
 		# Get your uploaded custom watermark
@@ -449,7 +450,7 @@ module GrabzIt
 
 			boundary = '--------------------------'+Time.now.to_f.to_s
 
-			url = "http://grabz.it/services/addwatermark.ashx"
+			url = @protocol + "://grabz.it/services/addwatermark.ashx"
 			uri = URI.parse(url)
 
 			file = File.open(path, "rb")
@@ -485,7 +486,7 @@ module GrabzIt
 			request.content_type = "multipart/form-data, boundary="+boundary
 			request.body = post_body.join
 
-			response = Net::HTTP.new(uri.host, uri.port).start {|http| http.request(request) }	
+			response = Net::HTTP.new(uri.host, uri.port, :use_ssl => uri.scheme == 'https').start {|http| http.request(request) }	
 			response_check(response)
 
 			return (get_result_value(response.body(), "Result") == TrueString)		
@@ -501,8 +502,19 @@ module GrabzIt
 
 			qs = "key=" +CGI.escape(GrabzIt::Utility.nil_check(@applicationKey))+"&identifier="+CGI.escape(GrabzIt::Utility.nil_check(identifier))+"&sig="+sig
 
-			return (get_result_value(get(WebServicesBaseURLGet + "deletewatermark.ashx?" + qs), "Result") == TrueString)
-		end	
+			return (get_result_value(get(@protocol + WebServicesBaseURLGet + "deletewatermark.ashx?" + qs), "Result") == TrueString)
+		end
+
+		# This method sets if requests to GrabzIt's API should use SSL or not
+		#
+		# @param value [Boolean] true if should use SSL
+		def use_ssl(value)
+			if value
+				@protocol = 'https'
+			else
+				@protocol = 'http'
+			end
+		end
 
 		private
 		def get_watermarks(identifier = nil)
@@ -510,7 +522,7 @@ module GrabzIt
 
 			qs = "key=" +CGI.escape(GrabzIt::Utility.nil_check(@applicationKey))+"&identifier="+CGI.escape(GrabzIt::Utility.nil_check(identifier))+"&sig="+sig
 
-			result = get(WebServicesBaseURLGet + "getwatermarks.ashx?" + qs)
+			result = get(@protocol + WebServicesBaseURLGet + "getwatermarks.ashx?" + qs)
 
 			doc = REXML::Document.new(result)
 
@@ -530,16 +542,16 @@ module GrabzIt
 		private
 		def get(url)
 			uri = URI.parse(url)
-			response = Net::HTTP.start(uri.host, uri.port) { |http| http.get(uri.request_uri) }
+			response = Net::HTTP.start(uri.host, uri.port, :use_ssl => uri.scheme == 'https') { |http| http.get(uri.request_uri) }
 			response_check(response)
 			return response.body
 		end
 		
 		private
 		def post(url, params)
-			headers = {'Content-Type' => 'application/x-www-form-urlencoded'}	
+			headers = {'Content-Type' => 'application/x-www-form-urlencoded'}
 			uri = URI.parse(url)
-			response = Net::HTTP.start(uri.host, uri.port) { |http| http.post(uri.request_uri, params, headers) }
+			response = Net::HTTP.start(uri.host, uri.port, :use_ssl => uri.scheme == 'https') { |http| http.post(uri.request_uri, params, headers) }
 			response_check(response)
 			return response.body
 		end		

data/lib/grabzit/docxoptions.rb

@@ -19,6 +19,7 @@ module GrabzIt
 			@requestAs = 0
 			@quality = -1
 			@hideElement = nil
+			@waitForElement = nil
 		end
 		
 		# @return [Boolean] true if the background images of the web page should be included in the DOCX
@@ -203,7 +204,20 @@ module GrabzIt
 		# @return [void]		
 		def hideElement(value)
 			@hideElement = value
-		end		
+		end
+		
+		# @return [String] get the CSS selector of the HTML element in the web page that must be visible before the capture is performed
+		def waitForElement
+			@waitForElement
+		end
+		
+		# Set the CSS selector of the HTML element in the web page that must be visible before the capture is performed
+		#
+		# @param value [String] the element to wait for
+		# @return [void]		
+		def waitForElement(value)
+			@waitForElement = value
+		end
 		
 		# @!visibility private
 		def _getSignatureString(applicationSecret, callBackURL, url = nil)
@@ -222,7 +236,7 @@ module GrabzIt
 			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_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)      
 		end
 		
 		# @!visibility private
@@ -242,6 +256,7 @@ module GrabzIt
 			params['requestmobileversion'] = GrabzIt::Utility.nil_int_check(@requestAs)		
 			params['quality'] = GrabzIt::Utility.nil_int_check(@quality)
 			params['hide'] = GrabzIt::Utility.nil_check(@hideElement)
+			params['waitfor'] = GrabzIt::Utility.nil_check(@waitForElement)
 			
 			return params;
 		end		

data/lib/grabzit/exception.rb

@@ -64,6 +64,8 @@ module GrabzIt
 		PARAMETER_INVALID_TARGET_VALUE = 165
 		PARAMETER_INVALID_HIDE_VALUE = 166
 		PARAMETER_INVALID_INCLUDE_IMAGES = 167
+		PARAMETER_INVALID_EXPORT_URL = 168
+		PARAMETER_INVALID_WAIT_FOR_VALUE = 169
 		NETWORK_SERVER_OFFLINE = 200
 		NETWORK_GENERAL_ERROR = 201
 		NETWORK_DDOS_ATTACK = 202

data/lib/grabzit/imageoptions.rb

@@ -13,6 +13,7 @@ module GrabzIt
 			@format = nil
 			@targetElement = nil
 			@hideElement = nil
+			@waitForElement = nil
 			@requestAs = 0
 			@customWaterMarkId = nil
 			@quality = -1
@@ -122,6 +123,19 @@ module GrabzIt
 			@hideElement = value
 		end
 		
+		# @return [String] get the CSS selector of the HTML element in the web page that must be visible before the capture is performed
+		def waitForElement
+			@waitForElement
+		end
+		
+		# Set the CSS selector of the HTML element in the web page that must be visible before the capture is performed
+		#
+		# @param value [String] the element to wait for
+		# @return [void]		
+		def waitForElement(value)
+			@waitForElement = value
+		end		
+		
 		# @return [Integer] get which user agent type should be used
 		def requestAs
 			@requestAs
@@ -176,7 +190,7 @@ module GrabzIt
 			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(@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)  
 		end
 	
 		# @!visibility private
@@ -191,6 +205,7 @@ module GrabzIt
 			params['delay'] = GrabzIt::Utility.nil_int_check(@delay)
 			params['target'] = GrabzIt::Utility.nil_check(@targetElement)
 			params['hide'] = GrabzIt::Utility.nil_check(@hideElement)
+			params['waitfor'] = GrabzIt::Utility.nil_check(@waitForElement)
 			params['requestmobileversion'] = GrabzIt::Utility.nil_int_check(@requestAs)		
 			params['quality'] = GrabzIt::Utility.nil_int_check(@quality)
 			

data/lib/grabzit/pdfoptions.rb

@@ -21,7 +21,9 @@ module GrabzIt
 			@templateId = nil
 			@customWaterMarkId = nil
 			@quality = -1
+			@targetElement = nil
 			@hideElement = nil
+			@waitForElement = nil
 		end
 		
 		# @return [Boolean] true if the background of the web page should be included in the PDF
@@ -234,6 +236,19 @@ module GrabzIt
 			@quality = value
 		end
 		
+		# @return [String] get the CSS selector of the only HTML element in the web page to capture
+		def targetElement
+			@targetElement
+		end
+		
+		# Set the CSS selector of the only HTML element in the web page to capture
+		#
+		# @param value [String] the target element
+		# @return [void]		
+		def targetElement(value)
+			@targetElement = value
+		end
+		
 		# @return [String] get the CSS selector(s) of the one or more HTML elements in the web page to hide
 		def hideElement
 			@hideElement
@@ -245,6 +260,19 @@ module GrabzIt
 		# @return [void]		
 		def hideElement(value)
 			@hideElement = value
+		end
+		
+		# @return [String] get the CSS selector of the HTML element in the web page that must be visible before the capture is performed
+		def waitForElement
+			@waitForElement
+		end
+		
+		# Set the CSS selector of the HTML element in the web page that must be visible before the capture is performed
+		#
+		# @param value [String] the element to wait for
+		# @return [void]		
+		def waitForElement(value)
+			@waitForElement = value
 		end		
 		
 		# @!visibility private
@@ -264,7 +292,7 @@ module GrabzIt
 			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_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)  
 		end
 		
 		# @!visibility private
@@ -286,7 +314,9 @@ module GrabzIt
 			params['delay'] = GrabzIt::Utility.nil_int_check(@delay)
 			params['requestmobileversion'] = GrabzIt::Utility.nil_int_check(@requestAs)		
 			params['quality'] = GrabzIt::Utility.nil_int_check(@quality)
+			params['target'] = GrabzIt::Utility.nil_check(@targetElement)
 			params['hide'] = GrabzIt::Utility.nil_check(@hideElement)
+			params['waitfor'] = GrabzIt::Utility.nil_check(@waitForElement)
 			
 			return params;
 		end		

data/lib/grabzit/tableoptions.rb

@@ -107,7 +107,7 @@ module GrabzIt
 			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_int_check(@requestAs)+"|"+GrabzIt::Utility.nil_check(@country)+"|"+GrabzIt::Utility.nil_check(@exportURL)
 		end
 
 		# @!visibility private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grabzit
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.2.0
 platform: ruby
 authors:
 - GrabzIt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-11 00:00:00.000000000 Z
+date: 2017-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -71,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: GrabzIt Ruby Client