capybara-screenshot-diff 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: adbbae0be849e373116e41ba3d82e65008a6e281
-  data.tar.gz: efa2d3acc0df00651c6134ef0817a3d21be4282d
+  metadata.gz: 0de52a07b767a8c00bc3fbb4932c5dc50c3473ad
+  data.tar.gz: 379c7f08576254f37a3a19fd91b51cb3bac25ee5
 SHA512:
-  metadata.gz: 42af6279377d9119d99eac1eb7516e51ac2caee5122dc8f7ced3db225460ba91b07aea3a489d823fee98acc9b3e06fc503510aa25711a98272a18077e9c68dbc
-  data.tar.gz: 0d2729428c8a46a39ed949fb1a9bdbeefc4165cc7dd51ce66cabefa68185cd74d2ee7cde9870d46dea7c3036670be55a6229b29dbc0bf6c66d7a9c611ac5992f
+  metadata.gz: b9ee0511feed3f3bbcde5f6a26ac818ff162ee46867edef1179ea3aa5b63a654a189f3835f545511d6129b82d238a671ce7d369bd4dede4f47741e5d894a924b
+  data.tar.gz: 8d8aead2eae4a347867728293518f8945872f8fbb0b6e56457232c2b83af648918c7ca23cb866222bf4993a4f4bd5e652468d363e3204eda0773501805150ad8

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

@@ -37,24 +37,23 @@ module Capybara
         def quick_equal?
           return nil unless old_file_exists?
           return true if new_file_size == old_file_size
-          old_file, new_file = load_image_files(@old_file_name, @new_file_name)
-          return true if old_file == new_file
-          images = load_images(old_file, new_file)
+          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
           crop_images(images, @dimensions) if @dimensions
 
-          old_img = images.first
-          new_img = images.last
-
-          return false if sizes_changed?(old_img, new_img)
+          return false if sizes_changed?(*images)
+          return true if images.first.pixels == images.last.pixels
 
-          return true if old_img.pixels == new_img.pixels
+          return false unless @color_distance_limit || @shift_distance_limit
 
-          @left, @top, @right, @bottom = find_top(old_img, new_img)
+          @left, @top, @right, @bottom = find_top(*images)
 
           return true if @top.nil?
 
           if @area_size_limit
-            @left, @top, @right, @bottom = find_diff_rectangle(old_img, new_img)
+            @left, @top, @right, @bottom = find_diff_rectangle(*images)
             return true if size <= @area_size_limit
           end
 
@@ -261,7 +260,7 @@ module Capybara
           if !@max_color_distance || color_distance > @max_color_distance
             @max_color_distance = color_distance
           end
-          if !@max_shift_distance || shift_distance > @max_shift_distance
+          if shift_distance.to_i > @max_shift_distance.to_i
             @max_shift_distance = shift_distance
           end
           (color_distance == 0 || (@color_distance_limit && @color_distance_limit > 0 &&
@@ -295,12 +294,15 @@ module Capybara
           org_color = old_img[x, y]
           shift_distance = 0
           loop do
+            bounds_breached = 0
             if (y - shift_distance) >= 0 # top
               ([0, x - shift_distance].max..[x + shift_distance, new_img.width - 1].min).each do |dx|
                 if color_matches(new_img, org_color, dx, y - shift_distance, color_distance_limit)
                   return shift_distance
                 end
               end
+            else
+              bounds_breached += 1
             end
             if shift_distance > 0
               if (x - shift_distance) >= 0 # left
@@ -310,6 +312,8 @@ module Capybara
                     return shift_distance
                   end
                 end
+              else
+                bounds_breached += 1
               end
               if (y + shift_distance) < new_img.height # bottom
                 ([0, x - shift_distance].max..[x + shift_distance, new_img.width - 1].min).each do |dx|
@@ -317,6 +321,8 @@ module Capybara
                     return shift_distance
                   end
                 end
+              else
+                bounds_breached += 1
               end
               if (x + shift_distance) < new_img.width # right
                 ([0, y - shift_distance + 1].max..[y + shift_distance, new_img.height - 2].min)
@@ -325,12 +331,15 @@ module Capybara
                     return shift_distance
                   end
                 end
+              else
+                bounds_breached += 1
               end
             end
+            break if bounds_breached == 4
             shift_distance += 1
             # puts "Bumped shift_distance to #{shift_distance}"
           end
-          shift_distance
+          nil
         end
 
         def color_matches(new_img, org_color, dx, dy, color_distance_limit)

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capybara-screenshot-diff
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
 platform: ruby
 authors:
 - Uwe Kubosch
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-06 00:00:00.000000000 Z
+date: 2018-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -153,7 +153,6 @@ files:
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
 - ".travis.yml"
-- CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE.txt

data/CODE_OF_CONDUCT.md

@@ -1,46 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at uwe@kubosch.no. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
-
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/