webshot 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62a9727397129f1b5a062f88bd46a48c1b4dd5db
-  data.tar.gz: b8d66c2cad1e39bb66c55b245549486d1e8e52bb
+  metadata.gz: 41f7943a283536330672cd680f8ce992a0d4723e
+  data.tar.gz: 3d3f6dfe184a6b1d22ed2e6347b9722dfaa7c45e
 SHA512:
-  metadata.gz: 6576d08d90ffe8fc2f129f143cf7f13327af5375e7ceef002646fa9df7f55baa459ebe7d8bfaed128e164359dadd15f3da8722d7f95f5d75903c155f857b807e
-  data.tar.gz: 4e76de6199a9a96ba5feb068645733dcc857bfefd667a30c7c43cce9d2e929f4c73580897b5c2f23c6f1263cb7be2e2ba82cc01257ed525a002650b8a2cf9868
+  metadata.gz: c48722fa56971be69bb4e7865613c0c5110e649b8d8676885a32153704bbc0bcff10473d4272485bcde84aae39efa65469fbec45e2a8de20310eb9b1c716b7b1
+  data.tar.gz: df2cf5b137f23928c91a57ad30981cbd287e08b7d917476424e7873eef65a90928fe7931e49c1009aab7ba1771f7428af791a16756f59bda0f245b1e66aa6b84

data/.travis.yml

@@ -3,12 +3,8 @@ cache: bundler
 before_install:
   - gem install bundler
 rvm:
+  - 2.2
   - 2.1
   - 2.0
-  - 1.9.3
-  - jruby-19mode # JRuby in 1.9 mode
-  - rbx-2
 matrix:
-  allow_failures:
-    - rvm: rbx-2
   fast_finish: true

data/CONTRIBUTORS

@@ -1 +1,4 @@
 Alex Avoyants
+Nick Kezhaya
+Rafa García
+Sage Ross

data/README.md

@@ -6,7 +6,7 @@ Captures a web page as a screenshot using Poltergeist, Capybara and PhantomJS.
 
 ## Installation
 
-Download and install [PhantomJS](http://phantomjs.org/),
+Download and install [PhantomJS](http://phantomjs.org/releases.html) version 1.9,
 add the directory containing the binary to your PATH.
 
 Add the `webshot` gem to your Gemfile:
@@ -33,6 +33,13 @@ ws.capture "http://www.google.com/", "google.png"
 # Customize thumbnail
 ws.capture "http://www.google.com/", "google.png", width: 100, height: 90, quality: 85
 
+# Specify only width, height will be computed according to page's height
+ws.capture "http://www.google.com/", "google.png", width: 1024
+
+# Specify an array of additional HTTP status codes to accept,
+# beyond normal success codes like 200 or 302
+ws.capture "http://www.google.com/foo", "google_404.png", allowed_status_codes: [404]
+
 # Customize thumbnail generation (MiniMagick)
 # see: https://github.com/minimagick/minimagick
 ws.capture("http://www.google.com/", "google.png") do |magick|

data/lib/webshot/screenshot.rb

@@ -14,7 +14,7 @@ module Webshot
       # Browser settings
       page.driver.resize(width, height)
       page.driver.headers = {
-        "User-Agent" => user_agent,
+        "User-Agent" => user_agent
       }
     end
 
@@ -25,6 +25,13 @@ module Webshot
       self
     end
 
+    def valid_status_code?(status_code, allowed_status_codes)
+      return true if status_code == 200
+      return true if status_code / 100 == 3
+      return true if allowed_status_codes.include?(status_code)
+      false
+    end
+
     # Captures a screenshot of +url+ saving it to +path+.
     def capture(url, path, opts = {})
       begin
@@ -33,6 +40,7 @@ module Webshot
         height  = opts.fetch(:height, 90)
         gravity = opts.fetch(:gravity, "north")
         quality = opts.fetch(:quality, 85)
+        allowed_status_codes = opts.fetch(:allowed_status_codes, [])
 
         # Reset session before visiting url
         Capybara.reset_sessions! unless @session_started
@@ -45,36 +53,37 @@ module Webshot
         sleep opts[:timeout] if opts[:timeout]
 
         # Check response code
-        if page.driver.status_code.to_i == 200 || page.driver.status_code.to_i / 100 == 3
-          tmp = Tempfile.new(["webshot", ".png"])
-          tmp.close
-          begin
-            # Save screenshot to file
-            page.driver.save_screenshot(tmp.path, :full => true)
+        status_code = page.driver.status_code.to_i
+        unless valid_status_code?(status_code, allowed_status_codes)
+          fail WebshotError, "Could not fetch page: #{url.inspect}, error code: #{page.driver.status_code}"
+        end
 
-            # Resize screenshot
-            thumb = MiniMagick::Image.open(tmp.path)
-            if block_given?
-              # Customize MiniMagick options
-              yield thumb
-            else
-              thumb.combine_options do |c|
-                c.thumbnail "#{width}x"
-                c.background "white"
-                c.extent "#{width}x#{height}"
-                c.gravity gravity
-                c.quality quality
-              end
-            end
+        tmp = Tempfile.new(["webshot", ".png"])
+        tmp.close
+        begin
+          # Save screenshot to file
+          page.driver.save_screenshot(tmp.path, :full => true)
 
-            # Save thumbnail
-            thumb.write path
-            thumb
-          ensure
-            tmp.unlink
+          # Resize screenshot
+          thumb = MiniMagick::Image.open(tmp.path)
+          if block_given?
+            # Customize MiniMagick options
+            yield thumb
+          else
+            thumb.combine_options do |c|
+              c.thumbnail "#{width}x"
+              c.background "white"
+              c.extent "#{width}x#{height}"
+              c.gravity gravity
+              c.quality quality
+            end
           end
-        else
-          raise WebshotError.new("Could not fetch page: #{url.inspect}, error code: #{page.driver.status_code}")
+
+          # Save thumbnail
+          thumb.write path
+          thumb
+        ensure
+          tmp.unlink
         end
       rescue Capybara::Poltergeist::StatusFailError, Capybara::Poltergeist::BrowserError, Capybara::Poltergeist::DeadClient, Capybara::Poltergeist::TimeoutError, Errno::EPIPE => e
         # TODO: Handle Errno::EPIPE and Errno::ECONNRESET

data/lib/webshot/version.rb

@@ -1,3 +1,3 @@
 module Webshot
-  VERSION = '0.0.9'
+  VERSION = '0.0.10'
 end

data/test/webshot_test.rb

@@ -1,7 +1,6 @@
 require "test_helper"
 
 class WebshotTest < MiniTest::Unit::TestCase
-
   DATA_DIR = File.expand_path(File.dirname(__FILE__) + "/data")
 
   def setup
@@ -12,18 +11,18 @@ class WebshotTest < MiniTest::Unit::TestCase
   def test_http
     %w(www.yahoo.com).each do |name|
       output = thumb(name)
-      File.delete output if File.exists? output
+      File.delete output if File.exist? output
       @webshot.capture "http://#{name}/", output
-      assert File.exists? output
+      assert File.exist? output
     end
   end
 
   def test_https
     %w(github.com).each do |name|
       output = thumb(name)
-      File.delete output if File.exists? output
+      File.delete output if File.exist? output
       @webshot.capture "https://#{name}/", output
-      assert File.exists? output
+      assert File.exist? output
     end
   end
 
@@ -38,7 +37,7 @@ class WebshotTest < MiniTest::Unit::TestCase
   def test_mini_magick
     %w(www.yahoo.com).each do |name|
       output = thumb(name)
-      File.delete output if File.exists? output
+      File.delete output if File.exist? output
 
       # Customize MiniMagick options
       result = @webshot.capture("http://#{name}/", output) do |thumb|
@@ -46,11 +45,21 @@ class WebshotTest < MiniTest::Unit::TestCase
           c.thumbnail "100x90"
         end
       end
-      assert File.exists? output
+      assert File.exist? output
       assert result.respond_to? :to_blob
     end
   end
 
+  def test_allowed_404_status
+    %w(en.wikipedia.org/wiki/THIS_PAGE_DOES_NOT_EXIST).each do |name|
+      output = thumb('404_example')
+      File.delete output if File.exist? output
+
+      @webshot.capture "https://#{name}/", output, allowed_status_codes: [404]
+      assert File.exist? output
+    end
+  end
+
   protected
 
   def thumb(name)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webshot
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Vitalie Cherpec
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-14 00:00:00.000000000 Z
+date: 2015-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler