dotdiff 3.0.1 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: dc1ca017c297dd63435e5282ad168d6e25ab0f9a3c8e2ac0caea8e2d2fa0df4e
-  data.tar.gz: bbecf64885b04e5ed2cd123d6b930e3ceaa15c82a03e0ee67937bb49af385537
+SHA1:
+  metadata.gz: c869fc9b85965913b4ba033845431a45f5a32f0b
+  data.tar.gz: db555b8adab6b02ac434cd6d490acf905a02b765
 SHA512:
-  metadata.gz: df25e2add82e31537d9d6cab28f46c96cd251106a331a503709c9aa33e229ae64837c809a03c66e4142def23e3eedf05f49106101ba343bac48b61faeff16740
-  data.tar.gz: 4ba8aafa62200080f35294ade8a7d1198f880de72385cc9196eff04654e72755daf3771084136639aa8a01f5c6844a78274b749cacd6a82570a01a1d8833fbe5
+  metadata.gz: a7f2639b01603bfa39c611bbc04b464880b0e3332d510ea369c9b9b42da0f2cf3ca722d8612e4390f7d4e7d75674069a64773198fe41acf75b86cd2eb6962bad
+  data.tar.gz: b4a57a11512cf4ee9fa8f03f8bbedd8af8f729beb4d92fd0c27800c8a9ffc977bc7673397eb24c359273d2e76ee6a369f20de284006c2abd7cba18963102ac67

data/dotdiff.gemspec

@@ -4,14 +4,11 @@ lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'dotdiff/version'
 
-is_java = RUBY_PLATFORM == 'java'
-
 Gem::Specification.new do |spec|
   spec.name          = 'dotdiff'
   spec.version       = DotDiff::VERSION
   spec.authors       = ['Jon Normington']
   spec.email         = ['jnormington@users.noreply.github.com']
-  spec.platform      = 'java' if is_java
 
   spec.summary       = 'Image regression wrapper for Capybara and RSpec using image'\
                         'magick supporting both MRI and JRuby versions'
@@ -25,11 +22,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  if is_java
-    spec.add_runtime_dependency 'rmagick4j', '>= 0.4.0'
-  else
-    spec.add_runtime_dependency 'rmagick', '>= 2.15'
-  end
+  spec.add_runtime_dependency 'mini_magick', '>= 4.11.0'
 
   spec.add_development_dependency 'bundler', '>= 2'
   spec.add_development_dependency 'capybara', '>= 2.6'

data/lib/dotdiff/image/container.rb

@@ -9,19 +9,19 @@ module DotDiff
       end
 
       def both_images_same_dimensions?
-        base_image.rows == new_image.rows &&
-          base_image.columns == new_image.columns
+        base_image.width == new_image.width &&
+          base_image.height == new_image.height
       end
 
       def total_pixels
-        base_image.rows * base_image.columns
+        base_image.width * base_image.height
       end
 
       def dimensions_mismatch_msg
         <<~MSG
           Images are not the same dimensions to be compared
-          Base file: #{base_image.columns}x#{base_image.rows}
-          New file:  #{new_image.columns}x#{new_image.rows}
+          Base file: #{base_image.width}x#{base_image.height}
+          New file:  #{new_image.width}x#{new_image.height}
         MSG
       end
 
@@ -30,11 +30,11 @@ module DotDiff
       attr_reader :baseimg_file, :newimg_file
 
       def base_image
-        @base_image ||= Magick::Image.read(baseimg_file).first
+        @base_image ||= MiniMagick::Image.open(baseimg_file)
       end
 
       def new_image
-        @new_image ||= Magick::Image.read(newimg_file).first
+        @new_image ||= MiniMagick::Image.open(newimg_file)
       end
     end
   end

data/lib/dotdiff/image/cropper.rb

@@ -1,29 +1,31 @@
 # frozen_string_literal: true
 
-require 'rmagick'
+require 'mini_magick'
 
 module DotDiff
   module Image
     module Cropper
       def crop_and_resave(element)
         image = load_image(fullscreen_file)
-        image.crop!(
-          element.rectangle.x.floor,
-          element.rectangle.y.floor,
-          width(element, image),
-          height(element, image)
-        )
 
+        # @see http://www.imagemagick.org/script/command-line-options.php?#crop
+        crop_area =
+          '' + width(element, image).to_s +
+          'x' + height(element, image).to_s +
+          '+' + element.rectangle.x.floor.to_s +
+          '+' + element.rectangle.y.floor.to_s
+
+        image.crop crop_area
         image.write(cropped_file)
       end
 
       def load_image(file)
-        Magick::Image.read(file).first
+        MiniMagick::Image.open(file)
       end
 
       def height(element, image)
         element_height = element.rectangle.height + element.rectangle.y
-        image_height = image.rows
+        image_height = image.height
 
         if element_height > image_height
           image_height - element.rectangle.y
@@ -34,7 +36,7 @@ module DotDiff
 
       def width(element, image)
         element_width = element.rectangle.width + element.rectangle.x
-        image_width = image.columns
+        image_width = image.width
 
         if element_width > image_width
           image_width - element.rectangle.x

data/lib/dotdiff/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DotDiff
-  VERSION = '3.0.1'
+  VERSION = '4.0.0'
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: dotdiff
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 4.0.0
 platform: ruby
 authors:
 - Jon Normington
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-28 00:00:00.000000000 Z
+date: 2022-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rmagick
+  name: mini_magick
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.15'
+        version: 4.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.15'
+        version: 4.11.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -118,7 +118,7 @@ homepage: https://github.com/jnormington/dotdiff
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -133,8 +133,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.6.14.4
+signing_key: 
 specification_version: 4
 summary: Image regression wrapper for Capybara and RSpec using imagemagick supporting
   both MRI and JRuby versions