eyes_core 3.15.2.beta → 3.15.3.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 837d63c899d50ca985e2607ae9ef2f74e9aaff06db5efcdf9e03b5c7f30dbedb
-  data.tar.gz: a1bd7821a06516b85b4ac745bff18c0beb26bb1088e4372b07b4298ab570c23e
+  metadata.gz: 6b771819a8907868bd80497e70a6bd10e60f7adb482f180c9de3968890883d96
+  data.tar.gz: da648cc4122596dfd58efc24e3699f94b54a9aff5ea9eaae4027801ee9efc520
 SHA512:
-  metadata.gz: 396c179c201f8929266cb290fde60ac1b03ce5499d6740eeb373ab115acf75c36284e04d931c97495a7a00410004e06a6d759760e85a4432417d88d5da21f176
-  data.tar.gz: c2e08021ab270424fc88bf63359664878e6bb1444794db58e11111e758b9b43d353ac53eb5d44dbb8cbee0d631667759bf9a3264e944c84cb097f3865db7b710
+  metadata.gz: bc92c6029cdd54ed6d15a2ba41c6f0951d3687add39d3eb9526c4d9ce0c2362b7c3679a541a751695046ab6fa9fa6fd5d585c11a06cbc7b26e9c1faff82af8b4
+  data.tar.gz: 0d90a2e75842ef1c1e9dca07bb7058c65d19bbeb209c2bc1f6fb69f010b3fbc930d92e12d58c0862ef8457a24bdf5e1f928bfa501eb18c833fccf4ee08e190d2

data/lib/applitools/connectivity/server_connector.rb

@@ -41,7 +41,7 @@ module Applitools::Connectivity
 
     def rendering_info
       response = get(server_url + RENDER_INFO_PATH, content_type: 'application/json')
-      raise Applitools::EyesError, 'Error getting render info' unless response.status == HTTP_STATUS_CODES[:ok]
+      raise Applitools::EyesError, "Error getting render info (#{response.status}})" unless response.status == HTTP_STATUS_CODES[:ok]
       Oj.load response.body
     end
 

data/lib/applitools/core/abstract_configuration.rb

@@ -1,8 +1,10 @@
+require 'applitools/core/eyes_configuration_dsl'
+
 module Applitools
   class AbstractConfiguration
     attr_reader :config_hash
     attr_accessor :validation_errors
-    extend Applitools::Concerns::EyesConfigurationDSL
+    extend Applitools::EyesConfigurationDSL
 
     def initialize
       @config_hash = {}

data/lib/applitools/core/eyes_base_configuration.rb

@@ -1,5 +1,5 @@
 require 'applitools/core/rectangle_size'
-require 'applitools/core/concerns/session_types'
+require 'applitools/core/session_types'
 require 'applitools/core/batch_info'
 
 module Applitools
@@ -60,7 +60,7 @@ module Applitools
     string_field :agent_id
     string_field :environment_name
     boolean_field :save_diffs
-    enum_field :session_type, Applitools::Concerns::SessionTypes.enum_values
+    enum_field :session_type, Applitools::SessionTypes.enum_values
     object_field :batch_info, Applitools::BatchInfo
     string_field :baseline_env_name
     string_field :app_name

data/lib/applitools/core/eyes_configuration_dsl.rb

@@ -0,0 +1,158 @@
+module Applitools
+  module EyesConfigurationDSL
+    def methods_to_delegate
+      @methods_to_delegate ||= []
+    end
+
+    def accessor_methods
+      @accessor_methods ||= []
+    end
+
+    def collect_method(field_name)
+      accessor_methods.push field_name.to_sym
+      methods_to_delegate.push field_name.to_sym
+      methods_to_delegate.push "#{field_name}=".to_sym
+    end
+
+    def boolean_field(field_name)
+      collect_method field_name
+      define_method(field_name) do
+        return true if config_hash[field_name]
+        false
+      end
+
+      define_method("#{field_name}=") do |*args|
+        value = args.shift
+        if value
+          config_hash[field_name] = true
+        else
+          config_hash[field_name] = false
+        end
+      end
+
+      define_method("defined_#{field_name}?") do
+        true
+      end
+    end
+
+    def string_field(field_name)
+      collect_method field_name
+      define_method(field_name) do
+        return '' unless config_hash[field_name.to_sym].is_a? String
+        config_hash[field_name.to_sym]
+      end
+
+      define_method("#{field_name}=") do |*args|
+        value = args.shift
+        raise Applitools::EyesIllegalArgument, "Expected #{field_name} to be a String but got #{value.class} instead" unless value.is_a? String
+        config_hash[field_name.to_sym] = value.freeze
+      end
+
+      define_method("defined_#{field_name}?") do
+        !send(field_name).empty?
+      end
+    end
+
+    # def rectangle_size_field(field_name)
+    #   collect_method field_name
+    #   define_method(field_name) do
+    #     return Applitools::RectangleSize.from_hash(width: 0, height: 0) unless config_hash[field_name.to_sym].is_a? Applitools::RectangleSize
+    #     config_hash[field_name.to_sym]
+    #   end
+    #
+    #   define_method("#{field_name}=") do |*args|
+    #     value = args.shift
+    #     raise Applitools::EyesIllegalArgument, "Expected #{field_name} to be an Applitools::RectangleClass but got #{value.class} instead" unless value.is_a? Applitools::RectangleSize
+    #     config_hash[field_name.to_sym] = value
+    #   end
+    #
+    #   define_method("defined_#{field_name}?") do
+    #     send(field_name).square > 0
+    #   end
+    # end
+
+    # def batch_info_field(field_name)
+    #   collect_method field_name
+    #   define_method(field_name) do
+    #     config_hash[field_name.to_sym]
+    #   end
+    #
+    #   define_method("#{field_name}=") do |*args|
+    #     value = args.shift
+    #     raise(
+    #       Applitools::EyesIllegalArgument,
+    #       "Expected Applitools::BatchInfo but got #{value.class}"
+    #     ) unless value.is_a? Applitools::BatchInfo
+    #     config_hash[field_name.to_sym] = value
+    #   end
+    #
+    #   define_method("defined_#{field_name}?") do
+    #     value = send(field_name)
+    #     value.is_a? Applitools::BatchInfo
+    #   end
+    # end
+
+    def object_field(field_name, klass)
+      collect_method field_name
+      define_method(field_name) do
+        config_hash[field_name.to_sym]
+      end
+      define_method("#{field_name}=") do |*args|
+        value = args.shift
+        raise(
+            Applitools::EyesIllegalArgument,
+            "Expected #{klass} but got #{value.class}"
+        ) unless value.is_a? klass
+        config_hash[field_name.to_sym] = value
+      end
+      define_method("defined_#{field_name}?") do
+        value = send(field_name)
+        value.is_a? klass
+      end
+    end
+
+    def int_field(field_name)
+      collect_method(field_name)
+      define_method(field_name) do
+        config_hash[field_name.to_sym]
+        # value =
+        # return value if value.is_a? Integer
+        # 0
+      end
+
+      define_method("#{field_name}=") do |*args|
+        value = args.shift
+        return config_hash[field_name.to_sym] = value if value.is_a? Integer
+        return config_hash[field_name.to_sym] = value.to_i if value.respond_to? :to_i
+        raise Applitools::EyesIllegalArgument, "Expected #{field_name} to be an Integer"
+      end
+
+      define_method("defined_#{field_name}?") do
+        value = send(field_name)
+        value.is_a? Integer
+      end
+    end
+
+    def enum_field(field_name, available_values_array)
+      collect_method(field_name)
+
+      define_method(field_name) do
+        config_hash[field_name.to_sym]
+      end
+
+      define_method("#{field_name}=") do |*args|
+        value = args.shift
+        raise(
+            Applitools::EyesIllegalArgument,
+            "Unknown #{field_name} #{value}. Allowed session types: " \
+            "#{available_values_array.join(', ')}"
+        ) unless available_values_array.include? value
+        config_hash[field_name.to_sym] = value
+      end
+
+      define_method("defined_#{field_name}?") do
+        available_values_array.include? send(field_name)
+      end
+    end
+  end
+end

data/lib/applitools/core/session_types.rb

@@ -0,0 +1,11 @@
+module Applitools
+  module SessionTypes
+    extend self
+    SEQUENTIAL = 'SEQUENTIAL'
+    PROGRESSION = 'PROGRESSION'
+
+    def enum_values
+      [SEQUENTIAL, PROGRESSION]
+    end
+  end
+end

data/lib/applitools/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: false
 
 module Applitools
-  VERSION = '3.15.2.beta'.freeze
+  VERSION = '3.15.3.beta'.freeze
 end

data/lib/eyes_core.rb

@@ -64,7 +64,6 @@ require_relative 'applitools/extensions'
 require_relative 'applitools/version'
 require_relative 'applitools/chunky_png_patch'
 
-Applitools.require_dir 'core/concerns'
 Applitools.require_dir 'core'
 Applitools.require_dir 'connectivity'
 Applitools.require_dir 'utils'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eyes_core
 version: !ruby/object:Gem::Version
-  version: 3.15.2.beta
+  version: 3.15.3.beta
 platform: ruby
 authors:
 - Applitools Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-31 00:00:00.000000000 Z
+date: 2019-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oily_png
@@ -265,12 +265,10 @@ files:
 - lib/applitools/core/argument_guard.rb
 - lib/applitools/core/batch_info.rb
 - lib/applitools/core/class_name.rb
-- lib/applitools/core/concerns/eyes_configuration_dsl.rb
-- lib/applitools/core/concerns/jsonable.rb
-- lib/applitools/core/concerns/session_types.rb
 - lib/applitools/core/debug_screenshot_provider.rb
 - lib/applitools/core/eyes_base.rb
 - lib/applitools/core/eyes_base_configuration.rb
+- lib/applitools/core/eyes_configuration_dsl.rb
 - lib/applitools/core/eyes_screenshot.rb
 - lib/applitools/core/fixed_cut_provider.rb
 - lib/applitools/core/fixed_scale_provider.rb
@@ -279,6 +277,7 @@ files:
 - lib/applitools/core/future.rb
 - lib/applitools/core/hash_extension.rb
 - lib/applitools/core/helpers.rb
+- lib/applitools/core/jsonable.rb
 - lib/applitools/core/location.rb
 - lib/applitools/core/match_level_setter.rb
 - lib/applitools/core/match_result.rb
@@ -295,6 +294,7 @@ files:
 - lib/applitools/core/screenshot.rb
 - lib/applitools/core/session.rb
 - lib/applitools/core/session_start_info.rb
+- lib/applitools/core/session_types.rb
 - lib/applitools/core/test_results.rb
 - lib/applitools/core/text_trigger.rb
 - lib/applitools/core/trigger.rb

data/lib/applitools/core/concerns/eyes_configuration_dsl.rb

@@ -1,189 +0,0 @@
-module Applitools
-  module Concerns
-    module EyesConfigurationDSL
-      def methods_to_delegate
-        @methods_to_delegate ||= []
-      end
-
-      def accessor_methods
-        @accessor_methods ||= []
-      end
-
-      def collect_method(field_name)
-        accessor_methods.push field_name.to_sym
-        methods_to_delegate.push field_name.to_sym
-        methods_to_delegate.push "#{field_name}=".to_sym
-      end
-
-      def boolean_field(field_name)
-        collect_method field_name
-        define_method(field_name) do
-          return true if config_hash[field_name]
-          false
-        end
-
-        define_method("#{field_name}=") do |*args|
-          value = args.shift
-          if value
-            config_hash[field_name] = true
-          else
-            config_hash[field_name] = false
-          end
-        end
-
-        define_method("defined_#{field_name}?") do
-          true
-        end
-      end
-
-      def string_field(field_name)
-        collect_method field_name
-        define_method(field_name) do
-          return '' unless config_hash[field_name.to_sym].is_a? String
-          config_hash[field_name.to_sym]
-        end
-
-        define_method("#{field_name}=") do |*args|
-          value = args.shift
-          raise Applitools::EyesIllegalArgument, "Expected #{field_name} to be a String but got #{value.class} instead" unless value.is_a? String
-          config_hash[field_name.to_sym] = value.freeze
-        end
-
-        define_method("defined_#{field_name}?") do
-          !send(field_name).empty?
-        end
-      end
-
-      # def rectangle_size_field(field_name)
-      #   collect_method field_name
-      #   define_method(field_name) do
-      #     return Applitools::RectangleSize.from_hash(width: 0, height: 0) unless config_hash[field_name.to_sym].is_a? Applitools::RectangleSize
-      #     config_hash[field_name.to_sym]
-      #   end
-      #
-      #   define_method("#{field_name}=") do |*args|
-      #     value = args.shift
-      #     raise Applitools::EyesIllegalArgument, "Expected #{field_name} to be an Applitools::RectangleClass but got #{value.class} instead" unless value.is_a? Applitools::RectangleSize
-      #     config_hash[field_name.to_sym] = value
-      #   end
-      #
-      #   define_method("defined_#{field_name}?") do
-      #     send(field_name).square > 0
-      #   end
-      # end
-
-      # def batch_info_field(field_name)
-      #   collect_method field_name
-      #   define_method(field_name) do
-      #     config_hash[field_name.to_sym]
-      #   end
-      #
-      #   define_method("#{field_name}=") do |*args|
-      #     value = args.shift
-      #     raise(
-      #       Applitools::EyesIllegalArgument,
-      #       "Expected Applitools::BatchInfo but got #{value.class}"
-      #     ) unless value.is_a? Applitools::BatchInfo
-      #     config_hash[field_name.to_sym] = value
-      #   end
-      #
-      #   define_method("defined_#{field_name}?") do
-      #     value = send(field_name)
-      #     value.is_a? Applitools::BatchInfo
-      #   end
-      # end
-
-      def object_field(field_name, klass)
-        collect_method field_name
-        define_method(field_name) do
-          config_hash[field_name.to_sym]
-        end
-        define_method("#{field_name}=") do |*args|
-          value = args.shift
-          raise(
-              Applitools::EyesIllegalArgument,
-              "Expected #{klass} but got #{value.class}"
-          ) unless value.is_a? klass
-          config_hash[field_name.to_sym] = value
-        end
-        define_method("defined_#{field_name}?") do
-          value = send(field_name)
-          value.is_a? klass
-        end
-      end
-
-      def int_field(field_name)
-        collect_method(field_name)
-        define_method(field_name) do
-          config_hash[field_name.to_sym]
-          # value =
-          # return value if value.is_a? Integer
-          # 0
-        end
-
-        define_method("#{field_name}=") do |*args|
-          value = args.shift
-          return config_hash[field_name.to_sym] = value if value.is_a? Integer
-          return config_hash[field_name.to_sym] = value.to_i if value.respond_to? :to_i
-          raise Applitools::EyesIllegalArgument, "Expected #{field_name} to be an Integer"
-        end
-
-        define_method("defined_#{field_name}?") do
-          value = send(field_name)
-          value.is_a? Integer
-        end
-      end
-
-      def enum_field(field_name, available_values_array)
-        collect_method(field_name)
-
-        define_method(field_name) do
-          config_hash[field_name.to_sym]
-        end
-
-        define_method("#{field_name}=") do |*args|
-          value = args.shift
-          raise(
-              Applitools::EyesIllegalArgument,
-              "Unknown #{field_name} #{value}. Allowed session types: " \
-              "#{available_values_array.join(', ')}"
-          ) unless available_values_array.include? value
-          config_hash[field_name.to_sym] = value
-        end
-
-        define_method("defined_#{field_name}?") do
-          available_values_array.include? send(field_name)
-        end
-      end
-
-      # def stitch_mode_field(field_name)
-      #   collect_method field_name
-      #   define_method(field_name) do
-      #     config_hash[field_name.to_sym]
-      #   end
-      #
-      #   define_method("#{field_name}=") do |*args|
-      #     value = args.shift
-      #     raise(
-      #         Applitools::EyesIllegalArgument,
-      #         "Unknown stitch mode #{value}. Allowed session types: " \
-      #         "#{Applitools::Selenium::Concerns::StitchModes::CSS}, " \
-      #         "#{Applitools::Selenium::Concerns::StitchModes::SCROLL}"
-      #     ) unless
-      #         [
-      #             Applitools::Selenium::Concerns::StitchModes::CSS,
-      #             Applitools::Selenium::Concerns::StitchModes::SCROLL
-      #         ].include? value
-      #     config_hash[field_name.to_sym] = value
-      #   end
-      #
-      #   define_method("defined_#{field_name}?") do
-      #     [
-      #         Applitools::Concerns::SessionTypes::SEQUENTIAL,
-      #         Applitools::Concerns::SessionTypes::PROGRESSION
-      #     ].include? config_hash[field_name.to_sym]
-      #   end
-      # end
-    end
-  end
-end

data/lib/applitools/core/concerns/session_types.rb

@@ -1,13 +0,0 @@
-module Applitools
-  module Concerns
-    module SessionTypes
-      extend self
-      SEQUENTIAL = 'SEQUENTIAL'
-      PROGRESSION = 'PROGRESSION'
-
-      def enum_values
-        [SEQUENTIAL, PROGRESSION]
-      end
-    end
-  end
-end