eyes_core 3.0.8 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 734dda49eb71281c85770bc8e075346b303417f8
-  data.tar.gz: '08dfc01e914c3c9d42958d018dba34a8a3305060'
+  metadata.gz: a6bfdf93e062d2d12f52900e4e161d86064443a4
+  data.tar.gz: 49420a387dc5327c6cd31a5f814e4e1e29f90948
 SHA512:
-  metadata.gz: 3365239f1bf1f1843936585a9c25bc7c2804d5ee72ff3928e32e242d0cff34447af492545298a1c13f0e819668016eb4ea5730cec7b6dd1a5f46575e8c6c9195
-  data.tar.gz: 5292266eaf979ff3caad6b05cb937fa64e9eb25f0e67378625f26ca4450da4460563615c5601564468ddfff0c5767f98602b6dd827293bc418448e0bfa8de1e5
+  metadata.gz: 4a3d745e90548ce9c1d9d73471a369e6c2d3eda0fa4dbabf2bfe50159180e3081248f707f15db8d3f488bf80a6a51920e3ed605ea6138b2e39cdc345e18d10f4
+  data.tar.gz: 47fdcf476ad6fa1894e70a303b5c8793c6207688e8b9749f9058818761d3277a92ea907f129430f7ac5edbed74bcd62002753ce586caf33a4ce6b844ec45f8eb

data/ext/eyes_core/eyes_core.c

