eyes_core 3.4.1 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a77f574141a98f28f015e780e282e0cd5f0f5d8d
-  data.tar.gz: d2ddb61637f4181560fa964aabb2473785f0375d
+  metadata.gz: 22dadbeb5bb6802f3b1832c21c781a3c215ea4c3
+  data.tar.gz: f15fb3396c09a95a91b75a7ae3f742777cff67a3
 SHA512:
-  metadata.gz: 209a8f0281272d21848e59e7804e7d47ba1ac11aad11c6d50ed8028cf63d95085cb652005329b8ffffeea1851783e8069ec5d0cf6d298095ba2a61e0566e6b70
-  data.tar.gz: d8afee4a957a6907334903dff546b00f263e8761794e855818fb4080f46711d093422e3aeaee32dd730c29823099d5bcc87cc4f976843f2e44c4f4bbcb40ee4d
+  metadata.gz: 110a411d8e8a363d1daec3f68c940c92aadf99c7ee19989e1caf3172972343a5f1b178976fab6bd9af850adc4078781913e91d4d49426e0dba0088e45fd15283
+  data.tar.gz: beb2a60ad9973a932702b01625e9536ae0fbb58564a04150f5f4ee7c255b0c9c288462fdf6e83c6bd700797c4e1942105f0ecabe41ff7f5941a748a91307a750

data/lib/applitools/connectivity/server_connector.rb

@@ -49,7 +49,7 @@ module Applitools::Connectivity
       # Notice that this does not include the screenshot.
       json_data = Oj.dump(Applitools::Utils.camelcase_hash_keys(data.to_hash)).force_encoding('BINARY')
       body = [json_data.length].pack('L>') + json_data + data.screenshot
-      #Applitools::EyesLogger.debug json_data
+      # Applitools::EyesLogger.debug json_data
       Applitools::EyesLogger.debug 'Sending match data...'
       res = post(URI.join(endpoint_url, session.id.to_s), content_type: 'application/octet-stream', body: body)
       raise Applitools::EyesError.new("Request failed: #{res.status} #{res.headers}") unless res.success?

data/lib/applitools/core/eyes_base.rb

@@ -2,6 +2,15 @@ require 'applitools/core/helpers'
 require 'applitools/core/eyes_screenshot'
 
 module Applitools
+  MATCH_LEVEL = {
+    none: 'None',
+    layout: 'Layout',
+    layout2: 'Layout2',
+    content: 'Content',
+    strict: 'Strict',
+    exact: 'Exact'
+  }.freeze
+
   class EyesBase
     extend Forwardable
     extend Applitools::Helpers
@@ -12,15 +21,6 @@ module Applitools
     SCREENSHOT_AS_IS = Applitools::EyesScreenshot::COORDINATE_TYPES[:screenshot_as_is].freeze
     CONTEXT_RELATIVE = Applitools::EyesScreenshot::COORDINATE_TYPES[:context_relative].freeze
 
-    MATCH_LEVEL = {
-      none: 'None',
-      layout: 'Layout',
-      layout2: 'Layout2',
-      content: 'Content',
-      strict: 'Strict',
-      exact: 'Exact'
-    }.freeze
-
     def_delegators 'Applitools::EyesLogger', :logger, :log_handler, :log_handler=
     def_delegators 'Applitools::Connectivity::ServerConnector', :api_key, :api_key=, :server_url, :server_url=,
       :set_proxy, :proxy, :proxy=
@@ -64,7 +64,7 @@ module Applitools
         end
       end
 
-      @default_match_settings = { match_level: MATCH_LEVEL[:strict], exact: nil }
+      @default_match_settings = { match_level: Applitools::MATCH_LEVEL[:strict], exact: nil }
     end
 
     def batch
@@ -209,7 +209,9 @@ module Applitools
         ignore_mismatch: ignore_mismatch,
         retry_timeout: retry_timeout,
         ignore: options[:ignore],
-        trim: options[:trim]
+        trim: options[:trim],
+        match_level: options[:match_level],
+        exact: options[:exact]
       )
       logger.info 'match_window done!'
 

data/lib/applitools/core/match_window_task.rb

@@ -8,7 +8,7 @@ module Applitools
 
     class << self
       def convert_coordinates(regions, screenshot)
-        regions.map() do |r|
+        regions.map do |r|
           screenshot.convert_region_location(
             Applitools::Region.from_location_size(r.location, r.size),
             Applitools::EyesScreenshot::COORDINATE_TYPES[:context_relative],
@@ -45,6 +45,8 @@ module Applitools
       retry_timeout = options[:retry_timeout]
       ignore = options[:ignore] || []
       trim = options[:trim] || false
+      match_level = options[:match_level]
+      exact = options[:exact]
 
       retry_timeout = default_retry_timeout if retry_timeout < 0
 
@@ -54,25 +56,59 @@ module Applitools
       if retry_timeout.zero? || should_match_window_run_once_on_timeout
         sleep retry_timeout if should_match_window_run_once_on_timeout
         app_output = app_output_provider.app_output region_provider, last_screenshot
-        match_result = perform_match user_inputs: user_inputs, app_output: app_output, tag: tag,
-          ignore_mismatch: ignore_mismatch, ignore: self.class.convert_coordinates(ignore, app_output.screenshot), trim: trim
+        match_result = perform_match(
+          user_inputs: user_inputs,
+          app_output: app_output,
+          tag: tag,
+          ignore_mismatch: ignore_mismatch,
+          ignore: self.class.convert_coordinates(ignore, app_output.screenshot),
+          trim: trim,
+          match_level: match_level,
+          exact: exact
+        )
       else
         app_output = app_output_provider.app_output region_provider, last_screenshot
         start = Time.now
-        match_result = perform_match user_inputs: user_inputs, app_output: app_output, tag: tag, ignore_mismatch: true, ignore: self.class.convert_coordinates(ignore, app_output.screenshot), trim: trim
+        match_result = perform_match(
+          user_inputs: user_inputs,
+          app_output: app_output,
+          tag: tag,
+          ignore_mismatch: true,
+          ignore: self.class.convert_coordinates(ignore, app_output.screenshot),
+          trim: trim,
+          match_level: match_level,
+          exact: exact
+        )
         retry_time = Time.now - start
 
         while retry_time < retry_timeout && !match_result.as_expected?
           sleep MATCH_INTERVAL
           app_output = app_output_provider.app_output region_provider, last_screenshot
-          match_result = perform_match user_inputs: user_inputs, app_output: app_output, tag: tag, ignore_mismatch: true, ignore: self.class.convert_coordinates(ignore, app_output.screenshot), trim: trim
+          match_result = perform_match(
+            user_inputs: user_inputs,
+            app_output: app_output,
+            tag: tag,
+            ignore_mismatch: true,
+            ignore: self.class.convert_coordinates(ignore, app_output.screenshot),
+            trim: trim,
+            match_level: match_level,
+            exact: exact
+          )
           retry_time = Time.now - start
         end
 
         unless match_result.as_expected?
           app_output = app_output_provider.app_output region_provider, last_screenshot
-          match_result = perform_match user_inputs: user_inputs, app_output: app_output, tag: tag,
-            ignore_mismatch: ignore_mismatch, ignore: self.class.convert_coordinates(ignore, app_output.screenshot), trim: trim
+          match_result = perform_match(
+            user_inputs: user_inputs,
+            app_output: app_output,
+            tag: tag,
+            ignore_mismatch: ignore_mismatch,
+            ignore: self.class.convert_coordinates(ignore, app_output.screenshot),
+            trim: trim,
+            match_level: match_level,
+            exact: exact
+          )
         end
       end
 
@@ -95,7 +131,10 @@ module Applitools
         tag: tag, user_inputs: user_inputs.to_hash, ignore_mismatch: ignore_mismatch, ignore_match: false,
         force_mistmatch: false, force_match: false,
         image_match_settings: {
-          ignore: options[:ignore]
+          matchLevel: options[:match_level],
+          ignore: options[:ignore],
+          ignoreCaret: options[:ignore_caret].nil? ? true : options[:ignore_caret],
+          exact: options[:exact]
         },
         trim: {
           enabled: options[:trim]

data/lib/applitools/images/eyes.rb

@@ -58,6 +58,53 @@ module Applitools::Images
       abort_if_not_closed
     end
 
+    def check(name, target)
+      Applitools::ArgumentGuard.not_nil(name, 'name')
+      region_provider = get_region_provider(target)
+
+      image = target.image
+      self.viewport_size = Applitools::RectangleSize.new image.width, image.height if viewport_size.nil?
+      self.screenshot = EyesImagesScreenshot.new image
+
+      mr = check_window_base(
+        region_provider, name, false,
+        target.options[:timeout] || Applitools::EyesBase::USE_DEFAULT_TIMEOUT,
+        ignore: target.ignored_regions,
+        trim: target.options[:trim],
+        match_level: default_match_settings[:match_level],
+        exact: default_match_settings[:exact]
+      )
+      mr.as_expected?
+    end
+
+    def get_region_provider(target)
+      if (region_to_check = target.region_to_check).nil?
+        Object.new.tap do |prov|
+          prov.instance_eval do
+            define_singleton_method :region do
+              Applitools::Region::EMPTY
+            end
+
+            define_singleton_method :coordinate_type do
+              nil
+            end
+          end
+        end
+      else
+        Object.new.tap do |prov|
+          prov.instance_eval do
+            define_singleton_method :region do
+              region_to_check
+            end
+
+            define_singleton_method :coordinate_type do
+              Applitools::EyesScreenshot::COORDINATE_TYPES[:context_relative]
+            end
+          end
+        end
+      end
+    end
+
     # Matches the input image with the next expected image. Takes a hash as an argument. Returns +boolean+
     # as result of matching.
     # @param [Hash] options

data/lib/applitools/images/target.rb

@@ -0,0 +1,87 @@
+module Applitools::Images
+  class Target
+    class << self
+      def path(path)
+        raise Applitools::EyesIllegalArgument unless File.exist?(path)
+        new Applitools::Screenshot.from_image(ChunkyPNG::Image.from_file(path))
+      end
+
+      def blob(blob_image)
+        Applitools::ArgumentGuard.not_nil blob_image, 'blob_image'
+        Applitools::ArgumentGuard.is_a? blob_image, 'blob_image', String
+        new Applitools::Screenshot.from_datastream(blob_image)
+      end
+
+      def image(image)
+        Applitools::ArgumentGuard.not_nil image, 'image'
+        Applitools::ArgumentGuard.is_a? image, 'image', ChunkyPNG::Image
+        new Applitools::Screenshot.from_image(image)
+      end
+
+      def screenshot(screenshot)
+        Applitools::ArgumentGuard.not_nil screenshot, 'screenshot'
+        Applitools::ArgumentGuard.is_a? screenshot, 'screenshot', Applitools::Screenshot
+        new screenshot
+      end
+
+      def any(screenshot)
+        case screenshot
+        when Applitools::Screenshot
+          screenshot(screenshot)
+        when ChunkyPNG::Image
+          image(screenshot)
+        when String
+          begin
+            blob(screenshot)
+          rescue ChunkyPNG::SignatureMismatch
+            path(screenshot)
+          end
+        else
+          raise Applitools::EyesIllegalArgument.new "Passed screenshot is not image type (#{screenshot.class})"
+        end
+      end
+    end
+
+    attr_accessor :image, :options, :ignored_regions, :region_to_check
+
+    def initialize(image)
+      Applitools::ArgumentGuard.not_nil(image, 'image')
+      Applitools::ArgumentGuard.is_a? image, 'image', Applitools::Screenshot
+      self.image = image
+      self.ignored_regions = []
+      self.options = {
+        trim: false
+      }
+    end
+
+    def ignore(region = nil)
+      if region
+        Applitools::ArgumentGuard.is_a? region, 'region', Applitools::Region
+        ignored_regions << region
+      else
+        self.ignored_regions = []
+      end
+      self
+    end
+
+    def region(region = nil)
+      if region
+        Applitools::ArgumentGuard.is_a? region, 'region', Applitools::Region
+        self.region_to_check = region
+      else
+        self.region_to_check = nil
+      end
+      self
+    end
+
+    def trim(value = true)
+      options[:trim] = value ? true : false
+      self
+    end
+
+    def timeout(value = nil)
+      options[:timeout] = value ? value : nil
+      self
+    end
+  end
+end

data/lib/applitools/version.rb

@@ -1,3 +1,3 @@
 module Applitools
-  VERSION = '3.4.1'.freeze
+  VERSION = '3.5.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eyes_core
 version: !ruby/object:Gem::Version
-  version: 3.4.1
+  version: 3.5.0
 platform: ruby
 authors:
 - Applitools Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-25 00:00:00.000000000 Z
+date: 2017-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oily_png
@@ -237,6 +237,7 @@ files:
 - lib/applitools/eyes_logger.rb
 - lib/applitools/images/eyes.rb
 - lib/applitools/images/eyes_images_screenshot.rb
+- lib/applitools/images/target.rb
 - lib/applitools/method_tracer.rb
 - lib/applitools/sauce.rb
 - lib/applitools/utils/eyes_selenium_utils.rb