browshot 1.7.0 → 1.8.0

data/VERSION

@@ -1 +1 @@
-1.7.0
+1.8.0

data/lib/browshot.rb

@@ -34,7 +34,7 @@ class Browshot
 
 	# Return the API version handled by the library. Note that this library can usually handle new arguments in requests without requiring an update.
 	def api_version()
-		return "1.7"
+		return "1.8"
 	end
 
     # Retrieve a screenshot with one call. See http://browshot.com/api/documentation#simple for the full list of possible arguments.
@@ -126,45 +126,49 @@ class Browshot
 		return return_reply('screenshot/list', parameters)
 	end
 
-	# Retrieve the screenshot, or a thumbnail. See http://browshot.com/api/documentation#thumbnails for the response format.
+	# Retrieve the screenshot, or a thumbnail. See http://browshot.com/api/documentation#screenshot_thumbnails for the response format.
 	#
 	# Return an empty string if the image could not be retrieved.
 	# +id+:: screenshot ID
-	def screenshot_thumbnail(url='', parameters={})
-		begin
-			url =  URL.new(url)
-
-			parameters.each_pair do |key, value|
-				url.params[key] = value
-			end
-			
-			puts "#{url}" if (@debug)
-
+	def screenshot_thumbnail(id=0, parameters={})
+		parameters[:id] = id
 
-			response = url.get
+		begin
+            url = make_url('screenshot/thumbnail', parameters)
+            response = fetch(url.to_s)
+            case response
+                when Net::HTTPSuccess     then 
+                    return response.response.body
+                else
+                    return ''
+            end
+        rescue Exception => e
+            puts "{e.message}" if (@debug)
+            raise e
+        end
+	end
 
-			if (response.success?)
-				return response.response.body
-			else
-				puts "Error from #{url}: #{response.code}" if (@debug)
-				return ''
-			end
-		rescue Exception => e
-			puts "{e.message}" if (@debug)
-			raise e
-		end
+	# Hot a screenshot or thumbnail. See http://browshot.com/api/documentation#screenshot_host for the response format.
+	#
+	# +id+:: screenshot ID
+	# +hosting+:: hosting option: s3, cdn or browshot
+	def screenshot_host(id=0, hosting='browshot', parameters={})
+		parameters[:id] = id
+		parameters[:hosting] = hosting
+		return return_reply('screenshot/host', parameters)
 	end
 
-	# Retrieve the screenshot, or a thumbnail, and save it to a file. See http://browshot.com/api/documentation#thumbnails for the response format.
+
+	# Retrieve the screenshot, or a thumbnail, and save it to a file. See http://browshot.com/api/documentation#screenshot_thumbnails for the response format.
 	#
 	# See http://browshot.com/api/documentation#thumbnails for the full list of possible arguments.
 	# 
-	# +url+:: URL of the screenshot (screenshot_url value retrieved from screenshot_create() or screenshot_info()). You will get the full image if no other argument is specified.
+	# +id+:: screenshot ID
 	# +file+::  Local file name to write to.
-	def screenshot_thumbnail_file(url='', file='', parameters={})
-		content = screenshot_thumbnail(url, parameters);
+	def screenshot_thumbnail_file(id=0, file='', parameters={})
+		content = screenshot_thumbnail(id, parameters);
 
-		if ($content != '')
+		if (content != '')
 			File.open(file, 'w') {|f| f.write(content) }
 			return file
 		else

data/test/test_browshot.rb

@@ -14,7 +14,7 @@ class TestBrowshot < Test::Unit::TestCase
     end
 
     should "get the API version" do
-      assert_equal '1.7', @browshot.api_version()
+      assert_equal '1.8', @browshot.api_version()
     end
 
     should "get a screenshot with the simple method" do
@@ -85,7 +85,7 @@ class TestBrowshot < Test::Unit::TestCase
  	  assert_equal false, instance['status'].nil?,					"Instance should not be found"
     end
 
-    should "send an errror when creating a instanc with ivalid arguments" do
+    should "send an errror when creating a instance with ivalid arguments" do
 	  instance = @browshot.instance_create({'width' => 3000})
  	  assert_equal false, instance['error'].nil?,					"Instance width should be too large"
 
@@ -100,7 +100,7 @@ class TestBrowshot < Test::Unit::TestCase
 # 	  Option disabled for most accounts
 	  instance = @browshot.instance_create()
 
-# 	  assert_equal false, instance['error'].nil?,					"Instance cannot be created for this account"
+	  assert_equal false, instance['error'].nil?,					"Instance cannot be created for this account"
 # 	  assert_equal false, instance['id'].nil?,						"Instance ID should be present"
 # 	  assert_equal false, instance['width'].nil?,					"Instance screen width should be present"
 # 	  assert_equal false, instance['height'].nil?,					"Instance screen height should be present"
@@ -139,7 +139,7 @@ class TestBrowshot < Test::Unit::TestCase
 	  # Option disabled for most accounts
 	  browser = @browshot.browser_create({'mobile' => 1, 'flash' => 1, 'user_agent' => 'test'})
 
-# 	  assert_equal false, browser['error'].nil?,					"Browser cannot be created for this account"
+	  assert_equal false, browser['error'].nil?,					"Browser cannot be created for this account"
 # 	  assert_equal false, browser['name'].nil?,						"Browser name should be present"
 # 	  assert_equal false, browser['user_agent'].nil?,				"Browser user_agent should be present"
 # 	  assert_equal false, browser['appname'].nil?,					"Browser appname should be present"
@@ -393,7 +393,47 @@ class TestBrowshot < Test::Unit::TestCase
 	end
 
     should "retrieve a thumbnail" do
-	  # TODO
+	  screenshots = @browshot.screenshot_list()
+	  assert_equal true, screenshots.length > 0,					"There should be multiple screenshots"
+
+      screenshot_id = 0
+	  screenshots.each do |key, screenshot|
+		screenshot_id = key
+		break
+	  end
+
+	  assert_equal true, screenshot_id.to_i > 0,					"Screenshot ID should be positive"
+
+	  thumbnail = @browshot.screenshot_thumbnail(screenshot_id, { 'width' => 480 });
+	  assert_equal 'PNG', thumbnail[1..3],							"Thumbnail is a valid PNG"
+	end
+
+	should "Fail hosting screenshots" do
+	  screenshots = @browshot.screenshot_list()
+	  assert_equal true, screenshots.length > 0,					"There should be multiple screenshots"
+
+      screenshot_id = 0
+	  screenshots.each do |key, screenshot|
+		screenshot_id = key
+		break
+	  end
+
+	  assert_equal true, screenshot_id.to_i > 0,					"Screenshot ID should be positive"
+
+	  hosting = @browshot.screenshot_host(screenshot_id)
+	  assert_equal 'error', hosting['status'],						"Default hosting option not enabled for this account"
+
+	  hosting = @browshot.screenshot_host(screenshot_id, { 'hosting' => 's3' })
+	  assert_equal 'error', hosting['status'],						"S3 hosting option not enabled for this account"
+
+	  hosting = @browshot.screenshot_host(screenshot_id, { 'hosting' => 's3', 'bucket' => 'mine' })
+	  assert_equal 'error', hosting['status'],						"S3 hosting option not enabled for this account"
+
+	  hosting = @browshot.screenshot_host(screenshot_id, { 'hosting' => 'cdn' })
+	  assert_equal 'error', hosting['status'],						"CDN hosting option not enabled for this account"
+
+	  hosting = @browshot.screenshot_host(screenshot_id, { 'hosting' => 'browshot' })
+	  assert_equal 'error', hosting['status'],						"Browshot hosting option not enabled for this account"
 	end
 
     should "retrieve account information" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: browshot
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-14 00:00:00.000000000 Z
+date: 2012-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &96980520 !ruby/object:Gem::Requirement
+  requirement: &103460540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *96980520
+  version_requirements: *103460540
 - !ruby/object:Gem::Dependency
   name: url
-  requirement: &96979780 !ruby/object:Gem::Requirement
+  requirement: &103459740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *96979780
+  version_requirements: *103459740
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &96979040 !ruby/object:Gem::Requirement
+  requirement: &103459060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *96979040
+  version_requirements: *103459060
 - !ruby/object:Gem::Dependency
   name: url
-  requirement: &96978400 !ruby/object:Gem::Requirement
+  requirement: &103458360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *96978400
+  version_requirements: *103458360
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &96977720 !ruby/object:Gem::Requirement
+  requirement: &103495140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *96977720
+  version_requirements: *103495140
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &97827640 !ruby/object:Gem::Requirement
+  requirement: &103494440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *97827640
+  version_requirements: *103494440
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &97826880 !ruby/object:Gem::Requirement
+  requirement: &103493760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *97826880
+  version_requirements: *103493760
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &97826140 !ruby/object:Gem::Requirement
+  requirement: &103492920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *97826140
+  version_requirements: *103492920
 description: ! 'Browshot (http://www.browshot.com/) is a web service to easily make
   screenshots of web pages in any screen size, as any device: iPhone©, iPad©, Android©,
   Nook©, PC, etc. Browshot has full Flash, JavaScript, CSS, & HTML5 support. The latest
@@ -141,7 +141,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -653828520181139472
+      hash: -73333035269990045
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: