eyes_core 3.10.0 → 3.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f84cff0084421e8499a55d27597dca8fc4b34599
-  data.tar.gz: 59cb82f795191e1a337f654c3e55832d1392c9a0
+  metadata.gz: 69da25c3d4e67d9f44a708e6b0c0da5382374285
+  data.tar.gz: 45358e7a6182c7185b00cfeda8034423fcce5178
 SHA512:
-  metadata.gz: ff55bccbb6b1a8005b44256271aaf5ad1548687ff31c91e6b12f1885b116c81fc8aced88533d8b5c51d899eb707c475316070e30cf03b2cc8b19c0f659fb92c0
-  data.tar.gz: 5f8f3979452406edc023c5a4383f64d3903f33dc0cb3805e829d2c97c8fa91c3d0fa3afe04df8f0c158eff6cba365199ec8a4989f6b6c7a41205dd9759d10862
+  metadata.gz: 00ace03b98a2b76511a79bba56c9fe0c2299f80e935c46fbaeeb368a87b4059394f1881b25d38236ff905e13259305e1ddd849c83082c8c9186d65771da2e2b0
+  data.tar.gz: a328ecd8c09fb95c31ee1d3833ab9d6456f56caf3f8df484083104a65ee9e8473c68fefe148d7493cf466205896affae4ff44cb50d0e6dd64c0bb7919f5e84a5

data/lib/applitools/connectivity/server_connector.rb

@@ -179,7 +179,10 @@ module Applitools::Connectivity
         loop do
           Applitools::EyesLogger.debug "Still running... retrying in #{delay}s"
           sleep delay
-          res = request(second_step_url, :get)
+          second_step_options = { headers: {
+              'Eyes-Date' => Time.now.utc.strftime('%a, %d %b %Y %H:%M:%S GMT')
+          } }
+          res = request(second_step_url, :get, second_step_options)
           break unless res.status == HTTP_STATUS_CODES[:ok]
         end
       end

data/lib/applitools/core/eyes_base.rb

@@ -68,10 +68,12 @@ module Applitools
         end
       end
 
-      @default_match_settings = { match_level: Applitools::MATCH_LEVEL[:strict],
-                                  exact: nil,
-                                  scale: server_scale,
-                                  remainder: server_remainder}
+      @default_match_settings = {
+        match_level: Applitools::MATCH_LEVEL[:strict],
+        exact: nil,
+        scale: server_scale,
+        remainder: server_remainder
+      }
     end
 
     def batch
@@ -103,18 +105,14 @@ module Applitools
       @default_match_settings[:scale] = ratio
     end
 
-    def server_scale
-      @server_scale
-    end
+    attr_reader :server_scale
 
     def server_remainder=(ratio)
       @server_remainder = ratio
       @default_match_settings[:remainder] = ratio
     end
 
-    def server_remainder
-      @server_remainder
-    end
+    attr_reader :server_remainder
 
     def disabled=(value)
       @disabled = Applitools::Utils.boolean_value value

data/lib/applitools/core/fluent_interface.rb

@@ -0,0 +1,27 @@
+module Applitools::FluentInterface
+  def ignore_caret(value = false)
+    options[:ignore_caret] = value ? true : false
+    self
+  end
+
+  def timeout(value)
+    options[:timeout] = value.to_i
+    self
+  end
+
+  def trim(value = true)
+    options[:trim] = value ? true : false
+    self
+  end
+
+  def ignore_mismatch(value)
+    options[:ignore_mismatch] = value ? true : false
+    self
+  end
+
+  def match_level(value)
+    raise Applitools::EyesError unless Applitools::MATCH_LEVEL.keys.include? value
+    options[:match_level] = Applitools::MATCH_LEVEL[value]
+    self
+  end
+end

data/lib/applitools/core/match_single_check_data.rb

@@ -3,7 +3,7 @@ module Applitools
   class MatchSingleCheckData < MatchWindowData
     class << self
       def default_data
-        {
+        super.merge!(
           'startInfo' => {
             'agentId' => nil,
             'appIdOrName' => nil,
@@ -16,52 +16,8 @@ module Applitools
             'branchName' => nil,
             'parentBranchName' => nil,
             'properties' => nil
-          },
-          'IgnoreMismatch' => false,
-          'MismatchWait' => 0,
-          'Options' => {
-            'Name' => nil,
-            'UserInputs' => [],
-            'ImageMatchSettings' => {
-              'MatchLevel' => 'None',
-              'SplitTopHeight' => 0,
-              'SplitBottomHeight' => 0,
-              'IgnoreCaret' => false,
-              'Ignore' => [],
-              'Exact' => {
-                'MinDiffIntensity' => 0,
-                'MinDiffWidth' => 0,
-                'MinDiffHeight' => 0,
-                'MatchThreshold' => 0
-              },
-              'scale' => 0,
-              'remainder' => 0
-            },
-            'IgnoreExpectedOutputSettings' => false,
-            'ForceMatch' => false,
-            'ForceMismatch' => false,
-            'IgnoreMatch' => false,
-            'IgnoreMismatch' => false,
-            'Trim' => {
-              'Enabled' => false,
-              'ForegroundIntensity' => 0,
-              'MinEdgeLength' => 0
-            }
-          },
-          'Id' => nil,
-          'UserInputs' => [],
-          'AppOutput' => {
-            'Screenshot64' => nil,
-            'ScreenshotUrl' => nil,
-            'Title' => nil,
-            'IsPrimary' => false,
-            'Elapsed' => 0
-          },
-          'Tag' => nil,
-          'updateBaselineIfDifferent' => false,
-          'updateBaselineIfNew' => false,
-          'removeSessionIfMatching' => false
-        }
+          }
+        )
       end
     end
 

data/lib/applitools/core/match_window_data.rb

@@ -17,7 +17,7 @@ module Applitools
             'Name' => nil,
             'UserInputs' => [],
             'ImageMatchSettings' => {
-              'MatchLevel' => 'None',
+              'MatchLevel' => 'Strict',
               'SplitTopHeight' => 0,
               'SplitBottomHeight' => 0,
               'IgnoreCaret' => false,
@@ -145,21 +145,26 @@ module Applitools
     def read_target(target, driver)
       # options
       target_options_to_read.each do |field|
-        send("#{field}=", target.options[field.to_sym])
+        a_value = target.options[field.to_sym]
+        send("#{field}=", a_value) unless a_value.nil?
       end
       # ignored regions
-      target.ignored_regions.each do |r|
-        case r
-        when Proc
-          region = r.call(driver)
-          @ignored_regions << Applitools::Region.from_location_size(region.location, region.size)
-          @need_convert_ignored_regions_coordinates = true
-        when Applitools::Region
-          @ignored_regions << r
-          @need_convert_ignored_regions_coordinates = true
+      if target.respond_to? :ignored_regions
+        target.ignored_regions.each do |r|
+          case r
+          when Proc
+            region = r.call(driver)
+            @ignored_regions << Applitools::Region.from_location_size(region.location, region.size)
+            @need_convert_ignored_regions_coordinates = true
+          when Applitools::Region
+            @ignored_regions << r
+            @need_convert_ignored_regions_coordinates = true
+          end
         end
       end
+
       # floating regions
+      return unless target.respond_to? :floating_regions
       target.floating_regions.each do |r|
         case r
         when Proc
@@ -176,7 +181,7 @@ module Applitools
     end
 
     def target_options_to_read
-      %w(trim ignore_caret)
+      %w(trim ignore_caret match_level ignore_mismatch)
     end
 
     private :target_options_to_read

data/lib/applitools/core/region_provider.rb

@@ -0,0 +1,10 @@
+module Applitools
+  class RegionProvider
+    # Do we need it under Selenium module?
+    attr_reader :region, :coordinate_type
+    def initialize(region, coordinate_type)
+      @region = region
+      @coordinate_type = coordinate_type
+    end
+  end
+end

data/lib/applitools/sauce.rb

@@ -1,2 +1,2 @@
 require_relative 'capybara' if defined? Capybara
-Applitools.require_dir 'selenium/sauce'
+Applitools::Selenium.require_dir 'selenium/sauce'

data/lib/applitools/version.rb

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

data/lib/eyes_core.rb

@@ -1,18 +1,14 @@
 require 'forwardable'
 require 'delegate'
 require 'time'
+require_relative 'require_utils'
 
 module Applitools
-  # @!visibility private
-  class << self
-    # @!visibility private
-    def require_dir(dir)
-      Dir[File.join(File.dirname(File.expand_path(__FILE__)), 'applitools', dir, '*.rb')].sort.each do |f|
-        require f
-      end
-    end
-  end
+  extend Applitools::RequireUtils
 
+  def self.load_dir
+    File.dirname(File.expand_path(__FILE__))
+  end
   # @!visibility private
   class EyesError < StandardError; end
   # @!visibility private

data/lib/require_utils.rb

@@ -0,0 +1,10 @@
+module Applitools
+  module RequireUtils
+    # @!visibility private
+    def require_dir(dir)
+      Dir[File.join(load_dir, 'applitools', dir, '*.rb')].sort.each do |f|
+        require f
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eyes_core
 version: !ruby/object:Gem::Version
-  version: 3.10.0
+  version: 3.10.1
 platform: ruby
 authors:
 - Applitools Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-30 00:00:00.000000000 Z
+date: 2017-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oily_png
@@ -218,6 +218,7 @@ files:
 - lib/applitools/core/fixed_cut_provider.rb
 - lib/applitools/core/fixed_scale_provider.rb
 - lib/applitools/core/floating_region.rb
+- lib/applitools/core/fluent_interface.rb
 - lib/applitools/core/hash_extension.rb
 - lib/applitools/core/helpers.rb
 - lib/applitools/core/location.rb
@@ -230,6 +231,7 @@ files:
 - lib/applitools/core/mouse_trigger.rb
 - lib/applitools/core/rectangle_size.rb
 - lib/applitools/core/region.rb
+- lib/applitools/core/region_provider.rb
 - lib/applitools/core/screenshot.rb
 - lib/applitools/core/session.rb
 - lib/applitools/core/session_start_info.rb
@@ -238,9 +240,6 @@ files:
 - lib/applitools/core/trigger.rb
 - lib/applitools/extensions.rb
 - 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
@@ -249,6 +248,7 @@ files:
 - lib/applitools/utils/utils.rb
 - lib/applitools/version.rb
 - lib/eyes_core.rb
+- lib/require_utils.rb
 homepage: https://www.applitools.com
 licenses:
 - Apache License, Version 2.0

data/lib/applitools/images/eyes.rb

@@ -1,288 +0,0 @@
-require 'applitools/core/eyes_base'
-
-# Eyes Images SDK
-#
-module Applitools::Images
-  # A class to perform visual validation on images. Allows to handle user data like +Mouse trigger+ and +Text trigger+
-  # @example
-  #   eyes = Applitools::Images::Eyes.new
-  #   eyes.open(app_name: 'App name', test_name: 'Test name')
-  #   eyes.check_image(eyes.check_image(image_path: '~/test/some_screenshot.png', tag: 'My Test')
-  #   eyes.close(true)
-  class Eyes < Applitools::EyesBase
-    # @!visibility private
-    attr_accessor :base_agent_id, :screenshot, :inferred_environment, :title
-
-    # @!visibility private
-    def capture_screenshot
-      @screenshot
-    end
-
-    # Creates a new eyes object
-    # @example
-    #   eyes = Applitools::Images::Eyes.new
-    # @param server_url The Eyes Server URL
-    def initialize(server_url = Applitools::Connectivity::ServerConnector::DEFAULT_SERVER_URL)
-      super
-      self.base_agent_id = "eyes.images.ruby/#{Applitools::VERSION}".freeze
-    end
-
-    # Starts a test.
-    # @param [Hash] options
-    # @option options [String] :app_name the name of the application under trest. Required.
-    # @option options [String] :test_name the test name. Required
-    # @option options [String | Hash] :viewport_size viewport size for the baseline, may be passed as a
-    #   string (<tt>'800x600'</tt>) or as a hash (<tt>{width: 800, height: 600}</tt>).
-    #   If ommited, the viewport size will be grabbed from the actual image size
-    # @example
-    #   eyes.open app_name: 'my app', test_name: 'my test'
-    def open(options = {})
-      Applitools::ArgumentGuard.hash options, 'open(options)', [:app_name, :test_name]
-      options[:viewport_size] = Applitools::RectangleSize.from_any_argument options[:viewport_size]
-      open_base options
-    end
-
-    # Opens eyes using passed options, yields the block and then closes eyes session.
-    # Use Applitools::Images::Eyes method inside the block to perform the test. If the block throws an exception,
-    # eyes session will be closed correctly.
-    # @example
-    #  eyes.test(app_name: 'Eyes.Java', test_name: 'home2') do
-    #    eyes.check_image(image_path: './images/viber-home.png')
-    #    eyes.check_image(image_path: './images/viber-bada.png')
-    #  end
-    def test(options = {}, &_block)
-      open(options)
-      yield
-      close
-    ensure
-      abort_if_not_closed
-    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)
-
-      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,
-        target.options[:timeout] || Applitools::EyesBase::USE_DEFAULT_TIMEOUT,
-        match_window_data
-      )
-      mr.as_expected?
-    end
-
-    def check_single(name, target, options = {})
-      open_base(options) unless options.empty?
-      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]
-
-      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(
-        region_provider,
-        target.options[:timeout] || Applitools::EyesBase::USE_DEFAULT_TIMEOUT,
-        match_window_data
-      )
-      mr
-    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
-    # @option options [Applitools::Screenshot] :image
-    # @option options [String] :image_bytes image in PNG format. Can be obtained as ChunkyPNG::Image.to_blob()
-    # @option options [String] :image_path
-    # @option options [String] :tag An optional tag to be associated with the validation checkpoint.
-    # @option options [Boolean] :ignore_mismatch If set to +true+ the server should ignore a negative
-    #   result for the visual validation. (+false+ by default)
-    # @example Image is a file
-    #   eyes.check_image(image_path: '~/test/some_screenshot.png', tag: 'My Test')
-    # @example Image is a +Applitools::Screenshot+ instance
-    #   eyes.check_image(image: my_image, tag: 'My Test')
-    # @example Image is a +String+
-    #   eyes.check_image(image_bytes: string_represents_image, tag: 'My Test')
-    # @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?
-    end
-
-    # Performs visual validation for the current image.
-    # @param [Hash] options
-    # @option options [Applitools::Region] :region A region to validate within the image
-    # @option options [Applitools::Screenshot] :image Image to validate
-    # @option options [String] :image_bytes Image in +PNG+ format. Can be obtained as ChunkyPNG::Image.to_blob()
-    # @option options [String] :image_path Path to image file
-    # @option options [String] :tag An optional tag to be associated with the validation checkpoint.
-    # @option options [Boolean] :ignore_mismatch If set to +true+ the server would ignore a negative
-    #   result for the visual validation
-    # @example Image is a file
-    #   eyes.check_region(image_path: '~/test/some_screenshot.png', region: my_region, tag: 'My Test')
-    # @example Image is a Applitools::Screenshot instance
-    #   eyes.check_region(image: my_image, tag: 'My Test', region: my_region)
-    # @example Image is a +String+
-    #   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
-
-      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?
-    end
-
-    # Adds a mouse trigger
-    # @param [Symbol] action A mouse action. Can be one of  +:click+, +:right_click+, +:double_click+, +:move+,
-    #   +:down+, +:up+
-    # @param [Applitools::Region] control The control on which the trigger is activated
-    #   (context relative coordinates).
-    # @param [Applitools::Location] cursor The cursor's position relative to the control.
-    def add_mouse_trigger(action, control, cursor)
-      add_mouse_trigger_base action, control, cursor
-    end
-
-    # Adds a keyboard trigger
-    # @param [Applitools::Region] control the control's context-relative region.
-    # @param text The trigger's text.
-    def add_text_trigger(control, text)
-      add_text_trigger_base control, text
-    end
-
-    private
-
-    def vp_size
-      viewport_size
-    end
-
-    def vp_size=(value)
-      Applitools::ArgumentGuard.not_nil 'value', value
-      @viewport_size = Applitools::RectangleSize.for value
-    end
-
-    alias get_viewport_size vp_size
-    alias set_viewport_size vp_size=
-
-    def get_image_from_options(options)
-      image = if options[:image].nil? || !options[:image].is_a?(Applitools::Screenshot)
-                if options[:image].is_a? ChunkyPNG::Image
-                  Applitools::Screenshot.from_image options[:image]
-                elsif !options[:image_path].nil? && !options[:image_path].empty?
-                  Applitools::Screenshot.from_datastream ChunkyPNG::Datastream.from_file(options[:image_path]).to_s
-                elsif !options[:image_bytes].nil? && !options[:image_bytes].empty?
-                  Applitools::Screenshot.from_datastream options[:image_bytes]
-                end
-              else
-                options[:image]
-              end
-
-      Applitools::ArgumentGuard.not_nil image, 'options[:image] can\'t be nil!'
-
-      image
-    end
-  end
-end

