browshot 1.3.0 → 1.4.0

data/Gemfile

@@ -1,11 +1,15 @@
 source "http://rubygems.org"
 # Dependencies required to use browshot
 
-gem "json", ">= 0"
-gem "url", ">= 0"
+group :runtime do
+  gem "json", ">= 0"
+  gem "url", ">= 0"
+end
 
 # 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"

data/README.rdoc

@@ -33,5 +33,5 @@ Or
 
 == Copyright
 
-Copyright (c) 2011 Julien Sobrier. See LICENSE.txt for
+Copyright (c) 2012 Julien Sobrier. See LICENSE.txt for
 further details.

data/VERSION

@@ -1 +1 @@
-1.3.0
+1.4.0

data/lib/browshot.rb

@@ -5,7 +5,7 @@
 # and this library.
 #
 # Author::    Julien Sobrier  (mailto:jsobrier@browshot.com)
-# Copyright:: Copyright (c) 2011 Browshot
+# Copyright:: Copyright (c) 2012 Browshot
 # License::   Distributes under the same terms as Ruby
 
 require 'url'
@@ -34,8 +34,42 @@ 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.3"
-	end
+		return "1.4"
+	end
+
+    # Retrieve a screenshot with one call. See http://browshot.com/api/documentation#simple for the full list of possible arguments.
+    #
+    # Return {: code => 200, :png => <content>} in case of success
+    def simple(parameters={})
+        begin
+            url = make_url('simple', parameters)
+            response = fetch(url.to_s)
+            case response
+                when Net::HTTPSuccess     then 
+                    return {:code => response.code, :png => response.response.body}
+                else
+                    return {:code => response.code, :png => ''}
+            end
+        rescue Exception => e
+            puts "{e.message}" if (@debug)
+            raise e
+        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.
+    #
+    # Return {: code => 200, :file => <file_name>} in case of success
+    #
+    # +file+:  Local file name to write to.
+    def simple_file(file='', parameters={})
+        data = self.simple(parameters)
+        if (data[:png].length > 0)
+            File.open(file, 'w') {|f| f.write(data[:png]) }
+            return {:code => data[:code], :file => file}
+        else
+            return {:code => data[:code], :file => ''}
+        end
+    end
 
 	# Return the list of instances. See http://browshot.com/api/documentation#instance_list for the response format.
 	def instance_list()
@@ -176,4 +210,29 @@ class Browshot
 			raise e
 		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)
+        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
 end

data/test/test_browshot.rb

@@ -14,7 +14,19 @@ class TestBrowshot < Test::Unit::TestCase
     end
 
     should "get the API version" do
-      assert_equal '1.3', @browshot.api_version()
+      assert_equal '1.4', @browshot.api_version()
+    end
+
+    should "get a screenshot with the simple method" do
+        data = @browshot.simple({'url' => 'http://mobilito.net/', 'cache' => 60 * 60 * 24 * 365})
+        assert_equal 200, data[:code].to_i,                     "Screenshot should be succesful"
+        assert_equal true, data[:png].length > 0,               "Screenshot should be sent"
+    end
+
+     should "get an error with the simple method" do
+        data = @browshot.simple({'url' => 'http://', 'cache' => 60 * 60 * 24 * 365})
+        assert_equal 400, data[:code].to_i,                     "Screenshot should have failed"
+        assert_equal 0, data[:png].length,                      "Screenshot should not be sent"
     end
 
     should "get the list of instances available" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: browshot
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-11 00:00:00.000000000 Z
+date: 2012-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &245654200 !ruby/object:Gem::Requirement
+  requirement: &76488040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *245654200
+  version_requirements: *76488040
 - !ruby/object:Gem::Dependency
   name: url
-  requirement: &245652940 !ruby/object:Gem::Requirement
+  requirement: &76487040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,32 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *245652940
+  version_requirements: *76487040
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &76486260 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *76486260
+- !ruby/object:Gem::Dependency
+  name: url
+  requirement: &76485600 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *76485600
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &245448520 !ruby/object:Gem::Requirement
+  requirement: &76484880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *245448520
+  version_requirements: *76484880
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &245447720 !ruby/object:Gem::Requirement
+  requirement: &76520160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +76,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *245447720
+  version_requirements: *76520160
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &245447060 !ruby/object:Gem::Requirement
+  requirement: &76519480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +87,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *245447060
+  version_requirements: *76519480
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &245446360 !ruby/object:Gem::Requirement
+  requirement: &76518780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *245446360
+  version_requirements: *76518780
 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 +141,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -318905846475433273
+      hash: -2499451636168677631
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: