image_compare 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9267d7bfce2137312246ee71c78be6123829c8d85306a6514fac4a5177fc1ed
-  data.tar.gz: 594a599fe736f30a8b92c28729e05db90c375ce9a3bf2c90056f5044a1151743
+  metadata.gz: fddeaa634a928ccfeed4d71797a78d9f8201bc5df036275181ac10addd6a315c
+  data.tar.gz: 43128e9a8fb1c95d246808bdd746ab8023ee984a754e3690b411eb17768399e1
 SHA512:
-  metadata.gz: 980ef7ed37029399bb9fa7563b5f916bf466c44de53eecb433eed25841c5af37c4093cf59f4f1df45434c839b67e859a5d50294765e9d9c265bae45c54df6e2f
-  data.tar.gz: 17e44c8a2009a67e9a62ffc36d5cf68aa2e8c9c74d43ea4b34f090873c5461a10a023fb0802e5ea41cbd188c56b97dbda6fabc9384d67cdb1aee4899750e74fb
+  metadata.gz: dbc5a9c8c6a9b4f34ea24d9259cc0913aa12672dfa10e279134a477a0331b079bd51c1355e1d09b3b0e6a4008ee19c8feda0baa04e3465899b6e001453c15533
+  data.tar.gz: e5cd324880f6f97459eb0b290a3764934f750852d234f775d32ccfbe060cd73152307db6d175f3c120592686e74e9c0509308546f68534c7d741ded33ee99e16

data/CHANGELOG.md

@@ -1,7 +1,8 @@
 # Change log
 
 ## main
-- Add Color mode to generate "normal" diff images ([@gsguma][], [@cristianofmc][])
+- v1.0.0: Add Color mode to generate "normal" diff images ([@gsguma][], [@cristianofmc][])
+- v1.0.1: Fix all code smells and integration tests ([@gsguma][])
 
 [@gsguma]: https://github.com/gsguma
 [@cristianofmc]: https://github.com/cristianofmc

data/README.md

@@ -8,10 +8,10 @@ This is an utility library for image regression testing.
 
 ## Installation
 
-Add this line to your application's Gemfile:
+Add this line to your application"s Gemfile:
 
 ```ruby
-gem 'image_compare'
+gem "image_compare"
 ```
 
 Or adding to your project:
@@ -20,7 +20,7 @@ Or adding to your project:
 # my-cool-gem.gemspec
 Gem::Specification.new do |spec|
   # ...
-  spec.add_dependency 'image_compare'
+  spec.add_dependency "image_compare"
   # ...
 end
 ```
@@ -33,8 +33,8 @@ ImageCompare supports different ways (_modes_) of comparing images.
 
 Source images used in examples:
 
-<img src='https://raw.githubusercontent.com/instantink/image_compare/master/spec/fixtures/a.png' width='300' />
-<img src='https://raw.githubusercontent.com/instantink/image_compare/master/spec/fixtures/b.png' width='300' />
+<img alt="a.png" src="spec/fixtures/a.png" />
+<img alt="b.png" src="spec/fixtures/b.png" />
 
 ### Color
 
@@ -42,14 +42,14 @@ Compare pixels, resulting score is a ratio of unequal pixels (with respect to pr
 
 Resulting diff contains version of the first image with different pixels highlighted in red and red bounding box.
 
-<img src='https://raw.githubusercontent.com/instantink/image_compare/master/spec/fixtures/color_diff.png' width='300' />
+<img alt="color_diff" src="spec/fixtures/color_diff.png" />
 
 ### Base (RGB) mode
 
 Compare pixels by values, resulting score is a ratio of unequal pixels.
 Resulting diff represents per-channel difference.
 
-<img src='https://raw.githubusercontent.com/instantink/image_compare/master/spec/fixtures/rgb_diff.png' width='300' />
+<img alt="rgb_diff.png" src="spec/fixtures/rgb_diff.png" width="480" />
 
 ### Grayscale mode
 
@@ -57,14 +57,14 @@ Compare pixels as grayscale (by brightness and alpha), resulting score is a rati
 
 Resulting diff contains grayscale version of the first image with different pixels highlighted in red and red bounding box.
 
-<img src='https://raw.githubusercontent.com/instantink/image_compare/master/spec/fixtures/grayscale_diff.png' width='300' />
+<img alt="grayscale_diff.png" src="spec/fixtures/grayscale_diff.png" width="480" />
 
 ### Delta
 
 Compare pixels using [Delta E](https://en.wikipedia.org/wiki/Color_difference) distance.
 Resulting diff contains grayscale version of the first image with different pixels highlighted in red (with respect to diff score).
 
-<img src='https://raw.githubusercontent.com/instantink/image_compare/master/spec/fixtures/delta_diff.png' width='300' />
+<img alt="delta_diff.png" src="spec/fixtures/delta_diff.png" width="480" />
 
 ## Usage
 
@@ -91,50 +91,54 @@ cmp.lower_threshold #=> 0.01
 cmp = ImageCompare::Matcher.new mode: :grayscale, tolerance: 0
 cmp.mode #=> ImageCompare::Modes::Grayscale
 
-res = cmp.compare(path_1, path_2)
+res = cmp.compare("path/image1.png", "path/image2.png")
 res #=> ImageCompare::Result
 res.match? #=> true
 res.score #=> 0.0
 
 # Return diff image object
 res.difference_image #=> ImageCompare::Image
-res.difference_image.save(new_path)
+res.difference_image.save(result)
 
 # without explicit matcher
-res = ImageCompare.compare(path_1, path_2, options)
+res = ImageCompare.compare("path/image1.png", "path/image2.png", options)
+res.match? #=> true
+res.score #=> 0.0
 
 # equals to
-res = ImageCompare::Matcher.new(options).compare(path_1, path_2)
+res = ImageCompare::Matcher.new(options).compare("my_images_path/image1.png", "my_images_path/image2.png")
+res.match? #=> true
+res.score #=> 0.0
 ```
 
 ## Excluding rectangle
 
-<img src='https://raw.githubusercontent.com/instantink/image_compare/master/spec/fixtures/a.png' width='300' />
-<img src='https://raw.githubusercontent.com/instantink/image_compare/master/spec/fixtures/a1.png' width='300' />
+<img alt="a.png" src="spec/fixtures/a.png" />
+<img alt="a1.png" src="spec/fixtures/a1.png" />
 
 You can exclude rectangle from comparing by passing `:exclude_rect` to `compare`.
 E.g., if `path_1` and `path_2` contain images above
 ```ruby
-ImageCompare.compare(path_1, path_2, exclude_rect: [200, 150, 275, 200]).match? # => true
+ImageCompare.compare("path/image1.png", "path/image2.png", exclude_rect: [200, 150, 275, 200]).match? # => true
 
 # or
 
 cmp = ImageCompare::Matcher.new exclude_rect: [200, 150, 275, 200]
-res = cmp.compare(path_1, path_2)
+res = cmp.compare("path/image1.png", "path/image2.png")
 res #=> ImageCompare::Result
 res.match? #=> true
 res.score #=> 0.0
 
 # Return diff image object
 res.difference_image #=> ImageCompare::Image
-res.difference_image.save(new_path)
+res.difference_image.save("path/diff.png")
 ```
 `[200, 150, 275, 200]` is array of two vertices of rectangle -- (200, 150) is left-top vertex and (275, 200) is right-bottom.
 
 ### Cucumber + Capybara example
 `support/env.rb`:
 ```ruby
-require 'image_compare'
+require "image_compare"
 ```
 
 `support/capybara_extensions.rb`:
@@ -143,15 +147,15 @@ require 'image_compare'
 
 Capybara::Node::Element.class_eval do
   def rect_area
-    rect_area = self.evaluate_script('this.getBoundingClientRect()')
+    rect_area = self.evaluate_script("this.getBoundingClientRect()") # rubocop:disable Style/RedundantSelf
 
     [
-      rect_area['left'].to_f.round,
-      rect_area['top'].to_f.round,
-      rect_area['right'].to_f.round,
-      rect_area['bottom'].to_f.round
+      rect_area["left"].to_f.round,
+      rect_area["top"].to_f.round,
+      rect_area["right"].to_f.round,
+      rect_area["bottom"].to_f.round
     ]
-  rescue StandardError => e
+  rescue StandardError => e # rubocop:disable Style/RescueStandardError
     raise "Error getting element rect area: #{e.inspect}!"
   end
 end
@@ -159,11 +163,11 @@ end
 
 `steps/my_step.rb`:
 ```ruby
-my_element = page.find('#my_element').rect_area
+my_element = page.find("#my_element").rect_area
 
 cmp = ImageCompare::Matcher.new exclude_rect: my_element.rect_area
-res = cmp.compare(path_1, path_2)
-res.difference_image.save(new_path)
+res = cmp.compare("path/image1.png", "path/image2.png")
+res.difference_image.save("path/diff.png")
 
 expect(res.match?).to eq(true)
 ```
@@ -176,6 +180,20 @@ You can set bounds of comparing by passing `:include_rect` to `compare` with arr
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/instantink/image_compare.
 
+### Running tests and code inspections
+
+- `rake rubocop`
+- `rake rubocop:md`
+- `rake spec`
+- `ruby examples/performance.rb` Create the gemfile.local file with the content below to run the performance tests:
+```ruby
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+gem "benchmark-ips", "~> 2.7", ">= 2.7.2"
+```
+
+
 ## License
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).

data/lib/image_compare/color_methods.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require 'chunky_png'
+require "chunky_png"
 
 begin
-  require 'oily_png' unless RUBY_PLATFORM == 'java'
+  require "oily_png" unless RUBY_PLATFORM == "java"
 rescue LoadError => _e
   nil
 end

data/lib/image_compare/image.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'image_compare/color_methods'
+require "image_compare/color_methods"
 
 module ImageCompare
   class Image < ChunkyPNG::Image

data/lib/image_compare/matcher.rb

@@ -2,15 +2,15 @@
 
 module ImageCompare
   class Matcher
-    require 'image_compare/image'
-    require 'image_compare/result'
-    require 'image_compare/modes'
+    require "image_compare/image"
+    require "image_compare/result"
+    require "image_compare/modes"
 
     MODES = {
-      rgb: 'RGB',
-      delta: 'Delta',
-      grayscale: 'Grayscale',
-      color: 'Color'
+      rgb: "RGB",
+      delta: "Delta",
+      grayscale: "Grayscale",
+      color: "Color"
     }.freeze
 
     attr_reader :mode
@@ -26,25 +26,27 @@ module ImageCompare
       b = Image.from_file(b) unless b.is_a?(Image)
 
       unless a.sizes_match?(b)
-        raise SizesMismatchError,
-              "Size mismatch: first image size: #{a.width}x#{a.height}, second image size: #{b.width}x#{b.height}"
+        raise(
+          SizesMismatchError,
+          "Size mismatch: first image size: #{a.width}x#{a.height}, second image size: #{b.width}x#{b.height}"
+        )
       end
 
       image_area = Rectangle.new(0, 0, a.width - 1, a.height - 1)
 
       unless mode.exclude_rect.nil?
         unless image_area.contains?(mode.exclude_rect)
-          raise ArgumentError, 'Bounds must be in image'
+          raise ArgumentError, "Bounds must be in image"
         end
       end
 
       unless mode.include_rect.nil?
         unless image_area.contains?(mode.include_rect)
-          raise ArgumentError, 'Bounds must be in image'
+          raise ArgumentError, "Bounds must be in image"
         end
         unless mode.exclude_rect.nil?
           unless mode.include_rect.contains?(mode.exclude_rect)
-            raise ArgumentError, 'Included area must contain excluded'
+            raise ArgumentError, "Included area must contain excluded"
           end
         end
       end

data/lib/image_compare/modes/base.rb

@@ -3,7 +3,7 @@
 module ImageCompare
   module Modes
     class Base
-      require 'image_compare/rectangle'
+      require "image_compare/rectangle"
       include ColorMethods
 
       attr_reader :result, :threshold, :lower_threshold, :bounds, :exclude_rect, :include_rect
@@ -22,8 +22,8 @@ module ImageCompare
         @bounds = Rectangle.new(*include_rect.bounds)
 
         b.compare_each_pixel(a, area: include_rect) do |b_pixel, a_pixel, x, y|
-          next if pixels_equal?(b_pixel, a_pixel)
           next if !exclude_rect.nil? && exclude_rect.contains_point?(x, y)
+          next if pixels_equal?(b_pixel, a_pixel)
           update_result(b_pixel, a_pixel, x, y)
         end
 

data/lib/image_compare/modes/color.rb

@@ -2,7 +2,7 @@
 
 module ImageCompare
   module Modes
-    require 'image_compare/modes/base'
+    require "image_compare/modes/base"
 
     class Color < Base
       include ColorMethods
@@ -33,20 +33,20 @@ module ImageCompare
           left: bounds.bounds[0],
           top: bounds.bounds[1],
           right: bounds.bounds[2],
-          bot:  bounds.bounds[3]
+          bot: bounds.bounds[3]
         }
 
         exclude_area = {
           left: exclude_rect.bounds[0],
           top: exclude_rect.bounds[1],
           right: exclude_rect.bounds[2],
-          bot:  exclude_rect.bounds[3]
+          bot: exclude_rect.bounds[3]
         }
 
         diff_area[:left] <= exclude_area[:left] &&
-        diff_area[:top] <= exclude_area[:top] &&
-        diff_area[:right] >= exclude_area[:right] &&
-        diff_area[:bot] >= exclude_area[:bot]
+          diff_area[:top] <= exclude_area[:top] &&
+          diff_area[:right] >= exclude_area[:right] &&
+          diff_area[:bot] >= exclude_area[:bot]
       end
 
       def pixels_equal?(a, b)

data/lib/image_compare/modes/delta.rb

@@ -2,7 +2,7 @@
 
 module ImageCompare
   module Modes
-    require 'image_compare/modes/base'
+    require "image_compare/modes/base"
 
     class Delta < Base
       attr_reader :tolerance

data/lib/image_compare/modes/grayscale.rb

@@ -2,7 +2,7 @@
 
 module ImageCompare
   module Modes
-    require 'image_compare/modes/base'
+    require "image_compare/modes/base"
 
     class Grayscale < Base
       DEFAULT_TOLERANCE = 16

data/lib/image_compare/modes/rgb.rb

@@ -2,7 +2,7 @@
 
 module ImageCompare
   module Modes
-    require 'image_compare/modes/base'
+    require "image_compare/modes/base"
 
     class RGB < Base
       def pixels_equal?(a, b)

data/lib/image_compare/modes.rb

@@ -2,9 +2,9 @@
 
 module ImageCompare
   module Modes
-    require 'image_compare/modes/color'
-    require 'image_compare/modes/delta'
-    require 'image_compare/modes/grayscale'
-    require 'image_compare/modes/rgb'
+    require "image_compare/modes/color"
+    require "image_compare/modes/delta"
+    require "image_compare/modes/grayscale"
+    require "image_compare/modes/rgb"
   end
 end

data/lib/image_compare/rectangle.rb

@@ -27,7 +27,9 @@ module ImageCompare
     end
 
     def contains_point?(x, y)
-      x.between?(left, right) && y.between?(top, bot)
+      (x >= left && y >= top && x <= right && y <= bot) ||
+        (x <= right && y <= top && x >= left && y >= bot) ||
+        (x.between?(right, left) && y.between?(bot, top))
     end
   end
 end

data/lib/image_compare/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ImageCompare
-  VERSION = '1.0.0'
+  VERSION = "1.0.2"
 end

data/lib/image_compare.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require 'image_compare/version'
+require "image_compare/version"
 
 module ImageCompare
   class SizesMismatchError < StandardError
   end
 
-  require 'image_compare/color_methods'
-  require 'image_compare/matcher'
+  require "image_compare/color_methods"
+  require "image_compare/matcher"
 
   def self.compare(path_a, path_b, **options)
     Matcher.new(**options).compare(path_a, path_b)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: image_compare
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - cristianofmc
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-27 00:00:00.000000000 Z
+date: 2023-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chunky_png