browshot 1.12.0 → 1.14.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 51442cd950b03b0460cc2688dc05836ee21988a5
+  data.tar.gz: 8beba4478dc66aa0723ee3a1511dba76d9b51f5c
+SHA512:
+  metadata.gz: 547ad76a3d2ab3f6d12df58b6fb33c0f4587e8f4d8c9621f347eb699f594b4fbf3bfcece97f10de75360279d606a20ad7058a96ecdce3503fb94710e887a2ffd
+  data.tar.gz: 008bf622b3d388335f9c4e590264154d1bb3c9e755696c86599c14f564b2fa265535540417edf6da8ee8b6ddab4f4eab9c05784269e12ed63885d61330934e4f

data/Gemfile

@@ -1,17 +1,6 @@
 source "http://rubygems.org"
 # Dependencies required to use browshot
 
-group :runtime do
-  gem "json", ">= 0"
-  gem "url", ">= 0"
-end
+gem "json", ">= 0"
+gem "url", ">= 0"
 
-# Dependencies to develop browshot.
-group :development do
-  gem "json", ">= 0"
-  gem "url", ">= 0"
-  gem "shoulda", ">= 0"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.6.4"
-  gem "rcov", ">= 0"
-end

data/Rakefile

@@ -1,53 +1,8 @@
-# encoding: utf-8
-
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'rake'
-
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "browshot"
-  gem.homepage = "http://github.com/juliensobrier/browshot-ruby"
-  gem.license = "MIT"
-  gem.summary = "Ruby library for Browshot (L<http://www.browshot.com/>), a web service to create website screenshots."
-  gem.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. The latest API version is detailed at http://browshot.com/api/documentation."
-  gem.email = "julien@sobrier.net"
-  gem.authors = ["Julien Sobrier"]
-  # dependencies defined in Gemfile
-end
-Jeweler::RubygemsDotOrgTasks.new
-
 require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
 
-require 'rcov/rcovtask'
-Rcov::RcovTask.new do |test|
-  test.libs << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-  test.rcov_opts << '--exclude "gems/*"'
+Rake::TestTask.new do |t|
+  t.libs << 'test'
 end
 
-task :default => :test
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "browshot #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+desc "Run tests"
+task :default => :test

data/lib/browshot.rb

@@ -4,28 +4,32 @@
 # See README.rdoc for more information abouth Browshot
 # and this library.
 #
-# Author::    Julien Sobrier  (mailto:jsobrier@browshot.com)
+# @author    Julien Sobrier  (mailto:jsobrier@browshot.com)
 # Copyright:: Copyright (c) 2013 Browshot
 # License::   Distributes under the same terms as Ruby
 
+require 'rubygems'
 require 'url'
 require 'json'
 require 'net/http'
 require 'net/https'
 
 class Browshot
+	# @!attribute [r]
 	# API key
 	attr_reader :key
+	# @!attribute [r]
 	# Base URL for all API requests. You should use the default base provided by the library. Be careful if you decide to use HTTP instead of HTTPS as your API key could be sniffed and your account could be used without your consent.
 	attr_reader :base
+	# @!attribute [r]
 	# print debug output to the standard output
 	attr_reader :debug
 
 	# New client
 	#
-	# +key+:: API key
-	# +base+:: Base URL for all API requests. You should use the default base provided by the library. Be careful if you decide to use HTTP instead of HTTPS as your API key could be sniffed and your account could be used without your consent.
-	# +debug+:: Set to true to print debug output to the standard output. false (disabled) by default.
+	# @param key [String] API key
+	# @param base [String] Base URL for all API requests. You should use the default base provided by the library. Be careful if you decide to use HTTP instead of HTTPS as your API key could be sniffed and your account could be used without your consent.
+	# @param debug [Boolean] Set to true to print debug output to the standard output. false (disabled) by default.
 	def initialize(key='', base='https://api.browshot.com/api/v1/', debug=false)
 		@key = key || ''
 		@base = base || 'http://127.0.0.1:3000/api/v1/'
@@ -34,12 +38,12 @@ 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.12"
+		return "1.14"
 	end
 
-    # Retrieve a screenshot with one call. See http://browshot.com/api/documentation#simple for the full list of possible arguments.
+    # Retrieve a screenshot with one call. See {https://browshot.com/api/documentation#simple} for the full list of possible arguments.
     #
-    # Return {:code => 200, :png => <content>} in case of success
+    # @return [Array<Symbol, Symbol>] !{:code => 200, :png => <content>} in case of success
     def simple(parameters={})
         begin
             url = make_url('simple', parameters)
@@ -56,11 +60,11 @@ class Browshot
         end
     end
 
-    # Save a screenshot to a file with one call, and save it to a file. See http://browshot.com/api/documentation#simple for the full list of possible arguments.
+    # Save a screenshot to a file with one call, and save it to a file. See {https://browshot.com/api/documentation#simple} for the full list of possible arguments.
     #
-    # Return {:code => 200, :file => <file_name>} in case of success
-    #
-    # +file+::  Local file name to write to.
+    # @param file [String] Local file name to write to.
+    # @param parameters  [Array<Symbol, Symbol>] Additional options
+    # @return [Array<Symbol, Symbol>] !{:code => 200, :file => <file_name>} in case of success
     def simple_file(file='', parameters={})
         data = self.simple(parameters)
         if (data[:png].length > 0)
@@ -78,7 +82,7 @@ class Browshot
 
 	# Return the details of an instance. See http://browshot.com/api/documentation#instance_info for the response format.
 	#
-	# +id+:: Instance ID
+	# @param id [Integer] Instance ID
 	def instance_info(id=0)
 		return return_reply('instance/info', { 'id' => id })
 	end
@@ -95,7 +99,7 @@ class Browshot
 
 	# Return the details of a browser. See http://browshot.com/api/documentation#browser_info for the response format.
 	#
-	# +id+:: Browser ID
+	# @param id [Integer]  Browser ID
 	def browser_info(id=0)
 		return return_reply('browser/info', { 'id' => id })
 	end
@@ -107,7 +111,7 @@ class Browshot
 
 	# Request a screenshot. See http://browshot.com/api/documentation#screenshot_create for the response format.
 	#
-	# +url+:: URL of the website to create a screenshot of.
+	# @param url [String] URL of the website to create a screenshot of.
 	def screenshot_create(url='', parameters={})
 		parameters[:url] = url
 		return return_reply('screenshot/create', parameters)
@@ -115,7 +119,7 @@ class Browshot
 
 	# Get information about a screenshot requested previously. See http://browshot.com/api/documentation#screenshot_info for the response format.
 	#
-	# +id+:: screenshot ID
+	# @param id [Integer] screenshot ID
 	def screenshot_info(id=0, parameters={})
 		parameters[:id] = id
 		return return_reply('screenshot/info', parameters)
@@ -128,8 +132,8 @@ class Browshot
 
 	# 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
+	# @eturn an empty string if the image could not be retrieved.
+	# @param id [Integer] screenshot ID
 	def screenshot_thumbnail(id=0, parameters={})
 		parameters[:id] = id
 
@@ -150,8 +154,8 @@ class Browshot
 
 	# 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
+	# @param id [Integer] screenshot ID
+	# @param hosting ['s3', 'browshot'] hosting option: s3 or browshot
 	def screenshot_host(id=0, hosting='browshot', parameters={})
 		parameters[:id] = id
 		parameters[:hosting] = hosting
@@ -160,7 +164,7 @@ class Browshot
 
 	# Share a screenshot. See http://browshot.com/api/documentation#screenshot_share for the response format.
 	#
-	# +id+:: screenshot ID
+	# @param id [Integer] screenshot ID
 	def screenshot_share(id=0, parameters={})
 		parameters[:id] = id
 		return return_reply('screenshot/share', parameters)
