gastly 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65033a39c65ae48403a64c73e28fc8a1de4a7981
-  data.tar.gz: 0bbcc84f2da4bb4ce06524e5952a8b00f1cdb7cf
+  metadata.gz: c192b43a0068cbba91b24d1a7e5647d846b386d9
+  data.tar.gz: bf9af7de29d4482a18daafa105e84abd91a41767
 SHA512:
-  metadata.gz: 7f0105743886cedeca9176dcff78df8cc9880b3798a509512db316deb78f047b8700c5f49d976f4aeff645b1bf6dbde6bfab809e08f640525275fc0e497775bd
-  data.tar.gz: 332b85808e033c3c2ebbd6a03d51ec7fdfc00de17d0775333ed7d13a979e3ca323ae7f47dbd8923c49ce8381c13b1e6853e32e307df680b16db3c9700b23a191
+  metadata.gz: 4c0c5705e90950d8ab2e23e9ea4739b2110e6ab5f0ce6bc10d409c56bd2046085640a96513d7eebe130353517caed0e7f9d2af7befbdd08f59850cd1893a8653
+  data.tar.gz: 61c0cf280a979d41fe03c02ae77f9916bd2eff7383d991f3cc67a4fcc4b3cc13849331f4f4528eed6e9f4405c780d92352eab15a387f08ade40fc4317776c5b7

data/lib/gastly/screenshot.rb

@@ -5,6 +5,8 @@ require 'active_support/core_ext/object/blank'
 module Gastly
   class Screenshot
 
+    FetchError = Class.new(StandardError)
+
     SCRIPT_PATH = File.expand_path('../script.js', __FILE__)
     DEFAULT_TIMEOUT = 0
     DEFAULT_BROWSER_WIDTH = 1440
@@ -53,7 +55,9 @@ module Gastly
 
       Phantomjs.proxy_host = proxy_host if proxy_host
       Phantomjs.proxy_port = proxy_port if proxy_port
-      Phantomjs.run(proxy_options, SCRIPT_PATH.to_s, *prepared_params)
+      output = Phantomjs.run(proxy_options, SCRIPT_PATH.to_s, *prepared_params)
+
+      raise FetchError, output if output.present?
 
       Gastly::Image.new(tempfile)
     end

data/lib/gastly/script.js

@@ -39,24 +39,29 @@ if (args.cookies !== undefined){
     }
 }
 
-page.open(args.url, function(){
-    window.setTimeout(function(){
-        page.viewportSize = { width: args.width, height: args.height };
-
-        if (args.selector !== undefined){
-            var clipRect = page.evaluate(function(s){
-                return document.querySelector(s).getBoundingClientRect();
-            }, args.selector);
-
-            page.clipRect = {
-                top:    clipRect.top,
-                left:   clipRect.left,
-                width:  clipRect.width,
-                height: clipRect.height
-            };
-        }
-
-        page.render(args.output);
+page.open(args.url, function(status){
+    if(status !== 'success') {
+        console.log('Unable to load: ' + args.url);
         phantom.exit();
-    }, args.timeout);
+    } else {
+        window.setTimeout(function(){
+            page.viewportSize = { width: args.width, height: args.height };
+
+            if (args.selector !== undefined){
+                var clipRect = page.evaluate(function(s){
+                    return document.querySelector(s).getBoundingClientRect();
+                }, args.selector);
+
+                page.clipRect = {
+                    top:    clipRect.top,
+                    left:   clipRect.left,
+                    width:  clipRect.width,
+                    height: clipRect.height
+                };
+            }
+
+            page.render(args.output);
+            phantom.exit();
+        }, args.timeout);
+    }
 });

data/lib/gastly/version.rb

@@ -1,3 +1,3 @@
 module Gastly
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gastly
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Mikhail Grachev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-07-23 00:00:00.000000000 Z
+date: 2015-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler