watir-screenshot-stitch 0.6.8 → 0.6.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 939a86622f8de5e560e22d3d49efa5b460cc56bb3670190931c96e06ee52a50a
-  data.tar.gz: d10c0145635f1f300209af7bd749ed36ee1965f1a266e4b847cf5ea8739b114d
+SHA1:
+  metadata.gz: '0985890117543c5ed7884e494c015439abe061ea'
+  data.tar.gz: 37a9faf7f9e21dee30810044322d63ccc9193061
 SHA512:
-  metadata.gz: 90b97d55213c381c6b14357e915d4bbace39f7af1d44f7cfad528b6bc0a3ac3494b06ff562ae3ec5007a45ccdf0b354979634fbd2fcb2da2721b7f38bf9bf2cd
-  data.tar.gz: 47404aab8732ce6e6c1c1a8d27831b8aecdc202befdfd203304c0910d723c872037a406e374621e6a9ae362b4ca6811e46ad47130ecb80bc9cbff9ce85c38e79
+  metadata.gz: 63717c4834cdb6016b1000440b0fd3af5c1663c59d1eed651b205120e306223819b14a6de38471fabc8a6c9b80f5038458aa0db09c50cd45a58bc1042dbabe76
+  data.tar.gz: 7101edc1f9aebdfd17bf9ecb3d2d233d091bd53f8b5d1b394e97da9d210aa1b715b8dd75fa4ce7b78a615d78416590f36543b729a03b553217acc01367958fa1

data/.gitignore

@@ -1,3 +1,4 @@
+/.idea/
 /.bundle/
 /.yardoc
 /_yardoc/
@@ -15,3 +16,7 @@
 
 # development
 watir-screenshot-stitch-*.gem
+
+# Gem best practice
+# https://stackoverflow.com/a/4151540/1651458
+Gemfile.lock

data/README.md

@@ -20,10 +20,15 @@ watir-screenshot-stitch relies on [MiniMagick](https://github.com/minimagick/min
 (and thus ImageMagick). You might need to review that gem's requirements and
 installation before proceeding.
 
-### Firefox
+### Browser Support
 
-watir-screenshot-stitch is optimized for and tested on Firefox. Your
-Watir / Selenium-Webdriver / geckodriver / Firefox stack must be correctly
+watir-screenshot-stitch is optimized for and tested on following browsers:
+* Chrome 65+
+* Firefox 58+
+* Safari 11.1
+* IE 11/10/9/8
+
+Your Watir / Selenium-Webdriver / webdriver / Browser stack must be correctly
 configured. If you can find a good guide for installing and maintaining all
 parts of this stack, you're a better Googler than me.
 
@@ -75,6 +80,13 @@ b.screenshot.base64_canvas(b)
 
 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(b)
+path = "/my/path/image.png"
+File.open(path, 'wb') { |f| f.write(Base64.decode64(png)) }
+```
+
 ### Doubling resolution calculations, including macOS Retina
 
 watir-screenshot-stitch uses CSS selectors to determine whether a

data/lib/watir-screenshot-stitch.rb

@@ -28,6 +28,7 @@ module Watir
     #
 
     def save_stitch(path, browser = @browser, opts = {})
+      return browser.screenshot.save(path) if base64_capable?
       @options = opts
       @path = path
       deprecate_browser(browser, (__LINE__-3))
@@ -57,6 +58,7 @@ module Watir
     #
 
     def base64_canvas(browser = @browser)
+      return self.base64 if base64_capable?
       deprecate_browser(browser, (__LINE__-1))
       output = nil
 
@@ -71,7 +73,7 @@ module Watir
 
       raise "Could not generate screenshot blob within #{MAXIMUM_SCREENSHOT_GENERATION_WAIT_TIME} seconds" unless output
 
-      return output.sub!(/^data\:image\/png\;base64,/, '')
+      output.sub!(/^data\:image\/png\;base64,/, '')
     end
 
     private
@@ -81,6 +83,11 @@ module Watir
         @browser = browser
       end
 
+      # in IE & Safari a regular screenshot is a full page screenshot only
+      def base64_capable?
+        [:internet_explorer, :safari].include? @browser&.name
+      end
+
       def one_shot?
         calculate_dimensions unless @loops && @remainder
         ( (@loops == 1) && (@remainder == 0) )
@@ -99,7 +106,7 @@ module Watir
       end # https://github.com/mozilla/geckodriver/issues/1129
 
       def h2c_activator
-        return case @browser.driver.browser
+        case @browser.driver.browser
         when :firefox
           %<
             function genScreenshot () {
@@ -125,7 +132,7 @@ module Watir
       end
 
       def html2canvas_payload
-        return case @browser.driver.browser
+        case @browser.driver.browser
         when :firefox
           path = File.join(WatirScreenshotStitch::Utilities.directory, "vendor/html2canvas-0.4.1.js")
           File.read(path)
@@ -204,8 +211,12 @@ module Watir
       end
 
       def retina?
-        payload = %{var mq = window.matchMedia("only screen and (min--moz-device-pixel-ratio: 1.3), only screen and (-o-min-device-pixel-ratio: 2.6/2), only screen and (-webkit-min-device-pixel-ratio: 1.3), only screen  and (min-device-pixel-ratio: 1.3), only screen and (min-resolution: 1.3dppx)"); return (mq && mq.matches || (window.devicePixelRatio > 1));}
-
+        payload = %{ var mq = window.matchMedia("only screen and (min--moz-device-pixel-ratio: 1.3), \
+                                                  only screen and (-o-min-device-pixel-ratio: 2.6/2), \
+                                                  only screen and (-webkit-min-device-pixel-ratio: 1.3), \
+                                                  only screen  and (min-device-pixel-ratio: 1.3), \
+                                                  only screen and (min-resolution: 1.3dppx)");
+                      return (mq && mq.matches || (window.devicePixelRatio > 1)); }
         @browser.execute_script payload
       end
   end

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

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

data/watir-screenshot-stitch.gemspec

@@ -6,8 +6,8 @@ require "watir-screenshot-stitch/version"
 Gem::Specification.new do |spec|
   spec.name          = "watir-screenshot-stitch"
   spec.version       = WatirScreenshotStitch::VERSION
-  spec.authors       = ["Sam Nissen"]
-  spec.email         = ["scnissen@gmail.com"]
+  spec.authors       = ["Sam Nissen", "Sandeep Singh"]
+  spec.email         = ["scnissen@gmail.com", "sandeepnagra@gmail.com"]
 
   spec.summary       = %q{Extends Watir to take stitched-together screenshots of full web pages.}
   # spec.description   = %q{TODO: Write a longer description or delete this line.}
@@ -35,6 +35,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "chunky_png", "~> 1.3"
 
+  spec.add_dependency "rubyzip", "~> 1.2.2"
   spec.add_dependency "watir", "~> 6.4"
   spec.add_dependency "mini_magick", "~> 4.0"
   spec.add_dependency "os", "~> 1.0"

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: watir-screenshot-stitch
 version: !ruby/object:Gem::Version
-  version: 0.6.8
+  version: 0.6.10
 platform: ruby
 authors:
 - Sam Nissen
+- Sandeep Singh
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-20 00:00:00.000000000 Z
+date: 2018-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +67,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rubyzip
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.2
 - !ruby/object:Gem::Dependency
   name: watir
   requirement: !ruby/object:Gem::Requirement
@@ -125,6 +140,7 @@ dependencies:
 description: 
 email:
 - scnissen@gmail.com
+- sandeepnagra@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -134,7 +150,6 @@ files:
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -166,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: Extends Watir to take stitched-together screenshots of full web pages.

data/Gemfile.lock

@@ -1,55 +0,0 @@
-PATH
-  remote: .
-  specs:
-    watir-screenshot-stitch (0.6.7)
-      binding_of_caller (~> 0.7)
-      mini_magick (~> 4.0)
-      os (~> 1.0)
-      watir (~> 6.4)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    binding_of_caller (0.8.0)
-      debug_inspector (>= 0.0.1)
-    childprocess (0.9.0)
-      ffi (~> 1.0, >= 1.0.11)
-    chunky_png (1.3.10)
-    debug_inspector (0.0.3)
-    diff-lcs (1.3)
-    ffi (1.9.25)
-    mini_magick (4.8.0)
-    os (1.0.0)
-    rake (10.5.0)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.0)
-    rubyzip (1.2.1)
-    selenium-webdriver (3.14.0)
-      childprocess (~> 0.5)
-      rubyzip (~> 1.2)
-    watir (6.12.0)
-      selenium-webdriver (~> 3.4, >= 3.4.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.16)
-  chunky_png (~> 1.3)
-  rake (~> 10.0)
-  rspec (~> 3.0)
-  watir-screenshot-stitch!
-
-BUNDLED WITH
-   1.16.2