grabzit 2.0.2 → 2.1.0

data/lib/grabzit/cookie.rb

@@ -1,6 +1,6 @@
 module GrabzIt
 	# This class represents the cookies stored in GrabzIt
-	# @version 2.0
+	# @version 2.1
 	# @author GrabzIt
 	class Cookie
 		# @api private

data/lib/grabzit/exception.rb

@@ -0,0 +1,75 @@
+module GrabzIt
+	# This class represents the exceptions thrown by GrabzIt
+	# @version 2.1
+	# @author GrabzIt
+	class GrabzItException < Exception
+		
+		SUCCESS = 0
+		PARAMETER_NO_URL = 100
+		PARAMETER_INVALID_URL = 101
+		PARAMETER_NON_EXISTANT_URL = 102
+		PARAMETER_MISSING_APPLICATION_KEY = 103
+		PARAMETER_UNRECOGNISED_APPLICATION_KEY = 104
+		PARAMETER_MISSING_SIGNATURE = 105
+		PARAMETER_INVALID_SIGNATURE = 106
+		PARAMETER_INVALID_FORMAT = 107
+		PARAMETER_INVALID_COUNTRY_CODE = 108
+		PARAMETER_DUPLICATE_IDENTIFIER = 109
+		PARAMETER_MATCHING_RECORD_NOT_FOUND = 110
+		PARAMETER_INVALID_CALLBACK_URL = 111
+		PARAMETER_NON_EXISTANT_CALLBACK_URL = 112
+		PARAMETER_IMAGE_WIDTH_TOO_LARGE = 113
+		PARAMETER_IMAGE_HEIGHT_TOO_LARGE = 114
+		PARAMETER_BROWSER_WIDTH_TOO_LARGE = 115
+		PARAMETER_BROWSER_HEIGHT_TOO_LARGE = 116
+		PARAMETER_DELAY_TOO_LARGE = 117
+		PARAMETER_INVALID_BACKGROUND = 118
+		PARAMETER_INVALID_INCLUDE_LINKS = 119
+		PARAMETER_INVALID_INCLUDE_OUTLINE = 120
+		PARAMETER_INVALID_PAGE_SIZE = 121
+		PARAMETER_INVALID_PAGE_ORIENTATION = 122
+		PARAMETER_VERTICAL_MARGIN_TOO_LARGE = 123
+		PARAMETER_HORIZONTAL_MARGIN_TOO_LARGE = 124
+		PARAMETER_INVALID_COVER_URL = 125
+		PARAMETER_NON_EXISTANT_COVER_URL = 126
+		PARAMETER_MISSING_COOKIE_NAME = 127
+		PARAMETER_MISSING_COOKIE_DOMAIN = 128
+		PARAMETER_INVALID_COOKIE_NAME = 129
+		PARAMETER_INVALID_COOKIE_DOMAIN = 130
+		PARAMETER_INVALID_COOKIE_DELETE = 131
+		PARAMETER_INVALID_COOKIE_HTTP = 132
+		PARAMETER_INVALID_COOKIE_EXPIRY = 133
+		PARAMETER_INVALID_CACHE_VALUE = 134
+		PARAMETER_INVALID_DOWNLOAD_VALUE = 135
+		PARAMETER_INVALID_SUPPRESS_VALUE = 136
+		PARAMETER_MISSING_WATERMARK_IDENTIFIER = 137
+		PARAMETER_INVALID_WATERMARK_IDENTIFIER = 138
+		PARAMETER_INVALID_WATERMARK_XPOS = 139
+		PARAMETER_INVALID_WATERMARK_YPOS = 140
+		PARAMETER_MISSING_WATERMARK_FORMAT = 141
+		PARAMETER_WATERMARK_TOO_LARGE = 142
+		PARAMETER_MISSING_PARAMETERS = 143
+		PARAMETER_QUALITY_TOO_LARGE = 144
+		PARAMETER_QUALITY_TOO_SMALL = 145
+		NETWORK_SERVER_OFFLINE = 200
+		NETWORK_GENERAL_ERROR = 201
+		NETWORK_DDOS_ATTACK = 202
+		RENDERING_ERROR = 300
+		RENDERING_MISSING_SCREENSHOT = 301
+		GENERIC_ERROR = 400
+		UPGRADE_REQUIRED = 500
+		FILE_SAVE_ERROR = 600
+		FILE_NON_EXISTANT_PATH = 601
+    
+		# @api private
+		def initialize(message, code)
+		  @Code = code
+		  super(message)
+		end
+		
+		# @return [Integer] the value of the error code
+		def code
+			@Code
+		end	
+	end
+end

data/lib/grabzit/screenshotstatus.rb

@@ -1,6 +1,6 @@
 module GrabzIt
 	# This class represents the screenshot status
-	# @version 2.0
+	# @version 2.1
 	# @author GrabzIt
 	class ScreenShotStatus
 		# @api private

data/lib/grabzit/watermark.rb

@@ -1,6 +1,6 @@
 module GrabzIt
 	# This class represents the custom watermarks stored in GrabzIt
