eyes_core 3.15.20 → 3.15.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8467f8105f31c3f211c69d80cbf435f8c0429db952c2333a7e4cfb42228a30dc
-  data.tar.gz: fc2d214ad9aec9b7f0dfd49773cef6b8df1cd76fce5af71932b48ba14252b4f7
+  metadata.gz: b616da7b7712b298cff5e468a996761d87d7ef259911b9eddd87f0731fc6d276
+  data.tar.gz: c6e7ffe23b03814f8dbeca27beba13745c5d31511fefc752ee0d315bbd77d2d9
 SHA512:
-  metadata.gz: e45b9e404641071062fd782bb99bf1cda0dbdaad9282c5b4fa92b60d331a81cb7868450055da5a0527ddda0b11357e4be0df39a54a8b9b90c22fb865b0f5ff84
-  data.tar.gz: e91ae965b9dbf8ed1ffd4a4a30aec841e63b43b974467cf0ca715fa71c5e19d264bcf84f7e71d68523d113aa26c4487d2dd5ee4e63a53613464b19c55e20cc7f
+  metadata.gz: 6050f4c3e053eec882346316d7b641c6c557f0628769e0c0ce5d19fa24694e1ab8d4c7274a1e3c4e32b141f6bba9c93350566f2400c5d08f80aa433176017a07
+  data.tar.gz: c26f96db43adcc93511e4910b03cb0c5eb9e6e8b2d44168ed8d64417d6bd80c560bff281794cad8de560256fa091c40fe90798c01523387f2a53bff6a9bed8a4

data/lib/applitools/core/eyes_base.rb

@@ -3,20 +3,12 @@
 require 'applitools/core/helpers'
 require 'applitools/core/eyes_screenshot'
 require 'applitools/core/eyes_base_configuration'
+require 'applitools/core/match_level'
 require 'zlib'
 
 require_relative 'match_level_setter'
 
 module Applitools
