watir-screenshot-stitch 0.7.1 → 0.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77d9d165765e9f0bd0e189c7af282d535be07a5b24630ff5642ae07440e66654
-  data.tar.gz: 197c0b0f5df9211f2f1f8f0e8423bf8d7fa774a963c138957837bc82df5b52a5
+  metadata.gz: 646fc05a368bd1375a2540b88a6ef33a62a21959dc93592341f27165455a57e7
+  data.tar.gz: 107bbca20ce5796b473b3a83c2ba87a466e164cf6bc603b580e376fd90523121
 SHA512:
-  metadata.gz: 55a78fe53008cb3e464d5fb947e66c3fd208ad0bee3545007450195a7158e6bc6f079feb02263263ddf7d7b256818145fa1ada4e3334ff3e5f6d7b86199b4472
-  data.tar.gz: 67bea36811afe3044532f31f58b2750e5c06f03685bfdd2d8effa18d8ff7080b5a27be6546b3643b23f1ef80e79e4072ce1f8d16b902813e6c7193d755f4a5ac
+  metadata.gz: 23fcc38f539f8d36fb0cf2f503603ae22de6ee4eb04a22da703980ff52c650fadb1a6609d009cca8917526172ef42d3983b9d8a7a9befbff11d03cbcbc038a91
+  data.tar.gz: e23757fc55be1aa3c05051afa7e254475c648a44a2134c35d6341aa918329077e39e69afbebed22971a1c020bf6f5b2ce0ad828d5bebb65bc6f7ab6fd382afe5

data/README.md

@@ -1,21 +1,19 @@
 # watir-screenshot-stitch
 
 watir-screenshot-stitch attempts to compensate for
-[Mozilla's decision not to (yet?) expose Firefox's full page screenshot
-functionality](https://github.com/mozilla/geckodriver/issues/570)
-via geckodriver.
+the lack of full page screenshot functionality
+in Selenium Webdriver.
 
-The canonical screenshot stitching is done by paging down a given URL
-by the size of the viewport, capturing the entire page in the process,
-up to the maximum height — see below.
+It does so in three ways:
 
-Alternatively, it also bundles the
+* Directly employing geckodriver's new full page screenshot
+functionality (only on Firefox).
+* Screenshot stitching, paging down a given URL by the size 
+of the viewport, capturing screenshots and adjoining them.
+* Employing a bundled
 [html2canvas](https://github.com/niklasvh/html2canvas)
-script and applies it to the page. This method of screenshotting
-is less likely to have issues with stitching the images together,
-and running out of memory but has limitations with certain element
-types not being properly displayed. See their documentation for
-more information.
+script against the page to generate a png from a `canvas`
+element. 
 
 ## Installation
 
@@ -110,7 +108,7 @@ will return a base64 encoded image blob of the given site.
 
 In can be saved as a PNG by doing:
 ```ruby
-png = b.screenshot.base64_canvas
+png = b.screenshot.base64_geckodriver
 path = "/my/path/image.png"
 File.open(path, 'wb') { |f| f.write(Base64.decode64(png)) }
 ```
@@ -164,6 +162,12 @@ path = "/my/path/image.png"
 File.open(path, 'wb') { |f| f.write(Base64.decode64(png)) }
 ```
 
+This method of screenshotting
+is less likely to have issues with stitching the images together,
+and running out of memory but has limitations with certain element
+types not being properly displayed. See their documentation for
+more information.
+
 ### Doubling resolution calculations, including macOS Retina
 
 watir-screenshot-stitch uses CSS selectors to determine whether a
@@ -182,9 +186,9 @@ A hash of key value pairs.
 Should refer to a positive Integer greater than the viewport height.
 
 ### Maximum height
-ImageMagick has a maximum pixel dimension of 65500, and all screenshots
-will be capped to a maximum height of 65500 regardless of any options
-to avoid errors.
+ImageMagick has a maximum pixel dimension of 65500, and all stitched
+screenshots will be capped to a maximum height of 65500 regardless 
+of any options to avoid errors.
 
 ## Development
 

data/lib/watir-screenshot-stitch.rb

@@ -1,6 +1,5 @@
 require "time"
 require "watir-screenshot-stitch/version"
-require "watir-screenshot-stitch/utilities"
 require "watir"
 require "mini_magick"
 require "os"
@@ -149,8 +148,8 @@ module Watir
       end
 
       def webdrivers_defined?
-        'Webdrivers'.constantize
-      rescue
+        Object.const_get("Webdrivers")
+      rescue NameError
         nil
       end
 
@@ -205,10 +204,10 @@ module Watir
       def html2canvas_payload
         case @browser.driver.browser
         when :firefox
-          path = File.join(WatirScreenshotStitch::Utilities.directory, "vendor/html2canvas-0.4.1.js")
+          path = File.expand_path("../../vendor/html2canvas-0.4.1.js", __FILE__)
           File.read(path)
         else
-          path = File.join(WatirScreenshotStitch::Utilities.directory, "vendor/html2canvas.js")
+          path = File.expand_path("../../vendor/html2canvas.js", __FILE__)
           File.read(path)
         end
       end
@@ -240,7 +239,7 @@ module Watir
       def build_canvas
         @start = MiniMagick::Image.read(Base64.decode64(self.base64))
         @combined_screenshot = MiniMagick::Image.new(@path)
-        @combined_screenshot.run_command(:convert, "-size", "#{ @start.width }x#{ @page_height*@mac_factor }", "xc:white", @combined_screenshot.path)
+        @combined_screenshot.run_command(:convert, "-size", "#{ @start.width }x#{ @page_height*@mac_factor }", "xc:white", "-define", "png:color-type=6", @combined_screenshot.path)
       end
 
       def gather_slices

data/lib/watir-screenshot-stitch/version.rb

@@ -1,4 +1,4 @@
 module WatirScreenshotStitch
   NAME = 'watir-screenshot-stitch'
-  VERSION = "0.7.1"
+  VERSION = "0.7.6"
 end

data/watir-screenshot-stitch.gemspec

@@ -30,13 +30,13 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", ">= 12.3.3"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "chunky_png", "~> 1.3"
 
   spec.required_ruby_version = '>= 2.3.0'
 
-  spec.add_dependency "rubyzip", "~> 1.2"
+  spec.add_dependency "rubyzip", "~> 2.0"
   spec.add_dependency "watir", "~> 6.12"
   spec.add_dependency "mini_magick", "~> 4.0"
   spec.add_dependency "os", "~> 1.0"

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: watir-screenshot-stitch
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.6
 platform: ruby
 authors:
 - Sam Nissen
 - Sandeep Singh
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-03-15 00:00:00.000000000 Z
+date: 2020-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -29,16 +29,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -73,14 +73,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: watir
   requirement: !ruby/object:Gem::Requirement
@@ -137,7 +137,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
-description: 
+description:
 email:
 - scnissen@gmail.com
 - sandeepnagra@gmail.com
@@ -156,7 +156,6 @@ files:
 - bin/console
 - bin/setup
 - lib/watir-screenshot-stitch.rb
-- lib/watir-screenshot-stitch/utilities.rb
 - lib/watir-screenshot-stitch/version.rb
 - vendor/html2canvas-0.4.1.js
 - vendor/html2canvas.js
@@ -165,7 +164,7 @@ homepage: https://github.com/samnissen/watir-screenshot-stitch
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -180,9 +179,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Extends Watir to take stitched-together screenshots of full web pages.
 test_files: []

data/lib/watir-screenshot-stitch/utilities.rb

@@ -1,11 +0,0 @@
-module WatirScreenshotStitch
-  module Utilities
-    # Return a directory with the project libraries.
-    def self.directory
-      t = ["#{File.dirname(File.expand_path($0))}/../lib/#{WatirScreenshotStitch::NAME}",
-           "#{Gem.dir}/gems/#{WatirScreenshotStitch::NAME}-#{WatirScreenshotStitch::VERSION}"]
-      t.each {|i| return i if File.readable?(i) }
-      raise "watir-screenshot-stitch could not be found in: #{t}"
-    end # https://stackoverflow.com/a/5805783/1651458
-  end
-end