eyes_images 3.10.1 → 3.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 004f26f8ff0deead3ca1e9c16b8ecda858384c55
-  data.tar.gz: 9c52421260c18d04eaea5144df52e4e1f7920b5a
+  metadata.gz: 9b72c0e91549bf0bf4f50367a9f1148ecc43503e
+  data.tar.gz: 463fac22a4485ff5981352021f7f98a2c5d6796c
 SHA512:
-  metadata.gz: 6c2fa42e1cc16d5abf5d84bc0381aefbf47f688e25b8ad19eb90fa510d2a8c591ad445118e33b6512bf0054f3ce3489adcac6d69d199ff69026ed3800eb1ce00
-  data.tar.gz: 2f7de98920f7ac081b8b5bfda05433bf3fcb3e6dcf4c08386b8ab9b0dd69c475bd2de1a1d5319affd537d047fa8cebebf9c57961ac4c543245da1147e289e194
+  metadata.gz: 20acc4328118bb17e14a53e731a67424e3bb58324993883b25db764bc6a5cd4e42a961ce7a2d1e00637104d4f504fd09aa669a976babb6356e556d32bc086043
+  data.tar.gz: a9e8ec265e018af13e2c297d65df10c06253439a64d8fac7c7aff8e5523c3137a109ed831d113567f3e244003d2f0a9e7d3ebff6c13613879e4ee9a0efbee7a1

data/lib/applitools/images/eyes.rb

@@ -59,49 +59,48 @@ module Applitools::Images
     end
 
     def check(name, target)
-      Applitools::ArgumentGuard.not_nil(name, 'name')
-      region_provider = get_region_provider(target)
-
-      match_window_data = Applitools::MatchWindowData.new
-      match_window_data.tag = name
-      match_window_data.match_level = default_match_settings[:match_level]
-      match_window_data.read_target(target, nil)
+      check_it(name, target, Applitools::MatchWindowData.new).as_expected?
+    end
 
-      image = target.image
-      self.viewport_size = Applitools::RectangleSize.new image.width, image.height if viewport_size.nil?
-      self.screenshot = EyesImagesScreenshot.new image
+    def check_single(name, target, options = {})
+      open_and_close(name, target, options) do |n, t|
+        check_it(n, t, Applitools::MatchSingleCheckData.new)
+      end
+    end
 
-      mr = check_window_base(
-        region_provider,
-        target.options[:timeout] || Applitools::EyesBase::USE_DEFAULT_TIMEOUT,
-        match_window_data
-      )
-      mr.as_expected?
+    def open_and_close(*args)
+      options_for_open = Applitools::Utils.extract_options!(args)
+      open(options_for_open)
+      result = yield(*args)
+      close
+      result
     end
 
-    def check_single(name, target, options = {})
-      open_base(options) unless options.empty?
+    def check_it(name, target, match_window_data)
       Applitools::ArgumentGuard.not_nil(name, 'name')
       region_provider = get_region_provider(target)
 
-      match_window_data = Applitools::MatchSingleCheckData.new
       match_window_data.tag = name
-
-      match_window_data.ignore_mismatch = options[:ignore_mismatch] ? true : false
-      match_window_data.match_level = default_match_settings[:match_level]
-
+      update_default_settings(match_window_data)
       match_window_data.read_target(target, nil)
 
       image = target.image
       self.viewport_size = Applitools::RectangleSize.new image.width, image.height if viewport_size.nil?
       self.screenshot = EyesImagesScreenshot.new image
 
