browshot 1.10.0 → 1.12.0

data/VERSION

@@ -1 +1 @@
-1.10.0
+1.12.0

data/lib/browshot.rb

@@ -1,11 +1,11 @@
 # The library requires an API key from Browshot.
-# Sign up fpr a free account a http://browshot.com/
+# Sign up for a free account a http://browshot.com/
 # 
 # See README.rdoc for more information abouth Browshot
 # and this library.
 #
 # Author::    Julien Sobrier  (mailto:jsobrier@browshot.com)
-# Copyright:: Copyright (c) 2012 Browshot
+# Copyright:: Copyright (c) 2013 Browshot
 # License::   Distributes under the same terms as Ruby
 
 require 'url'
@@ -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.9"
+		return "1.12"
 	end
 
     # Retrieve a screenshot with one call. See http://browshot.com/api/documentation#simple for the full list of possible arguments.
@@ -173,6 +173,14 @@ class Browshot
 		parameters[:id] = id
 		return return_reply('screenshot/delete', parameters)
 	end
+	
+	# Get details about screenshots requested. See http://browshot.com/api/documentation#screenshot_search for the response format.
+	#
+	# +url+:: URL string to match
+	def screenshot_search(url='', parameters={})
+		parameters[:url] = url
+		return return_reply('screenshot/search', parameters)
+	end
 
 
 	# Retrieve the screenshot, or a thumbnail, and save it to a file. See http://browshot.com/api/documentation#screenshot_thumbnails for the response format.
@@ -240,7 +248,7 @@ class Browshot
         http.open_timeout = 240
         http.read_timeout = 240
 
-        request = Net::HTTP::Get.new(uri.request_uri)
+        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

data/test/test_browshot.rb

@@ -14,7 +14,7 @@ class TestBrowshot < Test::Unit::TestCase
     end
 
     should "get the API version" do
-      assert_equal '1.9', @browshot.api_version()
+      assert_equal '1.12', @browshot.api_version()
     end
 
     should "get a screenshot with the simple method" do
@@ -223,9 +223,9 @@ class TestBrowshot < Test::Unit::TestCase
 	  end
     end
 
-	should "to retrieve a screenshot with details==0" do
+	  should "to retrieve a screenshot with details==0" do
 	  screenshot = @browshot.screenshot_create('http://browshot.com/')
-      info  = @browshot.screenshot_info(screenshot['id'], { 'details' => 0 })
+	  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"
@@ -255,9 +255,9 @@ class TestBrowshot < Test::Unit::TestCase
 	  end
     end
 
-	should "to retrieve a screenshot with details==1" do
+	  should "to retrieve a screenshot with details==1" do
 	  screenshot = @browshot.screenshot_create('http://browshot.com/')
-      info  = @browshot.screenshot_info(screenshot['id'], { 'details' => 1 })
+	  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"
@@ -319,54 +319,55 @@ class TestBrowshot < Test::Unit::TestCase
 	  end
     end
 
-	should "to retrieve a screenshot with details==3" do
-	  screenshot = @browshot.screenshot_create('http://browshot.com/')
-      info  = @browshot.screenshot_info(screenshot['id'], { 'details' => 3 })
-
-	  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 false, info['started'].nil?, 					"Screenshot started should be present"
-	  	assert_equal false, info['finished'].nil?, 					"Screenshot finished should be present"
-	  	assert_equal false, info['load'].nil?, 						"Screenshot load should be present"
-	  	assert_equal false, info['request_time'].nil?, 				"Screenshot request_time should be present"
-	  	assert_equal false, info['content'].nil?, 					"Screenshot content should be present"
-
-		assert_equal false, info['images'].nil?, 					"Screenshot images should be present"
-		assert_equal true, info['images'].length > 0, 				"Screenshot images should be present"
-		assert_equal false, info['scripts'].nil?, 					"Screenshot scripts should be present"
-		assert_equal false, info['iframes'].nil?, 					"Screenshot iframes should be present"
-		assert_equal false, info['embeds'].nil?, 					"Screenshot embeds should be present"
-	  end
+# 	  Details = 2 by default
+# 	  should "to retrieve a screenshot with details==3" do
+# 	  screenshot = @browshot.screenshot_create('http://browshot.com/')
+# 	  info  = @browshot.screenshot_info(screenshot['id'], { 'details' => 3 })
+# 
+# 	  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 false, info['started'].nil?, 					"Screenshot started should be present"
+# 	  	assert_equal false, info['finished'].nil?, 					"Screenshot finished should be present"
+# 	  	assert_equal false, info['load'].nil?, 						"Screenshot load should be present"
+# 	  	assert_equal false, info['request_time'].nil?, 				"Screenshot request_time should be present"
+# 	  	assert_equal false, info['content'].nil?, 					"Screenshot content should be present"
+# 
+# 		assert_equal false, info['images'].nil?, 					"Screenshot images should be present"
+# 		assert_equal true, info['images'].length > 0, 				"Screenshot images should be present"
+# 		assert_equal false, info['scripts'].nil?, 					"Screenshot scripts should be present"
+# 		assert_equal false, info['iframes'].nil?, 					"Screenshot iframes should be present"
+# 		assert_equal false, info['embeds'].nil?, 					"Screenshot embeds should be present"
+# 	  end
     end
 
     should "retrieve the list of screenshots" do
 	  screenshots = @browshot.screenshot_list()
 	  assert_equal true, screenshots.length > 0,					"There should be multiple screenshots"
 