data/lib/applitools/images/eyes_images_screenshot.rb

@@ -1,106 +0,0 @@
-module Applitools::Images
-  # @!visibility private
-  class EyesImagesScreenshot < ::Applitools::EyesScreenshot
-    SCREENSHOT_AS_IS = Applitools::EyesScreenshot::COORDINATE_TYPES[:screenshot_as_is].freeze
-    CONTEXT_RELATIVE = Applitools::EyesScreenshot::COORDINATE_TYPES[:context_relative].freeze
-
-    def initialize(image, options = {})
-      super image
-      return if (location = options[:location]).nil?
-      Applitools::ArgumentGuard.is_a? location, 'options[:location]', Applitools::Location
-      @bounds = Applitools::Region.new location.x, location.y, image.width, image.height
-    end
-
-    def convert_location(location, from, to)
-      Applitools::ArgumentGuard.not_nil location, 'location'
-      Applitools::ArgumentGuard.not_nil from, 'from'
-      Applitools::ArgumentGuard.not_nil to, 'to'
-
-      Applitools::ArgumentGuard.is_a? location, 'location', Applitools::Location
-
-      result = Applitools::Location.new location.x, location.y
-      return result if from == to
-
-      case from
-      when SCREENSHOT_AS_IS
-        raise "Coordinate type conversation error: #{from} -> #{to}" unless to == CONTEXT_RELATIVE
-        result.offset bounds
-        return result
-      when CONTEXT_RELATIVE
-        raise "Coordinate type conversation error: #{from} -> #{to}" unless to == SCREENSHOT_AS_IS
-        result.offset(Applitools::Location.new(-bounds.x, -bounds.y))
-        return result
-      else
-        raise "Coordinate type conversation error: #{from} -> #{to}"
-      end
-    end
-
-    def convert_region_location(region, from, to)
-      Applitools::ArgumentGuard.not_nil region, 'region'
-      return Core::Region.new(0, 0, 0, 0) if region.empty?
-
-      Applitools::ArgumentGuard.not_nil from, 'from'
-      Applitools::ArgumentGuard.not_nil to, 'to'
-
-      updated_location = convert_location region.location, from, to
-
-      Applitools::Region.new updated_location.x, updated_location.y, region.width, region.height
-    end
-
-    def intersected_region(region, from, to = CONTEXT_RELATIVE)
-      Applitools::ArgumentGuard.not_nil region, 'region'
-      Applitools::ArgumentGuard.not_nil from, 'coordinates Type (from)'
-
-      return Applitools::Region.new(0, 0, 0, 0) if region.empty?
-
-      intersected_region = convert_region_location region, from, to
-      intersected_region.intersect bounds
-      return intersected_region if intersected_region.empty?
-
-      intersected_region.location = convert_location intersected_region.location, to, from
-      intersected_region
-    end
-
-    def location_in_screenshot(location, coordinates_type)
-      Applitools::ArgumentGuard.not_nil location, 'location'
-      Applitools::ArgumentGuard.not_nil coordinates_type, 'coordinates_type'
-      location = convert_location(location, coordinates_type, CONTEXT_RELATIVE)
-
-      unless bounds.contains? location.left, location.top
-        raise Applitools::OutOfBoundsException.new "Location #{location} is not available in screenshot!"
-      end
-
-      convert_location location, CONTEXT_RELATIVE, SCREENSHOT_AS_IS
-    end
-
-    def sub_screenshot(region, coordinates_type, throw_if_clipped = false, force_nil_if_clipped = false)
-      Applitools::ArgumentGuard.not_nil region, 'region'
-      Applitools::ArgumentGuard.not_nil coordinates_type, 'coordinates_type'
-
-      sub_screen_region = intersected_region region, coordinates_type, SCREENSHOT_AS_IS
-
-      if sub_screen_region.empty? || (throw_if_clipped && !region.size_equals?(sub_screen_region))
-        return nil if force_nil_if_clipped
-        Applitools::OutOfBoundsException.new "Region #{sub_screen_region} (#{coordinates_type}) is out of " \
-          " screenshot bounds #{bounds}"
-      end
-
-      sub_screenshot_image = Applitools::Screenshot.from_any_image(
-        image.crop(
-          sub_screen_region.left, sub_screen_region.top, sub_screen_region.width, sub_screen_region.height
-        ).to_datastream.to_blob
-      )
-
-      relative_sub_screenshot_region = convert_region_location(sub_screen_region, SCREENSHOT_AS_IS, CONTEXT_RELATIVE)
-
-      Applitools::Images::EyesImagesScreenshot.new sub_screenshot_image,
-        location: relative_sub_screenshot_region.location
-    end
-
-    private
-
-    def bounds
-      @bounds ||= Applitools::Region.new(0, 0, image.width, image.height)
-    end
-  end
-end

data/lib/applitools/images/target.rb

@@ -1,104 +0,0 @@
-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, :floating_regions
-
-    def initialize(image)
-      Applitools::ArgumentGuard.not_nil(image, 'image')
-      Applitools::ArgumentGuard.is_a? image, 'image', Applitools::Screenshot
-      self.image = image
-      self.ignored_regions = []
-      self.floating_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 floating(*args)
-      value = case args.first
-                when Applitools::FloatingRegion
-                  proc { args.first }
-                when Applitools::Region
-                  proc do
-                    region = args.shift
-                    Applitools::FloatingRegion.new region.left, region.top, region.width, region.height, *args
-                  end
-                else
-                  self.floating_regions = []
-              end
-      floating_regions << value
-      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