@@ -124,7 +124,7 @@ VALUE raw_merge_pixels(VALUE merge_pixels[], unsigned int size) {
 }
 
 VALUE c_bicubic_points(VALUE self, VALUE src_dimension, VALUE dst_dimension, VALUE direction) {
-  unsigned long y_bounds, pixels_size, c_src_dimension, c_dst_dimension, index, index_y;
+  unsigned long y_bounds, pixels_size, c_src_dimension, c_dst_dimension, index, index_y, i, y, x;
   double step;
   VALUE result_array;
 
@@ -146,16 +146,16 @@ VALUE c_bicubic_points(VALUE self, VALUE src_dimension, VALUE dst_dimension, VAL
   pixels_size = y_bounds * c_dst_dimension;
   result_array = rb_ary_new2(pixels_size);
 
-  for (unsigned long i=0; i < c_dst_dimension; i++) {
+  for (i = 0; i < c_dst_dimension; i++) {
     steps[i] = (unsigned long)i*step;
     residues[i] = i*step - steps[i];
   };
 
-  for (unsigned long y=0; y < y_bounds; y++) {
+  for (y = 0; y < y_bounds; y++) {
     line_bounds = rb_funcall(self, rb_intern("line_with_bounds"), 3, UINT2NUM(y), src_dimension, direction);
 
     index_y = c_dst_dimension * y;
-    for (unsigned long x=0; x < c_dst_dimension; x++) {
+    for (x = 0; x < c_dst_dimension; x++) {
       if (RTEST(direction)) {
         index = y_bounds * x + y;
       } else {
@@ -174,8 +174,8 @@ VALUE c_bicubic_points(VALUE self, VALUE src_dimension, VALUE dst_dimension, VAL
 }
 
 VALUE scale_points2(VALUE self, VALUE dst_width, VALUE dst_height, VALUE w_m, VALUE h_m) {
-  unsigned long c_dst_height, c_dst_width, y_pos, x_pos, index;
-  unsigned int c_w_m, c_h_m, buffer_index, buffer_size;
+  unsigned long c_dst_height, c_dst_width, y_pos, x_pos, index, i, j;
+  unsigned int c_w_m, c_h_m, buffer_index, buffer_size, x, y;
   VALUE pixels_to_merge [NUM2UINT(w_m) * NUM2UINT(h_m)];
   VALUE result;
 
@@ -188,12 +188,12 @@ VALUE scale_points2(VALUE self, VALUE dst_width, VALUE dst_height, VALUE w_m, VA
   result = rb_ary_new2(c_dst_width * c_dst_height);
   buffer_size = c_h_m * c_w_m;
 
-  for (unsigned long i = 0; i < c_dst_height; i++) {
-    for (unsigned long j = 0; j < c_dst_width; j++) {
+  for (i = 0; i < c_dst_height; i++) {
+    for (j = 0; j < c_dst_width; j++) {
       buffer_index = 0;
-      for (unsigned int y = 0; y < c_h_m; y++) {
+      for (y = 0; y < c_h_m; y++) {
         y_pos = i * c_h_m + y;
-        for (unsigned int x = 0; x < c_w_m; x++) {
+        for (x = 0; x < c_w_m; x++) {
           x_pos = j * c_w_m + x;
           pixels_to_merge[buffer_index++] = rb_funcall(self, rb_intern("get_pixel"), 2, UINT2NUM(x_pos), UINT2NUM(y_pos));
         }

data/lib/applitools/chunky_png/resampling.rb

@@ -1,3 +1,15 @@
+module Applitools
+  class Enumerator < ::Enumerator
+    if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.0.0')
+      attr_reader :size
+      def initialize(*args)
+        @size = args[0] if args.size == 1
+        super()
+      end
+    end
+  end
+end
+
 module Applitools::ChunkyPNG
   module Resampling
     def resample_bicubic!(dst_width, dst_height)
@@ -15,7 +27,7 @@ module Applitools::ChunkyPNG
 
       return self unless w_m * h_m > 1
 
-      pixels = scale_points2(dst_width, dst_height, w_m, h_m);
+      pixels = scale_points2(dst_width, dst_height, w_m, h_m)
       replace_canvas!(dst_width, dst_height, pixels)
     end
 
@@ -34,8 +46,8 @@ module Applitools::ChunkyPNG
     def line_with_bounds(y, src_dimension, direction)
       line = (direction ? column(y) : row(y))
       [imaginable_point(line[0], line[1])] + line + [
-          imaginable_point(line[src_dimension - 2], line[src_dimension - 3]),
-          imaginable_point(line[src_dimension - 1], line[src_dimension - 2])
+        imaginable_point(line[src_dimension - 2], line[src_dimension - 3]),
+        imaginable_point(line[src_dimension - 1], line[src_dimension - 2])
       ]
     end
 

data/lib/applitools/core/argument_guard.rb

@@ -31,5 +31,9 @@ module Applitools
       raise Applitools::EyesIllegalArgument.new "Expected #{param_name} to be" \
         " instance of #{klass}"
     end
+
+    def raise_argument_error(error)
+      raise Applitools::EyesIllegalArgument.new error
+    end
   end
 end

data/lib/applitools/core/eyes_base.rb

@@ -62,7 +62,7 @@ module Applitools
         end
       end
 
-      self.default_match_settings = MATCH_LEVEL[:exact]
+      @default_match_settings = { match_level: MATCH_LEVEL[:strict], exact: nil }
     end
 
     def full_agent_id
@@ -73,6 +73,14 @@ module Applitools
       end
     end
 
+    def match_level=(level)
+      @default_match_settings[:match_level] = level
+    end
+
+    def match_level
+      @default_match_settings[:match_level]
+    end
+
     def disabled=(value)
       @disabled = Applitools::Utils.boolean_value value
     end
@@ -283,8 +291,7 @@ module Applitools
     private
 
     attr_accessor :running_session, :last_screenshot, :current_app_name, :test_name, :session_type,
-      :scale_provider, :default_match_settings, :session_start_info,
-      :should_match_window_run_once_on_timeout, :app_output_provider
+      :scale_provider, :session_start_info, :should_match_window_run_once_on_timeout, :app_output_provider
 
     attr_reader :user_inputs
 
@@ -405,7 +412,6 @@ module Applitools
                                                 scenario_id_or_name: test_name, batch_info: test_batch,
                                                 env_name: baseline_name, environment: app_env,
                                                 default_match_settings: default_match_settings,
-                                                match_level: default_match_settings,
                                                 branch_name: branch_name, parent_branch_name: parent_branch_name
 
       logger.info 'Starting server session...'

data/lib/applitools/core/hash_extension.rb

@@ -0,0 +1,11 @@
+module Applitools::HashExtension
+  if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.0.0')
+    def struct_define_to_h_method
+      define_singleton_method :to_h do
+        result = {}
+        each_pair { |k, v| result[k] = v }
+        result
+      end
+    end
+  end
+end

data/lib/applitools/core/rectangle_size.rb

@@ -1,5 +1,7 @@
+require_relative 'hash_extension'
 module Applitools
   RectangleSize = Struct.new(:width, :height) do
+    include Applitools::HashExtension
     class << self
       def from_any_argument(value)
         return from_string(value) if value.is_a? String
@@ -25,6 +27,11 @@ module Applitools
       end
     end
 
+    def initialize(*args)
+      super
+      struct_define_to_h_method if respond_to? :struct_define_to_h_method
+    end
+
     def to_s
       "#{width}x#{height}"
     end
@@ -41,6 +48,8 @@ module Applitools
       self
     end
 
-    alias_method :to_hash, :to_h
+    def to_hash
+      to_h
+    end
   end
 end

data/lib/applitools/core/screenshot.rb

@@ -1,42 +1,32 @@
 module Applitools
   class Screenshot < Delegator
-    extend Forwardable
-    def_delegators :header, :width, :height
-
     class << self
       def from_region(region)
-        new ::ChunkyPNG::Image.new(region.width, region.height).to_blob
+        self::Image.new(::ChunkyPNG::Image.new(region.width, region.height))
       end
-    end
 
-    def initialize(image)
-      @datastream = ::ChunkyPNG::Datastream.from_string image
-    end
+      def from_datastream(datastream)
+        self::Datastream.new(datastream)
+      end
 
-    def update!(image)
-      Applitools::ArgumentGuard.not_nil(image, 'image')
-      Applitools::ArgumentGuard.is_a?(image, 'image', ::ChunkyPNG::Image)
-      @datastream = image.to_datastream
-      self
-    end
+      def from_image(image)
+        Image.new(image)
+      end
 
-    def to_blob
-      @datastream.to_blob
+      def from_any_image(image)
+        return from_region(image) if image.is_a? Applitools::Region
+        return from_image(image) if image.is_a? ::ChunkyPNG::Image
+        return image if image.is_a?(Image) | image.is_a?(Datastream)
+        from_datastream(image)
+      end
     end
 
-    def __getobj__
-      restore
+    def initialize(_image)
+      raise Applitools::EyesError.new 'Applitools::Screenshot is an abstract class!'
     end
 
-    alias image __getobj__
-
-    def header
-      @datastream.header_chunk
-    end
-
-    def __setobj__(obj)
-      @datastream = obj.to_datastream
-      self
+    def __getobj__
+      nil
     end
 
     def method_missing(method, *args, &block)
@@ -51,8 +41,74 @@ module Applitools
       super
     end
 
-    def restore
-      ::ChunkyPNG::Image.from_datastream @datastream
+    class Datastream < self
+      extend Forwardable
+      def_delegators :header, :width, :height
+      attr_reader :datastream
+
+      def initialize(image)
+        Applitools::ArgumentGuard.not_nil(image, 'image')
+        unless image.is_a?(String)
+          Applitools::ArgumentGuard.raise_argument_error(
+            "Expected image to be Datastream or String, but got #{image.class}"
+          )
+        end
+        @datastream = ::ChunkyPNG::Datastream.from_string image
+      end
+
+      def update!(image)
+        Applitools::ArgumentGuard.not_nil(image, 'image')
+        Applitools::ArgumentGuard.is_a?(image, 'image', ::ChunkyPNG::Image)
+        @datastream = image.to_datastream
+        self
+      end
+
+      def to_blob
+        @datastream.to_blob
+      end
+
+      def header
+        @datastream.header_chunk
+      end
+
+      def __getobj__
+        restore
+      end
+
+      alias image __getobj__
+
+      def __setobj__(obj)
+        @datastream = obj.to_datastream
+        self
+      end
+
+      def restore
+        ::ChunkyPNG::Image.from_datastream @datastream
+      end
+    end
+
+    class Image < self
+      attr_reader :image
+
+      def initialize(image)
+        Applitools::ArgumentGuard.not_nil(image, 'image')
+        Applitools::ArgumentGuard.is_a?(image, 'image', ::ChunkyPNG::Image)
+        @image = image
+      end
+
+      def update!(image)
+        Applitools::ArgumentGuard.not_nil(image, 'image')
+        Applitools::ArgumentGuard.is_a?(image, 'image', ::ChunkyPNG::Image)
+        @image = image
+      end
+
+      def __getobj__
+        @image
+      end
+
+      def __setobj__(obj)
+        @image = obj
+      end
     end
   end
 end

data/lib/applitools/core/session_start_info.rb

@@ -10,7 +10,7 @@ module Applitools
       @batch_info = options[:batch_info]
       @env_name = options[:env_name]
       @environment = options[:environment]
-      @match_level = options[:match_level]
+      @default_match_settings = options[:default_match_settings]
       @branch_name = options[:branch_name]
       @parent_branch_name = options[:parent_branch_name]
     end
@@ -24,7 +24,7 @@ module Applitools
         batch_info: @batch_info.to_hash,
         env_name: @env_name,
         environment: @environment.to_hash,
-        match_level: @match_level,
+        default_match_settings: @default_match_settings,
         branch_name: @branch_name,
         parent_branch_name: @parent_branch_name
       }

data/lib/applitools/core/test_results.rb

@@ -32,7 +32,7 @@ module Applitools
     def ==(other)
       if other.is_a? self.class
         result = true
-        %i(is_new url steps matches mismatches missing).each do |field|
+        %w(is_new url steps matches mismatches missing).each do |field|
           result &&= send(field) == other.send(field)
         end
         return result if result

data/lib/applitools/images/eyes.rb

@@ -186,15 +186,17 @@ module Applitools::Images
     alias set_viewport_size vp_size=
 
     def get_image_from_options(options)
-      if options[:image].nil? || !options[:image].is_a?(Applitools::Screenshot)
-        if !options[:image_path].nil? && !options[:image_path].empty?
-          image = Applitools::Screenshot.new ChunkyPNG::Datastream.from_file(options[:image_path]).to_s
-        elsif !options[:image_bytes].nil? && !options[:image_bytes].empty?
-          image = Applitools::Screenshot.new options[:image_bytes]
-        end
-      else
-        image = options[:image]
-      end
+      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!'
 

data/lib/applitools/images/eyes_images_screenshot.rb

@@ -84,8 +84,11 @@ module Applitools::Images
           " screenshot bounds #{bounds}"
       end
 
-      sub_screenshot_image = Applitools::Screenshot.new image.crop(sub_screen_region.left, sub_screen_region.top,
-        sub_screen_region.width, sub_screen_region.height).to_datastream.to_blob
+      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)
 

data/lib/applitools/version.rb

@@ -1,3 +1,3 @@
 module Applitools
-  VERSION = '3.0.8'.freeze
+  VERSION = '3.1.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eyes_core
 version: !ruby/object:Gem::Version
-  version: 3.0.8
+  version: 3.1.1
 platform: ruby
 authors:
 - Applitools Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-31 00:00:00.000000000 Z
+date: 2017-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oily_png
@@ -217,6 +217,7 @@ files:
 - lib/applitools/core/eyes_screenshot.rb
 - lib/applitools/core/fixed_cut_provider.rb
 - lib/applitools/core/fixed_scale_provider.rb
+- lib/applitools/core/hash_extension.rb
 - lib/applitools/core/helpers.rb
 - lib/applitools/core/location.rb
 - lib/applitools/core/match_result.rb