-      mr = check_single_base(
+      if match_window_data.is_a? Applitools::MatchSingleCheckData
+        return check_single_base(
+          region_provider,
+          target.options[:timeout] || Applitools::EyesBase::USE_DEFAULT_TIMEOUT,
+          match_window_data
+        )
+      end
+
+      check_window_base(
         region_provider,
         target.options[:timeout] || Applitools::EyesBase::USE_DEFAULT_TIMEOUT,
         match_window_data
       )
-      mr
     end
 
     def get_region_provider(target)
@@ -150,37 +149,10 @@ module Applitools::Images
     # @example Ignore mismatch
     #   eyes.check_image(image: my_image, tag: 'My Test', ignore_mismatch: true)
     def check_image(options)
-      options = { tag: nil, ignore_mismatch: false }.merge options
-      match_data = Applitools::MatchWindowData.new
-      match_data.tag = options[:tag]
-      match_data.ignore_mismatch = options[:ignore_mismatch]
-      match_data.match_level = default_match_settings[:match_level]
-
-      if disabled?
-        logger.info "check_image(image, #{options[:tag]}, #{options[:ignore_mismatch]}): Ignored"
-        return false
-      end
-
-      image = get_image_from_options options
-
-      logger.info "check_image(image, #{options[:tag]}, #{options[:ignore_mismatch]})"
-      if image.is_a? Applitools::Screenshot
-        self.viewport_size = Applitools::RectangleSize.new image.width, image.height if viewport_size.nil?
-        self.screenshot = EyesImagesScreenshot.new image
-      end
-      self.title = options[:tag] || ''
-      region_provider = Object.new
-      region_provider.instance_eval do
-        define_singleton_method :region do
-          Applitools::Region::EMPTY
-        end
-
-        define_singleton_method :coordinate_type do
-          nil
-        end
-      end
-      mr = check_window_base region_provider, Applitools::EyesBase::USE_DEFAULT_TIMEOUT, match_data
-      mr.as_expected?
+      options = { tag: '', ignore_mismatch: false }.merge options
+      image = get_image_from_options(options)
+      target = Applitools::Images::Target.any(image).ignore_mismatch(options[:ignore_mismatch])
+      check(options[:tag], target)
     end
 
     # Performs visual validation for the current image.
@@ -200,40 +172,12 @@ module Applitools::Images
     #   eyes.check_region(image_bytes: string_represents_image, tag: 'My Test', region: my_region)
     def check_region(options)
       options = { tag: nil, ignore_mismatch: false }.merge options
-      match_data = Applitools::MatchWindowData.new
-      match_data.tag = options[:tag]
-      match_data.ignore_mismatch = options[:ignore_mismatch]
-      match_data.match_level = default_match_settings[:match_level]
-
-      if disabled?
-        logger.info "check_region(image, #{options[:tag]}, #{options[:ignore_mismatch]}): Ignored"
-        return false
-      end
-
       Applitools::ArgumentGuard.not_nil options[:region], 'options[:region] can\'t be nil!'
       image = get_image_from_options options
-
+      target = Applitools::Images::Target.any(image).ignore_mismatch(options[:ignore_mismatch])
+      target.region(options[:region])
       logger.info "check_region(image, #{options[:region]}, #{options[:tag]}, #{options[:ignore_mismatch]})"
-
-      if image.is_a? Applitools::Screenshot
-        self.viewport_size = Applitools::RectangleSize.new image.width, image.height if viewport_size.nil?
-        self.screenshot = EyesImagesScreenshot.new image
-      end
-      self.title = options[:tag] || ''
-
-      region_provider = Object.new
-      region_provider.instance_eval do
-        define_singleton_method :region do
-          options[:region]
-        end
-        define_singleton_method :coordinate_type do
-          Applitools::EyesScreenshot::COORDINATE_TYPES[:screenshot_as_is]
-        end
-      end
-      # mr = check_window_base region_provider, options[:tag], options[:ignore_mismatch],
-      #   Applitools::EyesBase::USE_DEFAULT_TIMEOUT, options.merge(match_level: default_match_settings[:match_level])
-      mr = check_window_base region_provider, Applitools::EyesBase::USE_DEFAULT_TIMEOUT, match_data
-      mr.as_expected?
+      check(options[:tag], target)
     end
 
     # Adds a mouse trigger

data/lib/applitools/version.rb

@@ -1,3 +1,3 @@
 module Applitools
-  VERSION = '3.10.1'.freeze
+  VERSION = '3.10.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eyes_images
 version: !ruby/object:Gem::Version
-  version: 3.10.1
+  version: 3.10.2
 platform: ruby
 authors:
 - Applitools Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-02 00:00:00.000000000 Z
+date: 2017-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eyes_core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.10.1
+        version: 3.10.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.10.1
+        version: 3.10.2
 description: Applitools Ruby Images SDK
 email:
 - team@applitools.com
@@ -57,7 +57,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Applitools Ruby Images SDK