-	# @version 2.0
+	# @version 2.1
 	# @author GrabzIt
 	class WaterMark
 		# @api private

data/test/test_grabzit.rb

@@ -9,8 +9,8 @@ class GrabzItTest < Test::Unit::TestCase
 	Screenshot_Path = "test/tmp.jpg"
 
 	def setup
-		@applicationKey = nil
-		@applicationSecret = nil
+		@applicationKey = ""
+		@applicationSecret = ""
 		#Set to true if the account is subscribed
 		@isSubscribedAccount = false
 	end
@@ -76,7 +76,7 @@ class GrabzItTest < Test::Unit::TestCase
 			if @isSubscribedAccount
 				grabzItClient.set_cookie(Cookie_Name, Cookie_Domain)
 			elsif
-				assert_raise RuntimeError, "User not subscribed should throw error. If user is subscribed please set @isSubscribedAccount in the setup method" do
+				assert_raise GrabzIt::GrabzItException, "User not subscribed should throw error. If user is subscribed please set @isSubscribedAccount in the setup method" do
 				  grabzItClient.set_cookie(Cookie_Name, Cookie_Domain)				  
 				end		
 				return
@@ -92,7 +92,7 @@ class GrabzItTest < Test::Unit::TestCase
 			if @isSubscribedAccount
 				grabzItClient.set_cookie(Cookie_Name, Cookie_Domain)
 			elsif
-				assert_raise RuntimeError, "User not subscribed should throw error. If user is subscribed please set @isSubscribedAccount in the setup method" do
+				assert_raise GrabzIt::GrabzItException, "User not subscribed should throw error. If user is subscribed please set @isSubscribedAccount in the setup method" do
 				  grabzItClient.set_cookie(Cookie_Name, Cookie_Domain)				  
 				end		
 				return
@@ -117,7 +117,7 @@ class GrabzItTest < Test::Unit::TestCase
 			if @isSubscribedAccount
 				grabzItClient.add_watermark(WaterMark_Identifier, WaterMark_Path, 2, 2)
 			elsif
-				assert_raise RuntimeError, "User not subscribed should throw error. If user is subscribed please set @isSubscribedAccount in the setup method" do
+				assert_raise GrabzIt::GrabzItException, "User not subscribed should throw error. If user is subscribed please set @isSubscribedAccount in the setup method" do
 				  grabzItClient.add_watermark(WaterMark_Identifier, WaterMark_Path, 2, 2)				  
 				end		
 				return
@@ -141,7 +141,7 @@ class GrabzItTest < Test::Unit::TestCase
 			if @isSubscribedAccount
 				grabzItClient.add_watermark(WaterMark_Identifier, WaterMark_Path, 2, 2)
 			elsif
-				assert_raise RuntimeError, "User not subscribed should throw error. If user is subscribed please set @isSubscribedAccount in the setup method" do
+				assert_raise GrabzIt::GrabzItException, "User not subscribed should throw error. If user is subscribed please set @isSubscribedAccount in the setup method" do
 				  grabzItClient.add_watermark(WaterMark_Identifier, WaterMark_Path, 2, 2)				  
 				end		
 				return
@@ -151,6 +151,15 @@ class GrabzItTest < Test::Unit::TestCase
 		end	
 	end
 	
+	#def test_Xtreme_DDOS
+	#	assert_raise RuntimeError, "An error occured when detecting potential DDOS attack." do
+	#		grabzItClient = GrabzIt::Client.new(@applicationKey, @applicationSecret)
+	#		for i in 0..200
+	#			grabzItClient.get_status("ccxz")
+	#		end
+	#	end
+	#end
+	
 	def find_cookie(grabzItClient)
 		cookies = grabzItClient.get_cookies(Cookie_Domain)
 		
@@ -168,18 +177,12 @@ class GrabzItTest < Test::Unit::TestCase
 	end
 	
 	def find_watermark(grabzItClient)
-		watermarks = grabzItClient.get_watermarks(WaterMark_Identifier)
+		watermark = grabzItClient.get_watermark(WaterMark_Identifier)
 		
-		if watermarks == nil
+		if watermark == nil
 			return false
 		end
 		
-		watermarks.each { |watermark| 
-			if watermark.identifier == WaterMark_Identifier 
-				return true
-			end 
-		} 	
-		
-		return false
+		return true
 	end	
 end

metadata

@@ -1,33 +1,30 @@
 --- !ruby/object:Gem::Specification
 name: grabzit
 version: !ruby/object:Gem::Version
-  version: 2.0.2
-  prerelease: 
+  version: 2.1.0
 platform: ruby
 authors:
 - GrabzIt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-27 00:00:00.000000000 Z
+date: 2013-12-13 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.'
 email: support@grabz.it
@@ -41,31 +38,31 @@ files:
 - lib/grabzit/cookie.rb
 - lib/grabzit/screenshotstatus.rb
 - lib/grabzit/watermark.rb
+- lib/grabzit/exception.rb
 - test/test.png
 - 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: 1.8.23
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: GrabzIt Ruby Client
 test_files: []
 has_rdoc: