dotdiff 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 161e2aca53c1b747a6de45cd09ac975f56938d246e32886f7c7efc65cc7f0426
-  data.tar.gz: fc2878dc821b64da63222f2c5b8eb4bfb2f0b6a33d625556165d834d7c386f82
+  metadata.gz: dc1ca017c297dd63435e5282ad168d6e25ab0f9a3c8e2ac0caea8e2d2fa0df4e
+  data.tar.gz: bbecf64885b04e5ed2cd123d6b930e3ceaa15c82a03e0ee67937bb49af385537
 SHA512:
-  metadata.gz: 7b130dcea90f5dc4ca7d85d1154fe84e7209554b4b4b3e09d617e32ec858c256a3bc489e6ffb4e97b738bb02092e95ca225707940be4990f1be5889b50a77043
-  data.tar.gz: 5acf38c5ee36c8964041fd1e9b6c13dfdce58ecf15e0e3ae48b2188326c06f654f5c413d4564bdb63009d9bccc4607813d99b711f3966c02b12d36b2d9228dff
+  metadata.gz: df25e2add82e31537d9d6cab28f46c96cd251106a331a503709c9aa33e229ae64837c809a03c66e4142def23e3eedf05f49106101ba343bac48b61faeff16740
+  data.tar.gz: 4ba8aafa62200080f35294ade8a7d1198f880de72385cc9196eff04654e72755daf3771084136639aa8a01f5c6844a78274b749cacd6a82570a01a1d8833fbe5

data/lib/dotdiff/comparer.rb

@@ -11,12 +11,30 @@ module DotDiff
     end
 
     def result
+      comparer = build_comparer
+
+      if comparer.nil?
+        raise ArgumentError, "Unknown element class received: #{element.class.name}"
+      end
+
+      passed, msg = comparer.run
+      write_failure_imgs(comparer.new_image_path) if !passed && DotDiff.failure_image_path
+
+      [passed, msg]
+    end
+
+    private
+
+    def write_failure_imgs(new_image_path)
+      FileUtils.mkdir_p(snapshot.failure_path)
+      FileUtils.mv(new_image_path, snapshot.new_file, force: true)
+    end
+
+    def build_comparer
       if element.is_a?(Capybara::Session)
-        DotDiff::Comparible::PageComparer.run(snapshot, nil)
+        DotDiff::Comparible::PageComparer.new(snapshot, nil)
       elsif element.is_a?(Capybara::Node::Base)
-        DotDiff::Comparible::ElementComparer.run(snapshot, ElementMeta.new(page, element))
-      else
-        raise ArgumentError, "Unknown element class received: #{element.class.name}"
+        DotDiff::Comparible::ElementComparer.new(snapshot, ElementMeta.new(page, element))
       end
     end
   end

data/lib/dotdiff/comparible/base.rb

@@ -14,14 +14,13 @@ module DotDiff
 
       private
 
-      attr_reader :snapshot, :element_meta, :new_image
+      attr_reader :snapshot, :element_meta
 
       def compare(compare_to_image)
-        @new_image = compare_to_image
         return [false, img_container.dimensions_mismatch_msg] unless img_container.both_images_same_dimensions?
 
         cmd = CommandWrapper.new
-        cmd.run(snapshot.basefile, new_image, snapshot.diff_file)
+        cmd.run(snapshot.basefile, new_image_path, snapshot.diff_file)
         return [cmd.passed?, cmd.message] if cmd.failed?
 
         calculate_result(cmd.pixels)
@@ -34,23 +33,15 @@ module DotDiff
           diff_pixels
         )
 
-        passed = calc.under_threshold?
-        write_failure_imgs if !passed && DotDiff.failure_image_path
-
-        [passed, calc.message]
+        [calc.under_threshold?, calc.message]
       end
 
       def img_container
         @img_container ||= DotDiff::Image::Container.new(
           snapshot.basefile,
-          new_image
+          new_image_path
         )
       end
-
-      def write_failure_imgs
-        FileUtils.mkdir_p(snapshot.failure_path)
-        FileUtils.mv(new_image, snapshot.new_file, force: true)
-      end
     end
   end
 end

data/lib/dotdiff/comparible/element_comparer.rb

@@ -14,6 +14,10 @@ module DotDiff
         end
       end
 
+      def new_image_path
+        snapshot.cropped_file
+      end
+
       private
 
       def take_snapshot_and_crop

data/lib/dotdiff/comparible/page_comparer.rb

@@ -13,6 +13,10 @@ module DotDiff
           compare(snapshot.fullscreen_file)
         end
       end
+
+      def new_image_path
+        snapshot.fullscreen_file
+      end
     end
   end
 end

data/lib/dotdiff/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dotdiff
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Jon Normington
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-21 00:00:00.000000000 Z
+date: 2021-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmagick