grabzit 2.2.0 → 2.2.1

data/lib/grabzit/client.rb

@@ -179,7 +179,7 @@ module GrabzIt
 				  raise GrabzItException.new("No screenshot parameters have been set.", GrabzItException::PARAMETER_MISSING_PARAMETERS)
 			end
 
-			sig = Digest::MD5.hexdigest(@@signaturePartOne+nil_check(callBackURL)+@@signaturePartTwo)
+			sig = encode(@@signaturePartOne+nil_check(callBackURL)+@@signaturePartTwo)
 			currentRequest = @@request
 			
 			currentRequest += CGI.escape(nil_check(callBackURL))+"&sig="+sig
@@ -278,7 +278,7 @@ module GrabzIt
 		# @return [Array<Cookie>] an array of cookies
 		# @raise [RuntimeError] if the GrabzIt service reports an error with the request it will be raised as a RuntimeError
 		def get_cookies(domain)
-			sig =  Digest::MD5.hexdigest(nil_check(@applicationSecret)+"|"+nil_check(domain))               
+			sig = encode(nil_check(@applicationSecret)+"|"+nil_check(domain))               
 
 			qs = "key=" +CGI.escape(nil_check(@applicationKey))+"&domain="+CGI.escape(nil_check(domain))+"&sig="+sig
 
@@ -316,7 +316,7 @@ module GrabzIt
 		# @return [Boolean] returns true if the cookie was successfully set
 		# @raise [RuntimeError] if the GrabzIt service reports an error with the request it will be raised as a RuntimeError
 		def set_cookie(name, domain, value = "", path = "/", httponly = false, expires = "")
-			sig =  Digest::MD5.hexdigest(nil_check(@applicationSecret)+"|"+nil_check(name)+"|"+nil_check(domain)+"|"+nil_check(value)+"|"+nil_check(path)+"|"+b_to_str(httponly)+"|"+nil_check(expires)+"|0")
+			sig = encode(nil_check(@applicationSecret)+"|"+nil_check(name)+"|"+nil_check(domain)+"|"+nil_check(value)+"|"+nil_check(path)+"|"+b_to_str(httponly)+"|"+nil_check(expires)+"|0")
 
 			qs = "key=" +CGI.escape(nil_check(@applicationKey))+"&domain="+CGI.escape(nil_check(domain))+"&name="+CGI.escape(nil_check(name))+"&value="+CGI.escape(nil_check(value))+"&path="+CGI.escape(nil_check(path))+"&httponly="+b_to_str(httponly)+"&expires="+CGI.escape(nil_check(expires))+"&sig="+sig
 
@@ -330,7 +330,7 @@ module GrabzIt
 		# @return [Boolean] returns true if the cookie was successfully set
 		# @raise [RuntimeError] if the GrabzIt service reports an error with the request it will be raised as a RuntimeError
 		def delete_cookie(name, domain)
-			sig =  Digest::MD5.hexdigest(nil_check(@applicationSecret)+"|"+nil_check(name)+"|"+nil_check(domain)+"|1")
+			sig = encode(nil_check(@applicationSecret)+"|"+nil_check(name)+"|"+nil_check(domain)+"|1")
 
 			qs = "key=" + CGI.escape(nil_check(@applicationKey))+"&domain="+CGI.escape(nil_check(domain))+"&name="+CGI.escape(nil_check(name))+"&delete=1&sig="+sig
 
@@ -369,7 +369,7 @@ module GrabzIt
 			if !File.file?(path)
 				raise "File: " + path + " does not exist"
 			end
-			sig =  Digest::MD5.hexdigest(nil_check(@applicationSecret)+"|"+nil_check(identifier)+"|"+nil_int_check(xpos)+"|"+nil_int_check(ypos));
+			sig = encode(nil_check(@applicationSecret)+"|"+nil_check(identifier)+"|"+nil_int_check(xpos)+"|"+nil_int_check(ypos));
 
 			boundary = '--------------------------'+Time.now.to_f.to_s
 
@@ -421,7 +421,7 @@ 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 =  Digest::MD5.hexdigest(nil_check(@applicationSecret)+"|"+nil_check(identifier))               
+			sig = encode(nil_check(@applicationSecret)+"|"+nil_check(identifier))               
 
 			qs = "key=" +CGI.escape(nil_check(@applicationKey))+"&identifier="+CGI.escape(nil_check(identifier))+"&sig="+sig
 
@@ -480,7 +480,7 @@ module GrabzIt
 
 		private
 		def get_watermarks(identifier = nil)
-			sig =  Digest::MD5.hexdigest(nil_check(@applicationSecret)+"|"+nil_check(identifier))               
+			sig = encode(nil_check(@applicationSecret)+"|"+nil_check(identifier))               
 
 			qs = "key=" +CGI.escape(nil_check(@applicationKey))+"&identifier="+CGI.escape(nil_check(identifier))+"&sig="+sig
 
@@ -564,6 +564,11 @@ module GrabzIt
 			end			
 		end
 
+		private
+		def encode(text)
+			return Digest::MD5.hexdigest(text.encode('ascii', {:invalid => :replace, :undef => :replace, :replace => '?'}))			
+		end
+
 		private 
 		def get_result_value(result, field)
 			doc = REXML::Document.new(result)

data/test/test_grabzit.rb

@@ -9,10 +9,10 @@ class GrabzItTest < Test::Unit::TestCase
 	Screenshot_Path = "test/tmp.jpg"
 
 	def setup
-		@applicationKey = "c3VwcG9ydEBncmFiei5pdA=="
-		@applicationSecret = "AD8/aT8/Pz8/Tz8/PwJ3Pz9sVSs/Pz8/Pz9DOzJodoi="
+		@applicationKey = "YOUR APPLICATION KEY"
+		@applicationSecret = "YOUR APPLICATION SECRET"
 		#Set to true if the account is subscribed
-		@isSubscribedAccount = true
+		@isSubscribedAccount = false
 	end
 	
 	def test_application_key
@@ -46,6 +46,14 @@ class GrabzItTest < Test::Unit::TestCase
 		end	
 	end
 	
+	def test_take_unicode_url_image
+		assert_nothing_raised "An error occured when trying to take a image screenshot with a unicode URL" do
+			grabzItClient = GrabzIt::Client.new(@applicationKey, @applicationSecret)
+			grabzItClient.set_image_options("\u0068\u0074\u0074\u0070\u003a\u002f\u002f\u0066\u006f\u0072\u0075\u006d\u002e\u0074\u0068\u0061\u0069\u007a\u0061\u002e\u0063\u006f\u006d\u002f\u0074\u0065\u0063\u0068\u006e\u006f\u006c\u006f\u0067\u0079\u002f\u004e\u0065\u0064\u0061\u0061\u002d\u0e08\u0e31\u0e1a\u0e21\u0e37\u0e2d\u002d\u0048\u0079\u0074\u0065\u0072\u0061\u002d\u0e43\u0e2b\u0e49\u0e1a\u0e23\u0e34\u0e01\u0e32\u0e23\u0e23\u0e30\u0e1a\u0e1a\u0e27\u0e34\u0e17\u0e22\u0e38\u0e21\u0e32\u0e15\u0e23\u0e10\u0e32\u0e19\u002d\u0054\u0045\u0054\u0052\u0041\u002d\u0e23\u0e30\u0e14\u0e31\u0e1a\u0e40\u0e27\u0e34\u0e25\u0e14\u0e4c\u0e04\u0e25\u0e32\u0e2a\u0e2a\u0e33\u0e2b\u0e23\u0e31\u0e1a\u0e01\u0e32\u002f\u0036\u0033\u0037\u0037\u0035\u0037\u002f".encode('utf-8'))
+			assert_not_nil(grabzItClient.save(), "Failed to take screenshot or a unicode URL")
+		end	
+	end	
+	
 	def test_save_picture
 		if File.file?(Screenshot_Path)
 			File.delete(Screenshot_Path)

metadata

@@ -1,30 +1,33 @@
 --- !ruby/object:Gem::Specification
 name: grabzit
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
+  prerelease: 
 platform: ruby
 authors:
 - GrabzIt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-12 00:00:00.000000000 Z
+date: 2015-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: 'Automatically create screenshots of website for free, with GrabzIt.
+description: ! 'Automatically create screenshots of website for free, with GrabzIt.
   Screenshots can be output in a variety of formats including: JPEG, PNG, TIFF, BMP,
   PDF, CSV and XLSX. Additionally GrabzIt allows you to convert online videos into
   animated GIF''s.'
@@ -44,26 +47,26 @@ files:
 - test/test_grabzit.rb
 homepage: http://grabz.it/api/ruby
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 1.8.29
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: GrabzIt Ruby Client
 test_files: []
-has_rdoc: 

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 17e5e690195e3db9e04ddb68b01c8452d9e78ef9
-  data.tar.gz: 62c853dc8b70e06b8037839cad0d49ff0b22b304
-SHA512:
-  metadata.gz: f4504960048214f2855de361bf232b0910ec25b728e6d230392444cda73cf035dc38f3ec85293346ed2f6be0f84659ed5bd78744dbdb5247d560463a081e5e6f
-  data.tar.gz: 82b9b8811d5606238ffbeb4b5ae128856f6a7c9f7a02c9be3c0925e679dd31f470b41eb556efe7b7d59a9b29cb93e0274b4a7aa3a3ef08e6abdc5e4eb475fc4b