browshot 1.2.1 → 1.3.0

data/README.rdoc

@@ -8,6 +8,8 @@ The library version matches closely the API version it handles: browshot 1.0.0 i
 
 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
@@ -15,6 +17,10 @@ browshot can handle most the API updates within the same major version, e.g. bro
     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

data/VERSION

@@ -1 +1 @@
-1.2.1
+1.3.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.2"
+		return "1.3"
 	end
 
 	# Return the list of instances. See http://browshot.com/api/documentation#instance_list for the response format.

data/test/test_browshot.rb

@@ -14,7 +14,7 @@ class TestBrowshot < Test::Unit::TestCase
     end
 
     should "get the API version" do
-      assert_equal '1.2', @browshot.api_version()
+      assert_equal '1.3', @browshot.api_version()
     end
 
     should "get the list of instances available" do
@@ -128,7 +128,7 @@ class TestBrowshot < Test::Unit::TestCase
 
     should "create a browser" do
 	  # browser is not actually created for test account, so the reply may not match our parameters
-	  browser = @browshot.browser_create({'mobile' => 1, 'flash' => 1, 'user_agent' => 'test'});
+	  browser = @browshot.browser_create({'mobile' => 1, 'flash' => 1, 'user_agent' => 'test'})
 
 	  assert_equal false, browser['name'].nil?,						"Browser name should be present"
 	  assert_equal false, browser['user_agent'].nil?,				"Browser user_agent should be present"
@@ -144,7 +144,7 @@ class TestBrowshot < Test::Unit::TestCase
     end
 
     should "fail to create screenshot" do
-	  screenshot = @browshot.screenshot_create();
+	  screenshot = @browshot.screenshot_create()
 	  assert_equal false, screenshot['error'].nil?,					"Screenshot should have failed"
 
 	  screenshot = @browshot.screenshot_create('-')
@@ -154,7 +154,7 @@ class TestBrowshot < Test::Unit::TestCase
 
     should "create screenshot" do
 	  # screenshot is not actually created for test account, so the reply may not match our parameters
-	  screenshot = @browshot.screenshot_create('http://browshot.com/');
+	  screenshot = @browshot.screenshot_create('http://browshot.com/')
 
 	  assert_equal false, screenshot['id'].nil?, 					"Screenshot ID should be present"
 	  assert_equal false, screenshot['status'].nil?, 				"Screenshot status should be present"
@@ -176,6 +176,7 @@ class TestBrowshot < Test::Unit::TestCase
 	  	assert_equal false, screenshot['final_url'].nil?, 			"Screenshot final_url should be present"
 	  	assert_equal false, screenshot['content_type'].nil?, 		"Screenshot content_type should be present"
 	  	assert_equal false, screenshot['scale'].nil?, 				"Screenshot scale should be present"
+		assert_equal false, screenshot['cost'].nil?, 				"Screenshot cost should be present"
 	  end
     end
 
@@ -185,12 +186,13 @@ class TestBrowshot < Test::Unit::TestCase
     end
 
     should "to retrieve a screenshot" do
-	  screenshot = @browshot.screenshot_create('http://browshot.com/');
+	  screenshot = @browshot.screenshot_create('http://browshot.com/')
       info  = @browshot.screenshot_info(screenshot['id'])
 
 	  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"
@@ -212,7 +214,7 @@ class TestBrowshot < Test::Unit::TestCase
     end
 
     should "retrieve the list of screenshots" do
-	  screenshots = @browshot.screenshot_list();
+	  screenshots = @browshot.screenshot_list()
 	  assert_equal true, screenshots.length > 0,					"There should be multiple screenshots"
 
       screenshot_id = 0
@@ -221,12 +223,13 @@ class TestBrowshot < Test::Unit::TestCase
 		break
 	  end
 
-	  assert_equal true, screenshot_id.to_i > 0,					"Screesnot ID should be positive"
+	  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"
 
 	  if (screenshot['status'] == 'finished')
 	  	assert_equal false, screenshot['screenshot_url'].nil?, 		"Screenshot screenshot_url should be present"
@@ -247,16 +250,16 @@ class TestBrowshot < Test::Unit::TestCase
 	  end
 	end
 
-    should "retrieve a thrumbnail" do
+    should "retrieve a thumbnail" do
 	  # TODO
 	end
 
     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 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 1,     account['active'].to_i, 					"Accountshould be active"
 	  assert_equal false, account['instances'].nil?, 				"Account instances should be present"
 	end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: browshot
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-21 00:00:00.000000000 Z
+date: 2011-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &165066380 !ruby/object:Gem::Requirement
+  requirement: &245654200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *165066380
+  version_requirements: *245654200
 - !ruby/object:Gem::Dependency
   name: url
-  requirement: &165065860 !ruby/object:Gem::Requirement
+  requirement: &245652940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *165065860
+  version_requirements: *245652940
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &165065360 !ruby/object:Gem::Requirement
+  requirement: &245448520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *165065360
+  version_requirements: *245448520
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &165064880 !ruby/object:Gem::Requirement
+  requirement: &245447720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *165064880
+  version_requirements: *245447720
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &165064380 !ruby/object:Gem::Requirement
+  requirement: &245447060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *165064380
+  version_requirements: *245447060
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &165063880 !ruby/object:Gem::Requirement
+  requirement: &245446360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *165063880
+  version_requirements: *245446360
 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
@@ -119,7 +119,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3205083617624134341
+      hash: -318905846475433273
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: