grabzit 3.2.8 → 3.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a3201c51d99c10fd1c9df9b98cf71505776fd71
-  data.tar.gz: 0f835d0e1887efb9a9f3002f888f55ed9897e55e
+  metadata.gz: 76cc861e18d34ce5d293d571eab65aa501d1627f
+  data.tar.gz: 57ebe5f88d909985f2dc9ec5851adcbaef421031
 SHA512:
-  metadata.gz: cc3aec7572f02f292eee573350fe583c41f4c9ffacdf50906da93ed16a4e8b86717307c5e22c672ac537d32ebd5b089fd8d03921158936719f1c060e4da85d7a
-  data.tar.gz: 36e8e0ad000d09ab7553595b9828668084785fda0cb76020a389cbd71eef0c2e03a09634d06513592c25d1eeee8f8abbb39f65663df06efa5b98d4ce597b68e1
+  metadata.gz: cbac9c7027154248d9f0d36c707517a6825b389d4b69a46a3980f2ef2c48ad04ebacd477e9b9eb0e5cd944d3c621465a3334c17f433dcdc2641c1190072fddd8
+  data.tar.gz: 625cdbac7eb70db79e4c08e11f1d08d1e2efb30414a53e0b7c9e6c0ea9ba1bd99d7d4fb44671e67ffe121af1eb60c29b46c12227677b3ee95f55a43432243b3b

data/lib/grabzit/docxoptions.rb

@@ -28,6 +28,7 @@ module GrabzIt
 			@height = nil
 			@templateId = nil
 			@targetElement = nil
+			@mergeId = nil
 		end
 		
 		# @return [Boolean] true if the background images of the web page should be included in the DOCX
@@ -292,6 +293,19 @@ module GrabzIt
 			@waitForElement = value
 		end
 
+		# @return [String] get the ID of a capture that should be merged at the beginning of the new DOCX document
+		def mergeId
+			@mergeId
+		end
+		
+		# Set the ID of a capture that should be merged at the beginning of the new DOCX document
+		#
+		# @param value [String] the merge ID
+		# @return [void]		
+		def mergeId=(value)
+			@mergeId = value
+		end
+		
 		# @return [Boolean] get if adverts should be automatically hidden
 		def noAds
 			@noAds
@@ -330,7 +344,7 @@ module GrabzIt
 				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))
+			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),GrabzIt::Utility.nil_check(@mergeId))
 			return items.join("|")
 		end
 		
@@ -360,6 +374,7 @@ module GrabzIt
 			params['width'] = GrabzIt::Utility.nil_int_check(@width)
 			params['height'] = GrabzIt::Utility.nil_int_check(@height)
 			params['tvars'] = GrabzIt::Utility.nil_check(@templateVariables)
+			params['mergeid'] = GrabzIt::Utility.nil_check(@mergeId)
 			
 			return params;
 		end		

data/lib/grabzit/pdfoptions.rb

@@ -30,6 +30,7 @@ module GrabzIt
 			@templateVariables = nil
 			@width = nil
 			@height = nil
+			@mergeId = nil
 		end
 		
 		# @return [Boolean] true if the background of the web page should be included in the PDF
@@ -318,7 +319,20 @@ module GrabzIt
 		# @return [void]		
 		def waitForElement=(value)
 			@waitForElement = value
-		end		
+		end
+		
+		# @return [String] get the ID of a capture that should be merged at the beginning of the new PDF document
+		def mergeId
+			@mergeId
+		end
+		
+		# Set the ID of a capture that should be merged at the beginning of the new PDF document
+		#
+		# @param value [String] the merge ID
+		# @return [void]		
+		def mergeId=(value)
+			@mergeId = value
+		end
 		
 		# @return [Boolean] get if adverts should be automatically hidden
 		def noAds
@@ -358,7 +372,7 @@ module GrabzIt
 				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))
+			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),GrabzIt::Utility.nil_check(@mergeId))
 			
 			return items.join("|")
 		end
@@ -391,6 +405,7 @@ module GrabzIt
 			params['width'] = GrabzIt::Utility.nil_int_check(@width)
 			params['height'] = GrabzIt::Utility.nil_int_check(@height)
 			params['tvars'] = GrabzIt::Utility.nil_check(@templateVariables)
+			params['mergeid'] = GrabzIt::Utility.nil_check(@mergeId)
 			
 			return params;
 		end		

metadata

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