-  module MatchLevel
-    NONE = 'None'.freeze
-    LAYOUT = 'Layout'.freeze
-    LAYOUT2 = 'Layout2'.freeze
-    CONTENT = 'Content'.freeze
-    STRICT = 'Strict'.freeze
-    EXACT = 'Exact'.freeze
-  end
-
   MATCH_LEVEL = {
     none: 'None',
     layout: 'Layout',
@@ -100,7 +92,7 @@ module Applitools
         end
       end
 
-      self.exact = nil
+      # self.exact = nil
       self.match_level = Applitools::MatchLevel::STRICT
       self.server_scale = 0
       self.server_remainder = 0
@@ -134,9 +126,9 @@ module Applitools
     # @option exact_options [Integer] :match_threshold
     # @return [Target] Applitools::Selenium::Target or Applitools::Images::target
 
-    def set_default_match_settings(value, exact_options = {})
-      (self.match_level, self.exact) = match_level_with_exact(value, exact_options)
-    end
+    # def set_default_match_settings(value, exact_options = {})
+    #   (self.match_level, self.exact) = match_level_with_exact(value, exact_options)
+    # end
 
     # Sets default match settings
     # @param [Hash] value
@@ -145,30 +137,29 @@ module Applitools
     # @option value [Fixnum] scale
     # @option value [Fixnum] remainder
 
-    def default_match_settings=(value)
-      Applitools::ArgumentGuard.is_a? value, 'value', Hash
-      extra_keys = value.keys - match_level_keys
-      unless extra_keys.empty?
-        raise Applitools::EyesIllegalArgument.new(
-          "Pasiing extra keys is prohibited! Passed extra keys: #{extra_keys}"
-        )
-      end
-      result = default_match_settings.merge!(value)
-      self.match_level = result[:match_level]
-      self.exact = result[:exact]
-      self.server_scale = result[:scale]
-      self.server_remainder = result[:remainder]
-      result
-    end
-
-    def default_match_settings
-      {
-        match_level: match_level,
-        exact: exact,
-        scale: server_scale,
-        remainder: server_remainder
-      }
-    end
+    # def default_match_settings=(value)
+    #   Applitools::ArgumentGuard.is_a? value, 'value', Hash
+    #   extra_keys = value.keys - match_level_keys
+    #   unless extra_keys.empty?
+    #     raise Applitools::EyesIllegalArgument.new(
+    #       "Pasiing extra keys is prohibited! Passed extra keys: #{extra_keys}"
+    #     )
+    #   end
+    #   result = default_match_settings.merge!(value)
+    #   (self.match_level, self.exact) = match_level_with_exact(result[:match_level], result[:exact])
+    #   self.server_scale = result[:scale]
+    #   self.server_remainder = result[:remainder]
+    #   result
+    # end
+    #
+    # def default_match_settings
+    #   {
+    #     match_level: match_level,
+    #     exact: exact,
+    #     scale: server_scale,
+    #     remainder: server_remainder
+    #   }
+    # end
 
     def full_agent_id
       if !agent_id.nil? && !agent_id.empty?
@@ -519,9 +510,9 @@ module Applitools
       {}
     end
 
-    def match_level_keys
-      %w(match_level exact scale remainder).map(&:to_sym)
-    end
+    # def match_level_keys
+    #   %w(match_level exact scale remainder).map(&:to_sym)
+    # end
 
     def update_default_settings(match_data)
       match_level_keys.each do |k|

data/lib/applitools/core/eyes_base_configuration.rb

@@ -2,16 +2,23 @@ require 'applitools/core/rectangle_size'
 require 'applitools/core/session_types'
 require 'applitools/core/batch_info'
 require 'applitools/connectivity/proxy'
+require 'applitools/core/match_level'
+require 'applitools/core/match_level_setter'
 
 module Applitools
   class EyesBaseConfiguration < AbstractConfiguration
+    include Applitools::MatchLevelSetter
+
     DEFAULT_CONFIG = {
       branch_name: ENV['APPLITOOLS_BRANCH'] || '',
       parent_branch_name: ENV['APPLITOOLS_PARENT_BRANCH'] || '',
       baseline_branch_name: ENV['APPLITOOLS_BASELINE_BRANCH'] || '',
       save_diffs: false,
       server_url: 'https://eyessdk.applitools.com',
-      api_key: ENV['APPLITOOLS_API_KEY'] || ''
+      api_key: ENV['APPLITOOLS_API_KEY'] || '',
+      match_level: Applitools::MatchLevel::STRICT,
+      scale: 0,
+      remainder: 0
     }.freeze
 
     class << self
@@ -94,6 +101,10 @@ module Applitools
     string_field :host_app
     object_field :proxy, Applitools::Connectivity::Proxy
     string_field :match_level
+    object_field :exact, Hash
+    int_field :scale
+    int_field :remainder
+
 
     methods_to_delegate.delete(:batch_info)
     methods_to_delegate.delete(:batch_info=)
@@ -107,11 +118,46 @@ module Applitools
     end
 
     def match_level=(value)
-      return config_hash[:match_level] = value if Applitools::MATCH_LEVEL.values.include?(value)
+      return config_hash[:match_level] = value if Applitools::MatchLevel.enum_values.include?(value)
       return config_hash[:match_level] = Applitools::MATCH_LEVEL[value.to_sym] if Applitools::MATCH_LEVEL.keys.include?(value.to_sym)
       raise Applitools::EyesError, "Unknown match level #{value}"
     end
 
+    def set_default_match_settings(value, exact_options = {})
+      (self.match_level, self.exact) = match_level_with_exact(value, exact_options)
+    end
+
+    def default_match_settings=(value)
+      Applitools::ArgumentGuard.is_a? value, 'value', Hash
+      extra_keys = value.keys - match_level_keys
+      unless extra_keys.empty?
+        raise Applitools::EyesIllegalArgument.new(
+            "Pasiing extra keys is prohibited! Passed extra keys: #{extra_keys}"
+        )
+      end
+      result = default_match_settings.merge!(value)
+      (self.match_level, self.exact) = match_level_with_exact(result[:match_level], result[:exact])
+      self.scale = result[:scale]
+      self.remainder = result[:remainder]
+      result
+    end
+
+    def default_match_settings
+      {
+        match_level: match_level,
+        exact: exact,
+        scale: scale,
+        remainder: remainder
+      }
+    end
+
+    def match_level_keys
+      %w(match_level exact scale remainder).map(&:to_sym)
+    end
+
     methods_to_delegate.push(:set_proxy)
+    methods_to_delegate.push(:set_default_match_settings)
+    methods_to_delegate.push(:default_match_settings=)
+    methods_to_delegate.push(:default_match_settings)
   end
 end

data/lib/applitools/core/match_level.rb

@@ -0,0 +1,15 @@
+module Applitools
+  module MatchLevel
+    extend self
+    NONE = 'None'.freeze
+    LAYOUT = 'Layout'.freeze
+    LAYOUT2 = 'Layout2'.freeze
+    CONTENT = 'Content'.freeze
+    STRICT = 'Strict'.freeze
+    EXACT = 'Exact'.freeze
+
+    def enum_values
+      [NONE, LAYOUT, LAYOUT2, CONTENT, STRICT, EXACT]
+    end
+  end
+end

data/lib/applitools/core/match_level_setter.rb

@@ -2,13 +2,19 @@
 
 module Applitools::MatchLevelSetter
   def match_level_with_exact(value, exact_options = {})
-    raise Applitools::EyesError unless Applitools::MATCH_LEVEL.keys.include? value
-    if value != :exact && (exact_options && !exact_options.empty?)
+    raise Applitools::EyesError unless Applitools::MATCH_LEVEL.keys.include?(value) | Applitools::MatchLevel.enum_values.include?(value)
+
+    if value != :exact && value != Applitools::MatchLevel::EXACT && (exact_options && !exact_options.empty?)
       raise Applitools::EyesError.new(
         'Exact options are accepted only for EXACT match level'
       )
     end
-    [Applitools::MATCH_LEVEL[value], value == :exact ? convert_exact_options(exact_options) : nil]
+    match_level_value = if (Applitools::MatchLevel.enum_values.include?(value))
+                          value
+                        else
+                          Applitools::MATCH_LEVEL[value]
+                        end
+    [match_level_value, value == Applitools::MatchLevel::EXACT ? convert_exact_options(exact_options) : nil]
   end
 
   private

data/lib/applitools/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: false
 
 module Applitools
-  VERSION = '3.15.20'.freeze
+  VERSION = '3.15.21'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eyes_core
 version: !ruby/object:Gem::Version
-  version: 3.15.20
+  version: 3.15.21
 platform: ruby
 authors:
 - Applitools Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-05 00:00:00.000000000 Z
+date: 2019-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oily_png
@@ -279,6 +279,7 @@ files:
 - lib/applitools/core/helpers.rb
 - lib/applitools/core/jsonable.rb
 - lib/applitools/core/location.rb
+- lib/applitools/core/match_level.rb
 - lib/applitools/core/match_level_setter.rb
 - lib/applitools/core/match_result.rb
 - lib/applitools/core/match_results.rb