webshot 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19a7cddd3d323eeee360c98b4c8f5cee8fce061a
-  data.tar.gz: 1b9635e641e0f54c3f8eb626db24449195a4b42c
+  metadata.gz: 62a9727397129f1b5a062f88bd46a48c1b4dd5db
+  data.tar.gz: b8d66c2cad1e39bb66c55b245549486d1e8e52bb
 SHA512:
-  metadata.gz: 14b7145f81a687abaecdb085d173b2d48fee57dee1f19fdbfd8e2f6fb386cfb603ba03f3058e30fc4578689a95299dae23c171f50b581bd4562aeaa9c44495ca
-  data.tar.gz: 55e87693fe5205116982bdc38c4c5ec1f6b8968068845d420ae9dcdcc446024b1f9807d0a3ce88c9f756f6dec82a6620a7cd62f0ea2e38abd8d7b56b4dbfb706
+  metadata.gz: 6576d08d90ffe8fc2f129f143cf7f13327af5375e7ceef002646fa9df7f55baa459ebe7d8bfaed128e164359dadd15f3da8722d7f95f5d75903c155f857b807e
+  data.tar.gz: 4e76de6199a9a96ba5feb068645733dcc857bfefd667a30c7c43cce9d2e929f4c73580897b5c2f23c6f1263cb7be2e2ba82cc01257ed525a002650b8a2cf9868

data/.travis.yml

@@ -3,8 +3,8 @@ cache: bundler
 before_install:
   - gem install bundler
 rvm:
-  - 2.1.1
-  - 2.0.0
+  - 2.1
+  - 2.0
   - 1.9.3
   - jruby-19mode # JRuby in 1.9 mode
   - rbx-2

data/README.md

@@ -6,8 +6,10 @@ Captures a web page as a screenshot using Poltergeist, Capybara and PhantomJS.
 
 ## Installation
 
-Download and install [PhantomJS](http://phantomjs.org/) and then add PhantomJS to
-your PATH. Add this line to your application's Gemfile:
+Download and install [PhantomJS](http://phantomjs.org/),
+add the directory containing the binary to your PATH.
+
+Add the `webshot` gem to your Gemfile:
 
     gem "webshot"
 
@@ -65,6 +67,31 @@ end.capture 'https://github.com/username/', 'github.png'
 
 ```
 
+## Scaling
+
+It's not recommended to start multiple PhantomJS concurrently.
+You should serialize requests, treat the process as unreliable and
+monitor it with daemontools, god, monit, etc.
+
+Recommended setup:
+
+     [S3] <-- [CloudFront + 404 handler] <-- User Request
+      ^
+      |
+    Worker <--> [Queue] <-- App
+
+
+The application triggers screenshot requests which are queued and
+then processed by a background worker (Resque, Sidkiq, etc).
+The worker uploads the images to S3 which are served through
+CloudFront. The CDN should be configured to serve a default
+image (404 handler) with a low TTL to handle screenshot are not
+yet ready or couldn't be generated.
+
+Notes:
+  - sed 's/S3/Your file hosting service/g'
+  - sed 's/CloudFront/Your CDN service/g'
+
 ## Contributing
 
 1. Fork it

data/lib/webshot/screenshot.rb

@@ -76,7 +76,7 @@ module Webshot
         else
           raise WebshotError.new("Could not fetch page: #{url.inspect}, error code: #{page.driver.status_code}")
         end
-      rescue Capybara::Poltergeist::BrowserError, Capybara::Poltergeist::DeadClient, Capybara::Poltergeist::TimeoutError, Errno::EPIPE => e
+      rescue Capybara::Poltergeist::StatusFailError, Capybara::Poltergeist::BrowserError, Capybara::Poltergeist::DeadClient, Capybara::Poltergeist::TimeoutError, Errno::EPIPE => e
         # TODO: Handle Errno::EPIPE and Errno::ECONNRESET
         raise WebshotError.new("Capybara error: #{e.message.inspect}")
       end

data/lib/webshot/version.rb

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

data/webshot.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "gem-release"
 
   spec.add_dependency "activesupport"
-  spec.add_dependency "poltergeist", "~> 1.5.0"
+  spec.add_dependency "poltergeist", "~> 1.6.0"
   spec.add_dependency "faye-websocket", "~> 0.7.3"
-  spec.add_dependency "mini_magick", "~> 3.7.0"
+  spec.add_dependency "mini_magick", "~> 4.3.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webshot
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Vitalie Cherpec
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-21 00:00:00.000000000 Z
+date: 2015-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: faye-websocket
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: 4.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: 4.3.3
 description: Captures a web page as a screenshot using Poltergeist, Capybara and PhantomJS
 email:
 - vitalie@penguin.ro