eyes_core 3.6.9 → 3.6.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4718e711226f2377be5c702dacc4649c522fd68a
-  data.tar.gz: 77928e6bdbd3581d89714f9bcc10f2a5b13f258c
+  metadata.gz: d15c919b0a3855dd876f5c97f1c663b4e26f7eb8
+  data.tar.gz: 65015d063f2996ce8704e88b6761b63c12297e8a
 SHA512:
-  metadata.gz: 09f163b46bac2faed9f9f6a0e1a0dc5122fd6c18745c56c4b1144f620232c049bd816fc840f4d0248057d2552120962f1cb42901eef0422a38eb8fc9c84a30ed
-  data.tar.gz: 81350a849282adcbe61224befa6649b97ba72cf2eb33b95e1dd6032a2c0b1b666cdc5ced6cea104672ad4ef6bee4abb0d6fc712d20ac921aab16b28adf2135ca
+  metadata.gz: c15f4b873889c51b17d02550f40e99905975ec228ab3b4a4d89de9e68f15499aa53b4e2942cb40f665a293e085788c7c8d5fbd4561bebc11f2d8f0a1afa42d74
+  data.tar.gz: 9208a20ae00ec92b16858cd44cffc4d6ec1abf4a7067f98759045087b71cc6d0cd4ace920fd056f574ee64b21b861a4fce26ce6440463fdcb36a5d922e511491

data/lib/applitools/connectivity/server_connector.rb

@@ -16,7 +16,9 @@ module Applitools::Connectivity
 
     HTTP_STATUS_CODES = {
       created: 201,
-      accepted: 202
+      accepted: 202,
+      ok: 200,
+      gone: 410
     }.freeze
 
     attr_accessor :server_url, :api_key
@@ -55,18 +57,34 @@ module Applitools::Connectivity
       body = [json_data.length].pack('L>') + json_data + data.screenshot
       Applitools::EyesLogger.debug 'Sending match data...'
       # Applitools::EyesLogger.debug json_data
-      res = post(URI.join(endpoint_url, session.id.to_s), content_type: 'application/octet-stream', body: body)
+      res = long_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?
       Applitools::MatchResult.new Oj.load(res.body)
     end
 
+    RETRY_DELAY = 0.5
+    RETRY_STEP_FACTOR = 1.5
+    RETRY_MAX_DELAY = 5
+
     def match_single_window(data)
       # Notice that this does not include the screenshot.
       json_data = Oj.dump(data.to_hash).force_encoding('BINARY')
       body = [json_data.length].pack('L>') + json_data + data.screenshot
       # Applitools::EyesLogger.debug json_data
-      Applitools::EyesLogger.debug 'Sending match data...'
-      res = post(@single_check_endpoint_url, content_type: 'application/octet-stream', body: body)
+      begin
+        Applitools::EyesLogger.debug 'Sending match data...'
+        res = long_post(@single_check_endpoint_url, content_type: 'application/octet-stream', body: body)
+      rescue Errno::EWOULDBLOCK,  Faraday::ConnectionFailed
+        @delays ||= request_delay(RETRY_DELAY, RETRY_STEP_FACTOR, RETRY_MAX_DELAY)
+        begin
+          sleep @delays.next
+        rescue StopIteration
+          raise Applitools::UnknownNetworkStackError.new('Unknown network stack error')
+        end
+        res = match_single_window(data)
+      ensure
+        @delays = nil
+      end
       raise Applitools::EyesError.new("Request failed: #{res.status} #{res.headers} #{res.body}") unless res.success?
       Applitools::TestResults.new Oj.load(res.body)
     end
@@ -104,8 +122,21 @@ module Applitools::Connectivity
         request(url, method, options)
       end
 
-      define_method "long_#{method}" do |url, options = {}|
-        long_request(url, method, options)
+      define_method "long_#{method}" do |url, options = {}, request_delay = LONG_REQUEST_DELAY|
+        long_request(url, method, request_delay, options)
+      end
+
+      private method, "long_#{method}"
+    end
+
+    def request_delay(first_delay, step_factor, max_delay)
+      Enumerator.new do |y|
+        delay = first_delay
+        loop do
+          y << delay
+          delay *= step_factor
+          break if delay > max_delay
+        end
       end
     end
 
@@ -123,22 +154,29 @@ module Applitools::Connectivity
       end
     end
 
-    def long_request(url, method, options = {})
-      delay = LONG_REQUEST_DELAY
-      (options[:headers] ||= {})['Eyes-Expect'] = '202-accepted'
-
-      loop do
-        # Date should be in RFC 1123 format.
-        options[:headers]['Eyes-Date'] = Time.now.utc.strftime('%a, %d %b %Y %H:%M:%S GMT')
-
-        res = request(url, method, options)
-        return res unless res.status == HTTP_STATUS_CODES[:accepted]
-
-        Applitools::EyesLogger.debug "Still running... retrying in #{delay}s"
-        sleep delay
-
+    def long_request(url, method, request_delay, options = {})
+      delay = request_delay
+      options = { headers: {
+        'Eyes-Expect' => '202+location',
+        'Eyes-Date' => Time.now.utc.strftime('%a, %d %b %Y %H:%M:%S GMT')
+      } }.merge! options
+      res = request(url, method, options)
+      return res if res.status == HTTP_STATUS_CODES[:ok]
+
+      if res.status == HTTP_STATUS_CODES[:accepted]
+        second_step_url = res.headers[:location]
         delay = [MAX_LONG_REQUEST_DELAY, (delay * LONG_REQUEST_DELAY_MULTIPLICATIVE_INCREASE_FACTOR).round].min
+        loop do
+          Applitools::EyesLogger.debug "Still running... retrying in #{delay}s"
+          sleep delay
+          res = request(second_step_url, :get)
+          break unless res.status == HTTP_STATUS_CODES[:ok]
+        end
       end
+
+      raise Applitools::EyesError.new('The server task has gone.') if res.status == HTTP_STATUS_CODES[:gone]
+      return request(second_step_url, :delete) if res.status == HTTP_STATUS_CODES[:created]
+      raise Applitools::EyesError.new('Unknown error processing long request')
     end
   end
 end

data/lib/applitools/core/fixed_scale_provider.rb

@@ -8,7 +8,7 @@ module Applitools
     end
 
     def scale_image(image)
-      Applitools::Utils::ImageUtils.scale!(image, scale_method, scale_ratio)
+      Applitools::Utils::ImageUtils.scale!(image, scale_ratio)
     end
   end
 end

data/lib/applitools/core/match_window_data.rb

@@ -154,9 +154,11 @@ module Applitools
     end
 
     def to_hash
-      raise Applitools::EyesError.new(
-        'You should convert coordinates for ignored_regions!'
-      ) if @need_convert_ignored_regions_coordinates
+      if @need_convert_ignored_regions_coordinates
+        raise Applitools::EyesError.new(
+          'You should convert coordinates for ignored_regions!'
+        )
+      end
       current_data.dup
     end
 

data/lib/applitools/version.rb

@@ -1,3 +1,3 @@
 module Applitools
-  VERSION = '3.6.9'.freeze
+  VERSION = '3.6.10'.freeze
 end

data/lib/eyes_core.rb

@@ -29,6 +29,8 @@ module Applitools
   class EyesNotOpenException < EyesError; end
   # @!visibility private
   class EyesCoordinateTypeConversionException < EyesError; end
+  # @!visibility private
+  class UnknownNetworkStackError < EyesError; end
 
   # @!visibility private
   class AbstractMethodCalled < EyesError

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eyes_core
 version: !ruby/object:Gem::Version
-  version: 3.6.9
+  version: 3.6.10
 platform: ruby
 authors:
 - Applitools Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-16 00:00:00.000000000 Z
+date: 2017-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oily_png