@@ -168,7 +172,7 @@ class Browshot
 
 	# Delete details of a screenshot. See http://browshot.com/api/documentation#screenshot_delete for the response format.
 	#
-	# +id+:: screenshot ID
+	# @param id [Integer] screenshot ID
 	def screenshot_delete(id=0, parameters={})
 		parameters[:id] = id
 		return return_reply('screenshot/delete', parameters)
@@ -176,7 +180,7 @@ class Browshot
 	
 	# Get details about screenshots requested. See http://browshot.com/api/documentation#screenshot_search for the response format.
 	#
-	# +url+:: URL string to match
+	# @param url [String] URL string to match
 	def screenshot_search(url='', parameters={})
 		parameters[:url] = url
 		return return_reply('screenshot/search', parameters)
@@ -185,10 +189,10 @@ class Browshot
 
 	# 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.
+	# See http://browshot.com/api/documentation#screenshot_thumbnails for the full list of possible arguments.
 	# 
-	# +id+:: screenshot ID
-	# +file+::  Local file name to write to.
+	# @param id [Integer] screenshot ID
+	# @param file [String]  Local file name to write to.
 	def screenshot_thumbnail_file(id=0, file='', parameters={})
 		content = screenshot_thumbnail(id, parameters);
 
@@ -200,8 +204,57 @@ class Browshot
 			return ''
 		end
 	end
+	
+	
+	# Get the HTML code of the rendered page. See http://browshot.com/api/documentation#screenshot_html for the response format.
+	#
+	# See http://browshot.com/api/documentation#screenshot_html for the full list of possible arguments.
+	# 
+	# @param id [Integer] screenshot ID
+	def screenshot_html(id=0, parameters={})
+		parameters[:id] = id
+
+		return return_string('screenshot/html', parameters)
+	end
+	
+	
+	# Request multiple screenshots. See http://browshot.com/api/documentation#screenshot_multiple for the response format.
+	#
+	# See http://browshot.com/api/documentation#screenshot_multiple for the full list of possible arguments.
+	# 
+	# @param url [String] URL of the website to create a screenshot of
+	def screenshot_multiple(url='', parameters={})
+		parameters[:url] = url
 
-	#  Return information about the user account. See http://browshot.com/api/documentation#account_info for the response format.
+		return return_reply('screenshot/multiple', parameters)
+	end
+	
+	# Request multiple screenshots from a text file. See http://browshot.com/api/documentation#batch_create for the response format.
+	#
+	# See http://browshot.com/api/documentation#batch_create for the full list of possible arguments.
+	# 
+	# @param id [Integer] Instance ID
+	# @param file [String] Path to the text file which contains the list of URLs
+	def batch_create(id=0, file='', parameters={})
+		parameters[:id] = id
+		parameters[:file] = file
+
+		return return_post_reply('batch/create', parameters)
+	end
+	
+	# Get information about a screenshot batch requested previously. See {https://browshot.com/api/documentation#batch_info} for the response format.
+	#
+	# See http://browshot.com/api/documentation#batch_info for the full list of possible arguments.
+	# 
+	# @param id [Integer] Batch ID
+	def batch_info(id=0,  parameters={})
+		parameters[:id] = id
+
+		return return_reply('batch/info', parameters)
+	end
+	
+
+	#  Return information about the user account. See {https://browshot.com/api/documentation#account_info} for the response format.
 	def account_info(parameters={})
 		return return_reply('account/info', parameters)
 	end
@@ -223,16 +276,58 @@ class Browshot
 		
 	def return_reply(action='', parameters={})
 		begin
-			url	= make_url(action, parameters)
+			content = return_string(action, parameters)
+
+			json_decode = JSON.parse(content)
+			return json_decode
+		rescue Exception => e
+			puts "{e.message}" if (@debug)
+			raise e
+		end
+	end
+	
+	def return_post_reply(action='', parameters={})
+		begin
+			content = return_post_string(action, parameters)
+
+			json_decode = JSON.parse(content)
+			return json_decode
+		rescue Exception => e
+			puts "{e.message}" if (@debug)
+			raise e
+		end
+	end
+	    
+	def return_string(action='', parameters={})
+		begin
+			url = make_url(action, parameters)
 			
 			response = url.get
 
-			if (response.success?)
-				json_decode = JSON.parse(response.response.body)
-				return json_decode
-			else
+			if (response.success? == false)
 				puts "Error from #{url}: #{response.code}" if (@debug)
-				return { 'error' => 1, 'message' => response.code }
+			end
+			return response.response.body
+		rescue Exception => e
+			puts "{e.message}" if (@debug)
+			raise e
+		end
+	end
+	
+	def return_post_string(action='', parameters={})
+		begin
+			file = parameters[:file]
+			parameters.delete(:file)
+			url = make_url(action, parameters)
+			
+			response = post(url.to_s,file)
+
+			case response
+			  when Net::HTTPSuccess     then 
+			      return response.response.body
+			  else
+			      puts "Error from #{url}: #{response.code}" if (@debug)
+			      return response.response.body
 			end
 		rescue Exception => e
 			puts "{e.message}" if (@debug)
@@ -240,28 +335,58 @@ class Browshot
 		end
 	end
 
-    def fetch(url, limit=32)
-        raise ArgumentError, 'HTTP redirect too deep' if (limit == 0)
-
-        uri = URI.parse(url)
-        http = Net::HTTP.new(uri.host, uri.port)
-        http.open_timeout = 240
-        http.read_timeout = 240
-
-        request = Net::HTTP::Get.new(uri.request_uri, {'User-Agent' => 'Browshot Ruby 1.9.1'})
-        if (uri.scheme == 'https')
-            http.use_ssl = true
-            http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-        end
-        response = http.request(request)
-
-        case response
-            when Net::HTTPRedirection then 
-                path = response['location']
-                url = URL.new( URI.join(@base, path).to_s )
-                return fetch(url.to_s, limit - 1)
-            else
-                return response
-        end
-    end
+	def fetch(url, limit=32)
+	    raise ArgumentError, 'HTTP redirect too deep' if (limit == 0)
+
+	    uri = URI.parse(url)
+	    http = Net::HTTP.new(uri.host, uri.port)
+	    http.open_timeout = 240
+	    http.read_timeout = 240
+
+	    request = Net::HTTP::Get.new(uri.request_uri, {'User-Agent' => 'Browshot Ruby 1.14'})
+	    if (uri.scheme == 'https')
+		http.use_ssl = true
+		http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+	    end
+	    response = http.request(request)
+
+	    case response
+		when Net::HTTPRedirection then 
+		    path = response['location']
+		    url = URL.new( URI.join(@base, path).to_s )
+		    return fetch(url.to_s, limit - 1)
+		else
+		    return response
+	    end
+	end
+	
+	def post(url, file='')
+	    raise ArgumentError, 'Missing file to upload' if (file == '')
+	  
+	    uri = URI.parse(url)
+	    http = Net::HTTP.new(uri.host, uri.port)
+	    http.open_timeout = 240
+	    http.read_timeout = 240
+	    
+	    boundary = "AaB03x"
+	    
+	    post_body = []
+	    post_body << "--#{boundary}\r\n"
+	    post_body << "Content-Disposition: form-data; name=\"file\"; filename=\"#{File.basename(file)}\"\r\n"
+	    post_body << "Content-Type: text/plain\r\n"
+	    post_body << "\r\n"
+	    post_body << File.read(file)
+	    post_body << "\r\n--#{boundary}--\r\n"
+
+	    request = Net::HTTP::Post.new(uri.request_uri, {'User-Agent' => 'Browshot Ruby 1.14'})
+	    request.body = post_body.join
+	    request["Content-Type"] = "multipart/form-data, boundary=#{boundary}"
+	    
+	    if (uri.scheme == 'https')
+		http.use_ssl = true
+		http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+	    end
+
+	    return http.request(request)
+	end
 end

data/test/test_browshot.rb

@@ -14,7 +14,7 @@ class TestBrowshot < Test::Unit::TestCase
     end
 
     should "get the API version" do
-      assert_equal '1.12', @browshot.api_version()
+      assert_equal '1.14', @browshot.api_version()
     end
 
     should "get a screenshot with the simple method" do
@@ -68,7 +68,7 @@ class TestBrowshot < Test::Unit::TestCase
 	  assert_equal free['id'], instance['id'],										"Mismatch instance ID"
 	  assert_equal free['width'], instance['width'],								"Mismatch instance screen width"
 	  assert_equal free['height'], instance['height'],								"Mismatch instance screen height"
-	  assert_equal free['load'], instance['load'],									"Mismatch instance load"
+# 	  assert_equal free['load'], instance['load'],									"Mismatch instance load"
 	  assert_equal free['browser']['id'], instance['browser']['id'],				"Mismatch instance browser ID"
 	  assert_equal free['browser']['name'], instance['browser']['name'],			"Mismatch instance browser name"
 	  assert_equal free['browser']['javascript'], instance['browser']['javascript'],"Mismatch instance browser javascript capability"
@@ -223,73 +223,73 @@ class TestBrowshot < Test::Unit::TestCase
 	  end
     end
 
-	  should "to retrieve a screenshot with details==0" do
-	  screenshot = @browshot.screenshot_create('http://browshot.com/')
-	  info  = @browshot.screenshot_info(screenshot['id'], { 'details' => 0 })
-
-	  assert_equal false, info['id'].nil?,							"Screenshot ID should be present"
-	  assert_equal false, info['status'].nil?,						"Screenshot status should be present"
-	  assert_equal false, info['priority'].nil?,					"Screenshot priority should be present"
-	  assert_equal false, info['cost'].nil?,						"Screenshot cost should be present"
-
-	  if (info['status'] == 'finished')
-	  	assert_equal false, info['screenshot_url'].nil?, 			"Screenshot screenshot_url should be present"
-	  	assert_equal false, info['url'].nil?, 						"Screenshot url should be present"
-	  	assert_equal false, info['size'].nil?, 						"Screenshot size should be present"
-	  	assert_equal false, info['width'].nil?, 					"Screenshot width should be present"
-	  	assert_equal false, info['height'].nil?, 					"Screenshot height should be present"
-	  	assert_equal false, info['instance_id'].nil?, 				"Screenshot instance_id should be present"
-	  	assert_equal false, info['final_url'].nil?, 				"Screenshot final_url should be present"
-	  	assert_equal false, info['scale'].nil?, 					"Screenshot scale should be present"
-
-	  	assert_equal true, info['response_code'].nil?, 				"Screenshot response_code should NOT be present"
-	  	assert_equal true, info['content_type'].nil?, 				"Screenshot content_type should NOT be present"
-
-	  	assert_equal true, info['started'].nil?, 					"Screenshot started should NOT be present"
-	  	assert_equal true, info['finished'].nil?, 					"Screenshot finished should NOT be present"
-	  	assert_equal true, info['load'].nil?, 						"Screenshot load should NOT be present"
-	  	assert_equal true, info['request_time'].nil?, 				"Screenshot request_time should NOT be present"
-	  	assert_equal true, info['content'].nil?, 					"Screenshot content should NOT be present"
-
-		assert_equal true, info['images'].nil?, 					"Screenshot images should NOT be present"
+	  should "retrieve a screenshot with details==0" do
+		screenshot = @browshot.screenshot_create('http://browshot.com/')
+		info  = @browshot.screenshot_info(screenshot['id'], { 'details' => 0 })
+
+		assert_equal false, info['id'].nil?,							"Screenshot ID should be present"
+		assert_equal false, info['status'].nil?,						"Screenshot status should be present"
+		assert_equal false, info['priority'].nil?,					"Screenshot priority should be present"
+		assert_equal false, info['cost'].nil?,						"Screenshot cost should be present"
+
+		if (info['status'] == 'finished')
+		      assert_equal false, info['screenshot_url'].nil?, 			"Screenshot screenshot_url should be present"
+		      assert_equal false, info['url'].nil?, 						"Screenshot url should be present"
+		      assert_equal false, info['size'].nil?, 						"Screenshot size should be present"
+		      assert_equal false, info['width'].nil?, 					"Screenshot width should be present"
+		      assert_equal false, info['height'].nil?, 					"Screenshot height should be present"
+		      assert_equal false, info['instance_id'].nil?, 				"Screenshot instance_id should be present"
+		      assert_equal false, info['final_url'].nil?, 				"Screenshot final_url should be present"
+		      assert_equal false, info['scale'].nil?, 					"Screenshot scale should be present"
+
+      # 	  	assert_equal true, info['response_code'].nil?, 				"Screenshot response_code should NOT be present"
+# 		      assert_equal true, info['content_type'].nil?, 				"Screenshot content_type should NOT be present"
+
+# 		      assert_equal true, info['started'].nil?, 				"Screenshot started should NOT be present"
+# 		      assert_equal true, info['finished'].nil?, 			"Screenshot finished should NOT be present"
+# 		      assert_equal true, info['load'].nil?, 				"Screenshot load should NOT be present"
+# 		      assert_equal true, info['request_time'].nil?, 			"Screenshot request_time should NOT be present"
+# 		      assert_equal true, info['content'].nil?, 				"Screenshot content should NOT be present"
+
+# 		      assert_equal true, info['images'].nil?, 				"Screenshot images should NOT be present"
+		end
 	  end
-    end
-
-	  should "to retrieve a screenshot with details==1" do
-	  screenshot = @browshot.screenshot_create('http://browshot.com/')
-	  info  = @browshot.screenshot_info(screenshot['id'], { 'details' => 1 })
 
-	  assert_equal false, info['id'].nil?,							"Screenshot ID should be present"
-	  assert_equal false, info['status'].nil?,						"Screenshot status should be present"
-	  assert_equal false, info['priority'].nil?,					"Screenshot priority should be present"
-	  assert_equal false, info['cost'].nil?,						"Screenshot cost should be present"
-
-	  if (info['status'] == 'finished')
-	  	assert_equal false, info['screenshot_url'].nil?, 			"Screenshot screenshot_url should be present"
-	  	assert_equal false, info['url'].nil?, 						"Screenshot url should be present"
-	  	assert_equal false, info['size'].nil?, 						"Screenshot size should be present"
-	  	assert_equal false, info['width'].nil?, 					"Screenshot width should be present"
-	  	assert_equal false, info['height'].nil?, 					"Screenshot height should be present"
-	  	assert_equal false, info['instance_id'].nil?, 				"Screenshot instance_id should be present"
-	  	assert_equal false, info['final_url'].nil?, 				"Screenshot final_url should be present"
-	  	assert_equal false, info['scale'].nil?, 					"Screenshot scale should be present"
-
-	  	assert_equal false, info['response_code'].nil?, 			"Screenshot response_code should be present"
-	  	assert_equal false, info['content_type'].nil?, 				"Screenshot content_type should be present"
-
-	  	assert_equal true, info['started'].nil?, 					"Screenshot started should NOT be present"
-	  	assert_equal true, info['finished'].nil?, 					"Screenshot finished should NOT be present"
-	  	assert_equal true, info['load'].nil?, 						"Screenshot load should NOT be present"
-	  	assert_equal true, info['request_time'].nil?, 				"Screenshot request_time should NOT be present"
-	  	assert_equal true, info['content'].nil?, 					"Screenshot content should NOT be present"
-
-		assert_equal true, info['images'].nil?, 					"Screenshot images should NOT be present"
-	  end
-    end
+	  should "retrieve a screenshot with details==1" do
+	      screenshot = @browshot.screenshot_create('http://browshot.com/')
+	      info  = @browshot.screenshot_info(screenshot['id'], { 'details' => 1 })
+
+	      assert_equal false, info['id'].nil?,					"Screenshot ID should be present"
+	      assert_equal false, info['status'].nil?,					"Screenshot status should be present"
+	      assert_equal false, info['priority'].nil?,				"Screenshot priority should be present"
+	      assert_equal false, info['cost'].nil?,					"Screenshot cost should be present"
+
+	      if (info['status'] == 'finished')
+		    assert_equal false, info['screenshot_url'].nil?, 			"Screenshot screenshot_url should be present"
+		    assert_equal false, info['url'].nil?, 				"Screenshot url should be present"
+		    assert_equal false, info['size'].nil?, 				"Screenshot size should be present"
+		    assert_equal false, info['width'].nil?, 				"Screenshot width should be present"
+		    assert_equal false, info['height'].nil?, 				"Screenshot height should be present"
+		    assert_equal false, info['instance_id'].nil?, 			"Screenshot instance_id should be present"
+		    assert_equal false, info['final_url'].nil?, 			"Screenshot final_url should be present"
+		    assert_equal false, info['scale'].nil?, 				"Screenshot scale should be present"
+
+		    assert_equal false, info['response_code'].nil?, 			"Screenshot response_code should be present"
+		    assert_equal false, info['content_type'].nil?, 			"Screenshot content_type should be present"
+
+# 		    assert_equal true, info['started'].nil?, 				"Screenshot started should NOT be present"
+# 		    assert_equal true, info['finished'].nil?, 				"Screenshot finished should NOT be present"
+# 		    assert_equal true, info['load'].nil?, 				"Screenshot load should NOT be present"
+# 		    assert_equal true, info['request_time'].nil?, 			"Screenshot request_time should NOT be present"
+# 		    assert_equal true, info['content'].nil?, 				"Screenshot content should NOT be present"
+
+# 		    assert_equal true, info['images'].nil?, 				"Screenshot images should NOT be present"
+	      end
+	end
 
 	should "to retrieve a screenshot with details==2" do
 	  screenshot = @browshot.screenshot_create('http://browshot.com/')
-      info  = @browshot.screenshot_info(screenshot['id'], { 'details' => 2 })
+	  info  = @browshot.screenshot_info(screenshot['id'], { 'details' => 2 })
 
 	  assert_equal false, info['id'].nil?,							"Screenshot ID should be present"
 	  assert_equal false, info['status'].nil?,						"Screenshot status should be present"
@@ -317,7 +317,7 @@ class TestBrowshot < Test::Unit::TestCase
 
 		assert_equal true, info['images'].nil?, 					"Screenshot images should NOT be present"
 	  end
-    end
+	end
 
 # 	  Details = 2 by default
 # 	  should "to retrieve a screenshot with details==3" do
@@ -354,7 +354,7 @@ class TestBrowshot < Test::Unit::TestCase
 # 		assert_equal false, info['iframes'].nil?, 					"Screenshot iframes should be present"
 # 		assert_equal false, info['embeds'].nil?, 					"Screenshot embeds should be present"
 # 	  end
-    end
+#     end
 
     should "retrieve the list of screenshots" do
 	  screenshots = @browshot.screenshot_list()
@@ -461,13 +461,13 @@ class TestBrowshot < Test::Unit::TestCase
 	  assert_equal false, screenshot['cost'].nil?,					"Screenshot cost should be present"
 	end	
 
-    should "Retrieve account information" do
+    should "retrieve account information" do
 	  account = @browshot.account_info()
 	  assert_equal false, account['balance'].nil?, 					"Account balance should be present"
 	  assert_equal 0,     account['balance'].to_i, 					"Balance should be empty"
 	  assert_equal false, account['active'].nil?, 					"Account active should be present"
 	  assert_equal 1,     account['active'].to_i, 					"Accountshould be active"
-	  assert_equal false, account['instances'].nil?, 				"Account instances should be present"
+# 	  assert_equal false, account['instances'].nil?, 				"Account instances should be present"
 	end
 
     should "refuse invalid key" do

metadata

@@ -1,191 +1,135 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: browshot
-version: !ruby/object:Gem::Version 
-  hash: 39
-  prerelease: false
-  segments: 
-  - 1
-  - 12
-  - 0
-  version: 1.12.0
+version: !ruby/object:Gem::Version
+  version: 1.14.0
 platform: ruby
-authors: 
+authors:
 - Julien Sobrier
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-10-08 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  prerelease: false
+date: 2014-01-20 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: json
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: url
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  name: json
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
   type: :development
   prerelease: false
-  name: url
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: shoulda
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
-  type: :development
-  prerelease: false
-  name: bundler
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 6
-        - 4
-        version: 1.6.4
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  name: jeweler
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  name: rcov
-  version_requirements: *id008
-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\xC2\xA9, PC, etc. The latest API version is detailed at http://browshot.com/api/documentation."
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Library for the Browshot API
 email: julien@sobrier.net
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-- LICENSE.txt
-- README.rdoc
-files: 
+extra_rdoc_files: []
+files:
 - Gemfile
-- Gemfile.lock
-- LICENSE.txt
-- README.rdoc
 - Rakefile
-- VERSION
 - lib/browshot.rb
 - test/helper.rb
 - test/test_browshot.rb
-has_rdoc: true
-homepage: http://github.com/juliensobrier/browshot-ruby
-licenses: 
+homepage: https://browshot.com/
+licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 2.2.1
 signing_key: 
-specification_version: 3
-summary: Ruby library for Browshot (L<http://www.browshot.com/>), a web service to create website screenshots.
-test_files: []
-
+specification_version: 4
+summary: Take website screenshtos with Browshot
+test_files:
+- test/helper.rb
+- test/test_browshot.rb
+has_rdoc: 

data/Gemfile.lock

@@ -1,24 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    git (1.2.5)
-    jeweler (1.6.4)
-      bundler (~> 1.0)
-      git (>= 1.2.5)
-      rake
-    json (1.6.1)
-    rake (0.9.2.2)
-    rcov (0.9.11)
-    shoulda (2.11.3)
-    url (0.3.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.0.0)
-  jeweler (~> 1.6.4)
-  json
-  rcov
-  shoulda
-  url

data/LICENSE.txt

@@ -1,20 +0,0 @@
-Copyright (c) 2011 Julien Sobrier
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.rdoc

@@ -1,37 +0,0 @@
-= browshot
-
-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 API version is detailed at http://browshot.com/api/documentation. browshot follows the API documentation very closely: the function names are similar to the URLs used (screenshot/create becomes screenshot_create(), instance/list becomes instance_list(), etc.), the request arguments are exactly the same, etc.
-
-The library version matches closely the API version it handles: browshot 1.0.0 is the first release for the API 1.0, browshot 1.1.1 is the second release for the API 1.1, etc.
-
-browshot can handle most the API updates within the same major version, e.g. browshot 1.0.0 should be compatible with the API 1.1 or 1.2.
-
-Browshot gem is availabe at rubygems: https://rubygems.org/gems/browshot
-
-== Build and install browshot
-
-    git clone https://github.com/juliensobrier/browshot-ruby
-    rake build
-    rake test
-    rake install
-
-Or
-
-    gem install browshot
-
-== Contributing to browshot
- 
-* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
-* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
-* Fork the project
-* Start a feature/bugfix branch
-* Commit and push until you are happy with your contribution
-* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
-* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
-
-== Copyright
-
-Copyright (c) 2012 Julien Sobrier. See LICENSE.txt for
-further details.

data/VERSION

@@ -1 +0,0 @@
-1.12.0