wraith 2.3.1 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b1ef3f4e6afe88d801486999230f8f3284d57ec
-  data.tar.gz: e4635f5a2433c7951cf2ce13374cfb37f9d6a47c
+  metadata.gz: 21c2e2f34b4f57be52b02d9c1812068629fab964
+  data.tar.gz: e0db82084db042e981d2141385e95a9f79d3bdf7
 SHA512:
-  metadata.gz: f2e3b5f04d9387bfdc9877bc58e7a5769bd0f261a2e23a68a02f6a1a95555761bd85b83283a3015c49bcc2cf7ab324cd0ad2eef8d6da65359ab38c00d8fdcd57
-  data.tar.gz: 32ba015605d4b92c53da0f70efbb72e37ee45cc43665512d48a75670636135a541d6ed63fdd9fd1ad4a9f3b5616ca1a1766f06fee988ce96071aa516b092e50d
+  metadata.gz: fa0e6f3d579ca6e85f8a08a00ad09a059dc54798d82f8e90767585f3e85b718d9aee3a95d910987e9853edb43190ec724c1428f993562f29c167687182559aa5
+  data.tar.gz: 2de08d53d57c00f582d1535383d837be73d4a7c4594481081c8d47147f5ee0b02dc8a006b00f2c60e494b1b8b001c0b7bfd973e9f8310dedfc509dadf58a8059

data/configs/custom_height.yaml

@@ -0,0 +1,42 @@
+#Headless browser option
+browser:
+  phantomjs: "phantomjs"
+  # slimerjs: "slimerjs"
+
+#If you want to have multiple snapping files, set the file name here
+snap_file: "lib/wraith/javascript/customHeight.js"
+
+# Type the name of the directory that shots will be stored in
+directory: 'shots'
+
+# Add only 2 domains, key will act as a label
+domains:
+  english: "http://www.live.bbc.co.uk/news"
+  russian: "http://www.live.bbc.co.uk/russian"
+
+#Type screen widths below, here are a couple of examples
+screen_widths:
+# - widthxheight
+  - 480x320
+  - 400x600
+  - 600x768
+  - 800x1024
+  - 720x1280
+
+#Type page URL paths below, here are a couple of examples
+paths:
+  home: /
+  uk_index: /uk
+
+#Amount of fuzz ImageMagick will use
+fuzz: '20%'
+
+#Set the number of days to keep the site spider file
+spider_days:
+  - 10
+
+#Choose how results are displayed, by default alphanumeric. Different screen widths are always grouped.
+#alphanumeric - all paths (with, and without, a difference) are shown, sorted by path
+#diffs_first - all paths (with, and without, a difference) are shown, sorted by difference size (largest first)
+#diffs_only - only paths with a difference are shown, sorted by difference size (largest first)
+#mode: diffs_first

data/lib/wraith/cli.rb

@@ -83,7 +83,7 @@ class Wraith::CLI < Thor
   end
 
   desc 'generate_gallery [config_name]', 'create page for viewing images'
-  def generate_gallery(config_name, multi)
+  def generate_gallery(config_name, multi = false)
     gallery = Wraith::GalleryGenerator.new(config_name, multi)
     gallery.generate_gallery
   end

data/lib/wraith/folder.rb

@@ -34,7 +34,7 @@ class Wraith::FolderManager
   end
 
   def copy_old_shots
-    FileUtils.cp_r(dir, history_dir)
+    FileUtils.cp_r("#{dir}/.", "#{history_dir}/")
   end
 
   def restore_shots

data/lib/wraith/javascript/customHeight.js

@@ -0,0 +1,99 @@
+var system = require('system');
+var page = require('webpage').create();
+var fs = require('fs');
+
+if (system.args.length === 3) {
+    console.log('Usage: snap.js <some URL> <view port width> <target image name>');
+    phantom.exit();
+}
+
+var url = system.args[1];
+var image_name = system.args[3];
+var dimensions = /(\d*)x?((\d*))?/i.exec(system.args[2]);
+var view_port_width = dimensions[1];
+var view_port_height = dimensions[2] || 1500;
+var current_requests = 0;
+var last_request_timeout;
+var final_timeout;
+
+
+page.viewportSize = { width: view_port_width, height: view_port_height};
+page.settings = { loadImages: true, javascriptEnabled: true };
+
+// If you want to use additional phantomjs commands, place them here
+page.settings.userAgent = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_2) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/28.0.1500.95 Safari/537.17';
+
+// You can place custom headers here, example below.
+// page.customHeaders = {
+
+//      'X-Candy-OVERRIDE': 'https://api.live.bbc.co.uk/'
+
+//  };
+
+// If you want to set a cookie, just add your details below in the following way.
+
+// phantom.addCookie({
+//     'name': 'ckns_policy',
+//     'value': '111',
+//     'domain': '.bbc.co.uk'
+// });
+// phantom.addCookie({
+//     'name': 'locserv',
+//     'value': '1#l1#i=6691484:n=Oxford+Circus:h=e@w1#i=8:p=London@d1#1=l:2=e:3=e:4=2@n1#r=40',
+//     'domain': '.bbc.co.uk'
+// });
+
+page.onResourceRequested = function(req) {
+  current_requests += 1;
+};
+
+page.onResourceReceived = function(res) {
+  if (res.stage === 'end') {
+    current_requests -= 1;
+    debounced_render();
+  }
+};
+
+page.open(url, function(status) {
+  if (status !== 'success') {
+    console.log('Error with page ' + url);
+    phantom.exit();
+  }
+});
+
+
+function debounced_render() {
+  clearTimeout(last_request_timeout);
+  clearTimeout(final_timeout);
+
+  // If there's no more ongoing resource requests, wait for 1 second before
+  // rendering, just in case the page kicks off another request
+  if (current_requests < 1) {
+      clearTimeout(final_timeout);
+      last_request_timeout = setTimeout(function() {
+          console.log('Snapping ' + url + ' at width ' + view_port_width);
+          page.clipRect = {
+            top: 0,
+            left: 0,
+            height: view_port_height,
+            width: view_port_width
+          };
+          page.render(image_name);
+          phantom.exit();
+      }, 1000);
+  }
+
+  // Sometimes, straggling requests never make it back, in which
+  // case, timeout after 5 seconds and render the page anyway
+  final_timeout = setTimeout(function() {
+    console.log('Snapping ' + url + ' at width ' + view_port_width);
+    page.clipRect = {
+      top: 0,
+      left: 0,
+      height: view_port_height,
+      width: view_port_width
+    };
+    page.render(image_name);
+    phantom.exit();
+  }, 5000);
+}

data/lib/wraith/version.rb

@@ -1,3 +1,3 @@
 module Wraith
-  VERSION = '2.3.1'
+  VERSION = '2.3.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wraith
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.3.2
 platform: ruby
 authors:
 - Dave Blooman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-31 00:00:00.000000000 Z
+date: 2015-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -189,6 +189,7 @@ files:
 - configs/component.yaml
 - configs/config.yaml
 - configs/config_nojs.yaml
+- configs/custom_height.yaml
 - configs/history.yaml
 - configs/test_config.yaml
 - lib/wraith.rb
@@ -200,6 +201,7 @@ files:
 - lib/wraith/gallery_template/bootstrap.min.css
 - lib/wraith/gallery_template/gallery_template.erb
 - lib/wraith/javascript/casper.js
+- lib/wraith/javascript/customHeight.js
 - lib/wraith/javascript/nojs.js
 - lib/wraith/javascript/snap.js
 - lib/wraith/save_images.rb