grabzit 2.3.0 → 3.0.0

data/test/test_grabzit.rb

@@ -9,10 +9,10 @@ class GrabzItTest < Test::Unit::TestCase
 	Screenshot_Path = "test/tmp.jpg"
 
 	def setup
-		@applicationKey = "YOUR APPLICATION KEY"
-		@applicationSecret = "YOUR APPLICATION SECRET"
+		@applicationKey = "c3VwcG9ydEBncmFiei5pdA=="
+		@applicationSecret = "AD8/aT8/Pz8/Tz8/PwJ3Pz9sVSs/Pz8/Pz9DOzJodoi="
 		#Set to true if the account is subscribed
-		@isSubscribedAccount = false
+		@isSubscribedAccount = true
 	end
 	
 	def test_application_key
@@ -23,71 +23,52 @@ class GrabzItTest < Test::Unit::TestCase
 		assert_not_nil(@applicationSecret, "Please set your application secret variable in the setup method. You can get a application key for free from: http://grabz.it")
 	end
 
-	def test_take_picture
-		assert_nothing_raised "An error occured when trying to take a picture" do
+	def test_html_to_image
+		assert_nothing_raised "An error occured when trying to take convert HTML to a image" do
 			grabzItClient = GrabzIt::Client.new(@applicationKey, @applicationSecret)
-			assert_not_nil(grabzItClient.take_picture("http://www.google.com"), "Failed to take screenshot using depreceated method")
-		end	
+			grabzItClient.html_to_image("<h1>Hello world</h1>");
+			assert_not_equal(false, grabzItClient.save(), "HTML not converted")
+		end		
 	end
-	
-	def test_take_pdf
-		assert_nothing_raised "An error occured when trying to take a pdf screenshot" do
-			grabzItClient = GrabzIt::Client.new(@applicationKey, @applicationSecret)
-			grabzItClient.set_pdf_options("http://www.google.com")
-			assert_not_nil(grabzItClient.save(), "Failed to take screenshot using set_pdf_options method")
-		end	
-	end	
-	
-	def test_take_image
-		assert_nothing_raised "An error occured when trying to take a image screenshot" do
+
+	def test_html_to_pdf
+		assert_nothing_raised "An error occured when trying to take convert HTML to a pdf" do
 			grabzItClient = GrabzIt::Client.new(@applicationKey, @applicationSecret)
-			grabzItClient.set_image_options("http://www.google.com")
-			assert_not_nil(grabzItClient.save(), "Failed to take screenshot using set_image_options method")
-		end	
+			grabzItClient.html_to_pdf("<h1>Hello world</h1>");
+			assert_not_equal(false, grabzItClient.save(), "HTML not converted")
+		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
+	def test_save_to_bytes
+		assert_nothing_raised "An error occured when trying to take a image screenshot" 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")
+			grabzItClient.url_to_image("http://www.google.com")
+			val = grabzItClient.save_to();
+			assert_not_nil(val, "Screenshot not returned as bytes")
+			assert_not_equal(false, val, "An error occured attempting to save data to byte variable")
 		end	
 	end	
 	
-	def test_save_picture
-		if File.file?(Screenshot_Path)
-			File.delete(Screenshot_Path)
-		end
-		assert_nothing_raised "An error occured when trying to take a image screenshot" do
+	def test_save_table
+		assert_nothing_raised "An error occured when trying to extract a HTML table" do
 			grabzItClient = GrabzIt::Client.new(@applicationKey, @applicationSecret)
-			assert_equal(true, grabzItClient.save_picture("http://www.google.com", Screenshot_Path), "Screenshot not saved")
-			assert_equal(true, File.file?(Screenshot_Path), "Not saved screenshot file")
+			grabzItClient.url_to_table("http://grabz.it/api/php/advanced/errorhandling.aspx")
+			assert_not_nil(grabzItClient.save(), "Failed to take screenshot using url_to_table method")
 		end	
-		File.delete(Screenshot_Path)
-	end
+	end	
 	
 	def test_save_animation
 		assert_nothing_raised "An error occured when trying to take a animation" do
 			grabzItClient = GrabzIt::Client.new(@applicationKey, @applicationSecret)
-			grabzItClient.set_animation_options("http://www.youtube.com");
+			grabzItClient.url_to_animation("http://www.youtube.com");
 			assert_not_equal(false, grabzItClient.save(), "Animation not taken")
-		end
+		end		
 	end	
 	
-	def test_save_to_bytes
-		assert_nothing_raised "An error occured when trying to take a image screenshot" do
-			grabzItClient = GrabzIt::Client.new(@applicationKey, @applicationSecret)
-			grabzItClient.set_image_options("http://www.google.com")
-			val = grabzItClient.save_to();
-			assert_not_nil(val, "Screenshot not returned as bytes")
-			assert_not_equal(false, val, "An error occured attempting to save data to byte variable")
-		end	
-	end		
-	
 	def test_status
 		assert_nothing_raised "An error occured when trying to test the status method" do
 			grabzItClient = GrabzIt::Client.new(@applicationKey, @applicationSecret)
-			grabzItClient.set_image_options("http://www.google.com")
+			grabzItClient.url_to_image("http://www.google.com")
 			id = grabzItClient.save()
 			status = grabzItClient.get_status(id)
 			
@@ -223,4 +204,30 @@ class GrabzItTest < Test::Unit::TestCase
 		
 		return true
 	end	
+	
+	def test_take_pdf
+		assert_nothing_raised "An error occured when trying to take a pdf screenshot" do
+			grabzItClient = GrabzIt::Client.new(@applicationKey, @applicationSecret)
+			grabzItClient.url_to_pdf("http://www.google.com")
+			assert_not_nil(grabzItClient.save(), "Failed to take screenshot using url_to_pdf method")
+		end	
+	end	
+	
+	def test_take_image_options
+		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")
+			grabzItClient.url_to_image("http://www.google.com", options)
+			assert_not_nil(grabzItClient.save(), "Failed to take screenshot using set_image_options method")
+		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.url_to_image("\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		
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grabzit
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 3.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-15 00:00:00.000000000 Z
+date: 2016-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -27,11 +27,11 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Use GrabzIt to take PDF or image screenshots of websites. These screenshots
-  have highly customizable options include altering quality, delay, size, browser
-  type, geographic location and much more. Additionally GrabzIt can even convert HTML
-  tables on the web into a CSV or Excel spreadsheet. As well as enabling online video's
-  to be converted into animated GIF's.
+description: Use GrabzIt to take PDF or image screenshots of websites or convert HTML
+  to images or PDF's. These captures have highly customizable options include altering
+  quality, delay, size, browser type, geographic location and much more. Additionally
+  GrabzIt can even convert HTML tables on the web into a CSV or Excel spreadsheet.
+  As well as enabling online video's to be converted into animated GIF's.
 email: support@grabz.it
 executables: []
 extensions: []
@@ -44,6 +44,13 @@ files:
 - lib/grabzit/screenshotstatus.rb
 - lib/grabzit/watermark.rb
 - lib/grabzit/exception.rb
+- lib/grabzit/baseoptions.rb
+- lib/grabzit/utility.rb
+- lib/grabzit/animationoptions.rb
+- lib/grabzit/request.rb
+- lib/grabzit/tableoptions.rb
+- lib/grabzit/imageoptions.rb
+- lib/grabzit/pdfoptions.rb
 - test/test.png
 - test/test_grabzit.rb
 homepage: http://grabz.it/api/ruby
@@ -71,3 +78,4 @@ signing_key:
 specification_version: 3
 summary: GrabzIt Ruby Client
 test_files: []
+has_rdoc: