dotdiff 3.0.0-java → 3.0.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c84511842aad634a5b0a37f06b70a5cd00ff007443e0517493530172907ccae
-  data.tar.gz: a0b6676992de893aec44592fff36b9f74d40d0844b6a8c7c2c02636b793f23c8
+  metadata.gz: 71b526f51b6093e3f063d2f815732d847ecf1d7291a91a2d1583ed14dc3ef4a8
+  data.tar.gz: e3c1b43efb9fa443ccbd9046dc1e6f955cdaf64ae3632924a16eda32e9f54306
 SHA512:
-  metadata.gz: 07357ed91bcddd8863dd9e7543b27ebdbec1ad5d44a243ad00e1f4243473006b18ad1ac50c78860a6846494de4a4b8bc3d8c238930f36453764fb66603337369
-  data.tar.gz: a5bff90cf808780185d4f7759ca283731074c4e40d5efc4ceb2bcbcd1bf18197e2df8b043671ee1423a0a1cefc5b32315832e40781048afa2717cc06a549a09b
+  metadata.gz: 4ccb5dc9b760784bdb78e4beac587dcc8a6f90773a7e5a5fcf5b5bc4edec21e16e6457f9c7ba1185c09b988175e8c08db873aa98810f9ede037653f989001d9d
+  data.tar.gz: f8e2d98a43bbe5d5ed63a14195d5b592aaca31405c2a6823fb191e670ca5ebdaaa14fcf895ed37f637cfb02fb1b3287cf5b4834f900eedac26d922c3fcded070

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: java
 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
   requirement: !ruby/object:Gem::Requirement