wraith 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9eb43d65349986285e6d089a4ed007f7d58247b6
-  data.tar.gz: 8a807791ed5348d4538495c6637ab1e2a6a11efd
+  metadata.gz: 3b81224f867711e225c6f7a2060e37deb7c089d5
+  data.tar.gz: 3613a71af35b90bf3c7b6f200db0c9b16870cd43
 SHA512:
-  metadata.gz: 2460efd5b9be376c0fefeb69926d5c8d7cc05728718f8c2703f2cfb3c827825f701c0dea044424a99ba62ec8e9355fb956b71293e71d8ea9a06a500ea383bedd
-  data.tar.gz: 5a0fcdb92530cb4a46f34e57f90374c1ba229a634e5087d64d85386f1fd146b58bf00ce79d38b4fb15cced586f66faa3be1dcfe1f645fc51fbfb399d068a79ab
+  metadata.gz: 6bed22eccfb886b54541c7f15468be1bb82da36a95266e384f6e3571c7d90c650a8a7a8c87cba57780d0dd5bafb505fbc407ddea7c41e11fd118bb1abe617f9d
+  data.tar.gz: 38b14beb294e7f7d3bce79c43ffa19c44474bdd39de521e2c2346ce71f4395ca34171035ac1b182b8d42dff302783c89280d95f47ee510be3b568e310267c6cb

data/lib/wraith/javascript/_phantom__common.js

@@ -89,7 +89,7 @@ module.exports = function (config) {
       // see https://github.com/n1k0/casperjs/issues/1068
       setTimeout(function(){
         phantom.exit();
-      }, 10);
+      }, 30);
     }
   }
 

data/lib/wraith/javascript/casper.js

@@ -58,12 +58,12 @@ casper.open(url);
 casper.viewport(currentDimensions.viewportWidth, currentDimensions.viewportHeight);
 casper.then(function() {
   if (globalBeforeCaptureJS) {
-    require('./' + globalBeforeCaptureJS)(this);
+    require(globalBeforeCaptureJS)(this);
   }
 });
 casper.then(function() {
   if (pathBeforeCaptureJS) {
-    require('./' + pathBeforeCaptureJS)(this);
+    require(pathBeforeCaptureJS)(this);
   }
 });
 // waits for all images to download before taking screenshots

data/lib/wraith/save_images.rb

@@ -1,6 +1,7 @@
 require "wraith"
 require "parallel"
 require "shellwords"
+require "wraith/utilities"
 
 class Wraith::SaveImages
   attr_reader :wraith, :history, :meta
@@ -135,7 +136,7 @@ class CaptureOptions
   end
 
   def before_capture
-    options["before_capture"] || "false"
+    @options["before_capture"] ? convert_to_absolute(@options["before_capture"]) : "false"
   end
 
   def base_url

data/lib/wraith/utilities.rb

@@ -0,0 +1,12 @@
+# @TODO - extract more shared functions to this file
+
+def convert_to_absolute(filepath)
+  if filepath[0] == '/'
+    # filepath is already absolute. return unchanged
+    filepath
+  else
+    # filepath is relative. it must be converted to absolute
+    working_dir = `pwd`.chomp
+    "#{working_dir}/#{filepath}"
+  end
+end

data/lib/wraith/version.rb

@@ -1,3 +1,3 @@
 module Wraith
-  VERSION = "3.0.0"
+  VERSION = "3.0.1"
 end

data/lib/wraith/wraith.rb

@@ -1,4 +1,5 @@
 require "yaml"
+require "wraith/utilities"
 
 class Wraith::Wraith
   attr_accessor :config
@@ -38,7 +39,7 @@ class Wraith::Wraith
   end
 
   def snap_file
-    @config["snap_file"] || snap_file_from_engine(engine)
+    @config["snap_file"] ? convert_to_absolute(@config["snap_file"]) : snap_file_from_engine(engine)
   end
 
   def snap_file_from_engine(engine)
@@ -55,7 +56,7 @@ class Wraith::Wraith
   end
 
   def before_capture
-    @config["before_capture"] || "false"
+    @config["before_capture"] ? convert_to_absolute(@config["before_capture"]) : "false"
   end
 
   def widths

data/spec/before_capture_spec.rb

@@ -11,6 +11,29 @@ describe Wraith do
   let(:before_suite_js) { "spec/js/global.js" }
   let(:before_capture_js) { "spec/js/path.js" }
 
+  describe "different ways of determining the before_capture file" do
+    it "should allow users to specify the relative path to the before_capture file" do
+      config = YAML.load '
+        browser:        casperjs
+        before_capture: javascript/do_something.js
+      '
+      wraith = Wraith::Wraith.new(config, true)
+      # not sure about having code IN the test, but we want to get this right.
+      expect(wraith.before_capture).to eq (`pwd`.chomp! + '/javascript/do_something.js')
+    end
+
+    it "should allow users to specify the absolute path to the before_capture file" do
+      config = YAML.load '
+        browser:        casperjs
+        before_capture: /Users/some_user/wraith/javascript/do_something.js
+      '
+      wraith = Wraith::Wraith.new(config, true)
+      expect(wraith.before_capture).to eq ('/Users/some_user/wraith/javascript/do_something.js')
+    end
+  end
+
+  # @TODO - we need tests determining the path to "path-level before_capture hooks"
+
   describe "When hooking into beforeCapture (CasperJS)" do
 
     it "Executes the global JS before capturing" do

data/spec/config_spec.rb

@@ -110,13 +110,23 @@ describe "wraith config" do
       expect(wraith.snap_file).to include 'lib/wraith/javascript/casper.js'
     end
 
-    it "should allow users to specify their own snap file" do
+    it "should allow users to specify the relative path to their own snap file" do
       config = YAML.load '
         browser:   casperjs
         snap_file: path/to/snap.js
       '
       wraith = Wraith::Wraith.new(config, true)
-      expect(wraith.snap_file).to eq 'path/to/snap.js'
+      # not sure about having code IN the test, but we want to get this right.
+      expect(wraith.snap_file).to eq (`pwd`.chomp! + '/path/to/snap.js')
+    end
+
+    it "should allow users to specify the absolute path to their own snap file" do
+      config = YAML.load '
+        browser:   casperjs
+        snap_file: /Users/my_username/Sites/bbc/wraith/path/to/snap.js
+      '
+      wraith = Wraith::Wraith.new(config, true)
+      expect(wraith.snap_file).to eq ('/Users/my_username/Sites/bbc/wraith/path/to/snap.js')
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wraith
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Dave Blooman
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-01 00:00:00.000000000 Z
+date: 2015-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -206,6 +206,7 @@ files:
 - lib/wraith/save_images.rb
 - lib/wraith/spider.rb
 - lib/wraith/thumbnails.rb
+- lib/wraith/utilities.rb
 - lib/wraith/version.rb
 - lib/wraith/wraith.rb
 - spec/_helpers.rb