-      screenshot_id = 0
+	  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"
-      screenshot = screenshots[screenshot_id]
+	  screenshot = screenshots[screenshot_id]
 
 	  assert_equal false, screenshot['id'].nil?,					"Screenshot ID should be present"
 	  assert_equal false, screenshot['status'].nil?,				"Screenshot status should be present"
@@ -412,7 +413,7 @@ class TestBrowshot < Test::Unit::TestCase
 	  screenshots = @browshot.screenshot_list()
 	  assert_equal true, screenshots.length > 0,					"There should be multiple screenshots"
 
-      screenshot_id = 0
+	  screenshot_id = 0
 	  screenshots.each do |key, screenshot|
 		screenshot_id = key
 		break
@@ -440,8 +441,27 @@ class TestBrowshot < Test::Unit::TestCase
 	  hosting = @browshot.screenshot_share(0)
 	  assert_equal 'error', hosting['status'],						"Missing screenshot ID"
 	end
+	
+	should "Search for screenshots" do
+	  screenshots = @browshot.screenshot_search('google.com', { :details => 0 })
+	  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"
+	  screenshot = screenshots[screenshot_id]
+
+	  assert_equal false, screenshot['id'].nil?,					"Screenshot ID should be present"
+	  assert_equal false, screenshot['status'].nil?,				"Screenshot status should be present"
+	  assert_equal false, screenshot['priority'].nil?,				"Screenshot priority should be present"
+	  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"

metadata

@@ -1,114 +1,149 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: browshot
-version: !ruby/object:Gem::Version
-  version: 1.10.0
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  hash: 39
+  prerelease: false
+  segments: 
+  - 1
+  - 12
+  - 0
+  version: 1.12.0
 platform: ruby
-authors:
+authors: 
 - Julien Sobrier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-28 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+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
   name: json
-  requirement: &215834040 !ruby/object:Gem::Requirement
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: *215834040
-- !ruby/object:Gem::Dependency
   name: url
-  requirement: &215833300 !ruby/object:Gem::Requirement
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
   prerelease: false
-  version_requirements: *215833300
-- !ruby/object:Gem::Dependency
   name: json
-  requirement: &215832600 !ruby/object:Gem::Requirement
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: *215832600
-- !ruby/object:Gem::Dependency
   name: url
-  requirement: &215831900 !ruby/object:Gem::Requirement
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: *215831900
-- !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &217283560 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *217283560
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: &217282880 !ruby/object:Gem::Requirement
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *217282880
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: &217282160 !ruby/object:Gem::Requirement
+  name: bundler
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 6
+        - 4
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *217282160
-- !ruby/object:Gem::Dependency
-  name: rcov
-  requirement: &217281260 !ruby/object:Gem::Requirement
+  name: jeweler
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: *217281260
-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.'
+  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."
 email: julien@sobrier.net
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - LICENSE.txt
 - README.rdoc
-files:
+files: 
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -118,33 +153,39 @@ files:
 - lib/browshot.rb
 - test/helper.rb
 - test/test_browshot.rb
+has_rdoc: true
 homepage: http://github.com/juliensobrier/browshot-ruby
-licenses:
+licenses: 
 - MIT
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: -608764482714379924
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Ruby library for Browshot (L<http://www.browshot.com/>), a web service to
-  create website screenshots.
+summary: Ruby library for Browshot (L<http://www.browshot.com/>), a web service to create website screenshots.
 test_files: []
+