screencap 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28ed160fef44cf77a4cdd3f9fd9676131a02ae8c
-  data.tar.gz: db5b4a1625f6fdc435bd67aea51af0e1d1a83e54
+  metadata.gz: 335be3e03b666778384318d5326aa80cdbac1301
+  data.tar.gz: a8f12091c0cd065d3fa064f07082d73e9dddae99
 SHA512:
-  metadata.gz: f47c6e3e66e05ac74768f06b9ad7ef4e4dc5deb5c0e3584364c71e1990ca03da811c8b9734fbbf84b36c23d95afcf377939c4f59ad460567098b3c1ab5663f53
-  data.tar.gz: a4f0531c70ea4aa88bc8645f6857b59ce7452928f6509661e50f12a0c9a6e637071dbf542323d1ad8c1e4a71215971a5660be0d7421612ad8ccdd45cf1dd63ba
+  metadata.gz: 389db19dc7750dc26dfd5b0ad8e2e2e2ba0924037d7739234698b8b0f579cce3b07f1d423efb1e0d05717f0585cdb4eaf94c29345d427788accd56e3ed074b4b
+  data.tar.gz: 70681a3da6adf7dce7db0b28c5348aa5934c695bf773cff9b16d0843388aea12f3c1a547c77a8aeb3c3f66845e120ad1a1386d6a98c67f9318c4fdc9075a121b

data/lib/screencap/raster.js

@@ -10,6 +10,7 @@
 // - div           [optional] - a selector to use to screenshot to a specific element
 // - resourceWait  [optional] - default 300 - the time to wait after the last resource has loaded in MS before taking the screenshot
 // - maxRenderWait [optional] - default 10000 - the maximum time to wait before taking the screenshot, regardless of whether resources are waiting to be loaded
+// - cutoffWait    [optional] - default null - the maximum time to wait before cutting everything off and failing...this helps if there is a page taking a long time to load
 // - top, left, width, height [optional] - dimensions to use to screenshot a specific area of the screen
 //
 // == Important notice when providing height ==
@@ -20,12 +21,14 @@
 var page           = new WebPage(),
     resourceWait   = 300,
     maxRenderWait  = 10000,
+    cutoffWait     = null,
     args           = {},
     resourceCount  = 0,
     debug          = false,
     mask           = null,
     forcedRenderTimeout,
-    renderTimeout;
+    renderTimeout,
+    cutoffTimeout;
 
 //
 // Functions
@@ -38,10 +41,12 @@ function pickupNamedArguments() {
     }
 
     if(!args.width)        { args.width = 1024; }
+    if(!args.dpi)          { args.dpi = 1; }
     if(args.url)           { args.url = decodeURIComponent(args.url); }
     if(args.debug)         { debug = true; }
     if(args.resourceWait)  { resourceWait = args.resourceWait; }
     if(args.maxRenderWait) { maxRenderWait = args.maxRenderWait; }
+    if(args.cutoffWait)    { cutoffWait = args.cutoffWait; }
 }
 
 function setupMask() {
@@ -59,14 +64,29 @@ function setupMask() {
 function doRender() {
     clearTimeout(renderTimeout);
     clearTimeout(forcedRenderTimeout);
+    clearTimeout(cutoffTimeout);
     page.render(args.output);
     phantom.exit();
 }
 
+// if the page is taking too long (set via cutoffWait) to load, just exit cleanly
+function cutoff() {
+  clearTimeout(renderTimeout);
+  clearTimeout(forcedRenderTimeout);
+  console.log('Unable to load: ' + args.url + '. Process exceeded cutoff timeout.');
+  phantom.exit();
+}
+
 function delayScreenshotForResources() {
     forcedRenderTimeout = setTimeout(doRender, maxRenderWait);
 }
 
+function cutoffExecution() {
+  if(cutoffWait != null) {
+    cutoffTimeout = setTimeout(cutoff, cutoffWait);
+  }
+}
+
 function evaluateWithArgs(func) {
     var args = [].slice.call(arguments, 1);
     var fn =  "function() { return (" + func.toString() + ").apply(this, " + JSON.stringify(args) + "); }";
@@ -74,12 +94,14 @@ function evaluateWithArgs(func) {
 }
 
 function takeScreenshot() {
+  cutoffExecution();
    page.open(args.url, function(status) {
         if(status !== 'success') {
             console.log('Unable to load: ' + args.url);
             phantom.exit();
         } else {
             delayScreenshotForResources();
+
             page.includeJs(
                 "https://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js",
                 function() {
@@ -104,10 +126,21 @@ function takeScreenshot() {
                                });
                             },
                             page.viewportSize.width,
-                            page.viewportSize.height
+                            page.viewportSize.height / args.dpi
                         );
                     }
 
+                    if (args.dpi !== 1) {
+                    evaluateWithArgs(
+                        function(dpi) {
+                            document.body.style.webkitTransform = "scale(" + dpi + ")";
+                            document.body.style.webkitTransformOrigin = "0% 0%";
+                            document.body.style.width = (100 / dpi) + "%";
+                        },
+                        args.dpi
+                    );
+                    }
+
                     if(!foundDiv) {
                         phantom.exit();
                     }

data/lib/screencap/version.rb

@@ -1,3 +1,3 @@
 module Screencap
-  VERSION = "0.1.2"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: screencap
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Maxwell Salzberg
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-30 00:00:00.000000000 Z
+date: 2015-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec