capybara-screenshot-diff 0.12.0 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b1699ff683e2c3cb5b32b32ae60bbb05bf15c7480c85f931d5276dec9712fb0
-  data.tar.gz: c315dcb091a812a01b2c2f2fe0690a07814dc3b87c632668f3355d2c4c994a59
+  metadata.gz: 7f8a739e8e6e8f3de068e2d6dab4317017025730dbbeeb72459f73eb8dcb9e1a
+  data.tar.gz: e214590aca05de27eea1874fd64a8389c792b00801f215d813acf3e5f82ddf18
 SHA512:
-  metadata.gz: bb6b91c2e92fdce32245fa82fefc1ba48ab29f92645cdcc1513c28f2c79635c5c184ed16d81207268e3384ca04b199f2aeea98bc9f915c3faf91299cb9879e24
-  data.tar.gz: 19a7ef21e19844f845cb396bd3c8db4d24402d87f44da571a554d91ec504eb9a3326d6b31c012d2c19790c53e99e91a9514ac2bf3e9b28fd9ea16f141b2cd1d4
+  metadata.gz: d7e28f6579e2ccb54e42d64889806884bad3434283ad5bd50caf18c758a0482a0e8c0c248d4c9c15131e671f2250964753dbd1c9aa9c56bf62cb0e1dca8a2db5
+  data.tar.gz: 8d3bca6920baf9c8f46c2a7914491fb49540d0abe7e53a770dff6aad163f24db1b685b4ef124870d244cd9f479b02248cca9bed00dd8a626e73b20107b668fe1

data/.rubocop_todo.yml

@@ -18,7 +18,7 @@ Metrics/BlockLength:
 # Offense count: 1
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 302
+  Max: 303
 
 # Offense count: 6
 Metrics/CyclomaticComplexity:

data/.travis.yml

@@ -2,13 +2,13 @@ language: ruby
 sudo: false
 cache: bundler
 rvm:
-  - jruby-9.1.16.0
+  - jruby-9.2.0.0
   - ruby-2.5.1
   - ruby-2.4.4
   - ruby-2.3.7
-  - ruby-2.2.10
 
 gemfile:
+  - gemfiles/rails52.gemfile
   - gemfiles/rails51.gemfile
   - gemfiles/rails50.gemfile
   - gemfiles/rails42.gemfile

data/capybara-screenshot-diff.gemspec

@@ -18,8 +18,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'actionpack', '>= 4.2', '<5.3'
-  spec.add_runtime_dependency 'capybara', '~> 2.0'
+  spec.add_runtime_dependency 'actionpack', '>= 4.2', '< 5.3'
+  spec.add_runtime_dependency 'capybara', '>= 2', '< 4'
   spec.add_runtime_dependency 'chunky_png', '~> 1.3'
 
   spec.add_development_dependency 'bundler', '~> 1.11'

data/gemfiles/rails52.gemfile

@@ -0,0 +1,3 @@
+eval File.read("#{__dir__}/common.gemfile")
+
+gem 'actionpack', '~>5.2.1'

data/lib/capybara/screenshot/diff/image_compare.rb

@@ -36,8 +36,10 @@ module Capybara
         def quick_equal?
           return nil unless old_file_exists?
           return true if new_file_size == old_file_size
+
           old_bytes, new_bytes = load_image_files(@old_file_name, @new_file_name)
           return true if old_bytes == new_bytes
+
           images = load_images(old_bytes, new_bytes)
           old_bytes = new_bytes = nil # rubocop: disable Lint/UselessAssignment
           crop_images(images, @dimensions) if @dimensions
@@ -147,6 +149,8 @@ module Capybara
         def calculate_max_color_distance(new_image, old_image)
           pixel_pairs = old_image.pixels.zip(new_image.pixels)
           @max_color_distance = pixel_pairs.inject(0) do |max, (p1, p2)|
+            next max unless p1 && p2
+
             d = ChunkyPNG::Color.euclidean_distance_rgba(p1, p2)
             [max, d].max
           end
@@ -194,6 +198,7 @@ module Capybara
 
         def sizes_changed?(org_image, new_image)
           return unless org_image.dimension != new_image.dimension
+
           change_msg = [org_image, new_image].map { |i| "#{i.width}x#{i.height}" }.join(' => ')
           puts "Image size has changed for #{@new_file_name}: #{change_msg}"
           true
@@ -239,6 +244,7 @@ module Capybara
           old_img.height.times do |y|
             (0...left).find do |x|
               next if same_color?(old_img, new_img, x, y)
+
               top ||= y
               bottom = y
               left = x
@@ -275,6 +281,7 @@ module Capybara
           color_matches = color_distance == 0 || (@color_distance_limit && @color_distance_limit > 0 &&
               color_distance <= @color_distance_limit)
           return color_matches if !@shift_distance_limit || @max_shift_distance == Float::INFINITY
+
           shift_distance =
             if color_matches
               0
@@ -354,6 +361,7 @@ module Capybara
               end
             end
             break if bounds_breached == 4
+
             shift_distance += 1
           end
           Float::INFINITY
@@ -362,6 +370,7 @@ module Capybara
         def color_matches(new_img, org_color, dx, dy, color_distance_limit)
           new_color = new_img[dx, dy]
           return new_color == org_color unless color_distance_limit
+
           color_distance = ChunkyPNG::Color.euclidean_distance_rgba(org_color, new_color)
           color_distance <= color_distance_limit
         end

data/lib/capybara/screenshot/diff/os.rb

@@ -9,6 +9,7 @@ module Capybara
         return 'windows' if ON_WINDOWS
         return 'macos' if ON_MAC
         return 'linux' if ON_LINUX
+
         'unknown'
       end
     end

data/lib/capybara/screenshot/diff/stabilization.rb

@@ -27,6 +27,7 @@ module Capybara
             take_right_size_screenshot(comparison)
 
             break unless Capybara::Screenshot.stability_time_limit
+
             if comparison.quick_equal?
               clean_stabilization_images(comparison.new_file_name)
               break
@@ -63,9 +64,11 @@ module Capybara
 
         def reduce_retina_image_size(file_name)
           return if !ON_MAC || !selenium? || !Capybara::Screenshot.window_size
+
           saved_image = ChunkyPNG::Image.from_file(file_name)
           width = Capybara::Screenshot.window_size[0]
           return if saved_image.width < width * 2
+
           unless @_csd_retina_warned
             warn 'Halving retina screenshot.  ' \
                 'You should add "force-device-scale-factor=1" to your Chrome chromeOptions args.'
@@ -116,10 +119,12 @@ module Capybara
 
         def assert_images_loaded(timeout: Capybara.default_max_wait_time)
           return unless respond_to? :evaluate_script
+
           start = Time.now
           loop do
             pending_image = evaluate_script IMAGE_WAIT_SCRIPT
             break unless pending_image
+
             assert (Time.now - start) < timeout,
                 "Images not loaded after #{timeout}s: #{pending_image.inspect}"
             sleep 0.1

data/lib/capybara/screenshot/diff/test_methods.rb

@@ -49,6 +49,7 @@ module Capybara
 
         def poltergeist?
           return false unless defined?(Capybara::Poltergeist::Driver)
+
           current_capybara_driver_class <= Capybara::Poltergeist::Driver
         end
 
@@ -60,6 +61,7 @@ module Capybara
           @screenshot_group = name.to_s
           @screenshot_counter = 0
           return unless Screenshot.active? && name.present?
+
           FileUtils.rm_rf screenshot_dir
         end
 
@@ -67,6 +69,7 @@ module Capybara
             shift_distance_limit: Diff.shift_distance_limit, area_size_limit: Diff.area_size_limit)
           return unless Screenshot.active?
           return if window_size_is_wrong?
+
           if @screenshot_counter
             name = "#{format('%02i', @screenshot_counter)}_#{name}"
             @screenshot_counter += 1
@@ -83,6 +86,7 @@ module Capybara
                                              shift_distance_limit: shift_distance_limit,
                                              area_size_limit: area_size_limit)
           return unless comparison.old_file_exists?
+
           (@test_screenshots ||= []) << [caller(1..1).first, name, comparison]
         end
 

data/lib/capybara/screenshot/diff/version.rb

@@ -3,7 +3,7 @@
 module Capybara
   module Screenshot
     module Diff
-      VERSION = '0.12.0'.freeze
+      VERSION = '0.12.1'.freeze
     end
   end
 end

data/matrix_test.rb

@@ -35,6 +35,7 @@ end
 
 travis['rvm'].each do |ruby|
   next if ruby =~ /head/ # ruby-install does not support HEAD installation
+
   puts '#' * 80
   puts "Testing #{ruby}"
   puts

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capybara-screenshot-diff
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.1
 platform: ruby
 authors:
 - Uwe Kubosch
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-27 00:00:00.000000000 Z
+date: 2018-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -34,16 +34,22 @@ dependencies:
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: chunky_png
   requirement: !ruby/object:Gem::Requirement
@@ -165,6 +171,7 @@ files:
 - gemfiles/rails42.gemfile
 - gemfiles/rails50.gemfile
 - gemfiles/rails51.gemfile
+- gemfiles/rails52.gemfile
 - lib/capybara/screenshot/diff.rb
 - lib/capybara/screenshot/diff/image_compare.rb
 - lib/capybara/screenshot/diff/os.rb