eyes_core 3.2.1 → 3.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c88e7c7471138c545eb26cd0d3071f2dbf913b96
-  data.tar.gz: af7acdaacc4fdad1954e0c7882d4d548bf1ef4b2
+  metadata.gz: 64f8c3db87db9835c4dc79c765959e83c8aeb946
+  data.tar.gz: 7d727cecee7d09a6a9fe4f835bcbb4adab06c5f4
 SHA512:
-  metadata.gz: 462827e9166de30c60354313015f28172b4d7010320ebbe069a8a707634f661002658369c5d7cbf8f8383e10d77434373279c2eb98ee52e77a8037791a481c9d
-  data.tar.gz: b2faaa4260c1f8fbda48e70a91b4bb94b369f8eda013de55c1d1549665ebbef7ff888f53bf29b41e390cd2a5d95c8050de5d2b038edc5d2b2c9feab82b86e04a
+  metadata.gz: '018bbc1ef29fa85b6bf41e4265926372dc04cfb27bc1afcdd71655ce495c2707736f713ceffe774b670282e1b1551c10e54d879eb5a6776e526d881590b8a69c'
+  data.tar.gz: 46a71295b6d39855ee931165c4eb804dcee4c5d8c0032ff6c1344c2f5e7ceea8c5dffd6be95b748171d347b1a20689e0c0cc5233f0ceb992f259c57d65436ad5

data/lib/applitools/connectivity/proxy.rb

@@ -1,3 +1,19 @@
 module Applitools::Connectivity
-  Proxy = Struct.new(:uri, :user, :password)
+  Proxy = Struct.new(:uri, :user, :password) do
+    def to_hash
+      result = {}
+      result[:uri] = uri.is_a?(URI) ? uri : URI(uri)
+      result[:user] = user unless user.nil?
+      result[:password] = password unless password.nil?
+      result
+    end
+
+    def uri=(value)
+      if value.is_a? URI
+        super
+      else
+        super URI.parse(value)
+      end
+    end
+  end
 end

data/lib/applitools/connectivity/server_connector.rb

@@ -22,7 +22,7 @@ module Applitools::Connectivity
 
     attr_accessor :server_url, :api_key
     attr_reader :endpoint_url
-    attr_accessor :proxy
+    attr_reader :proxy
 
     def server_url=(url)
       @server_url = url.nil? ? DEFAULT_SERVER_URL : url
@@ -37,6 +37,14 @@ module Applitools::Connectivity
       self.proxy = Proxy.new uri, user, password
     end
 
+    def proxy=(value)
+      unless value.nil? || value.is_a?(Applitools::Connectivity::Proxy)
+        raise Applitools::EyesIllegalArgument.new 'Expected value to be instance of Applitools::Connectivity::Proxy,' \
+          ' got #{value.class}'
+      end
+      @proxy = value
+    end
+
     def match_window(session, data)
       # Notice that this does not include the screenshot.
       json_data = Oj.dump(Applitools::Utils.camelcase_hash_keys(data.to_hash)).force_encoding('BINARY')
@@ -86,7 +94,11 @@ module Applitools::Connectivity
     end
 
     def request(url, method, options = {})
-      Faraday::Connection.new(url, ssl: { ca_file: SSL_CERT }, proxy: @proxy || nil).send(method) do |req|
+      Faraday::Connection.new(
+        url,
+        ssl: { ca_file: SSL_CERT },
+        proxy: @proxy.nil? ? nil : @proxy.to_hash
+      ).send(method) do |req|
         req.options.timeout = DEFAULT_TIMEOUT
         req.headers = DEFAULT_HEADERS.merge(options[:headers] || {})
         req.headers['Content-Type'] = options[:content_type] if options.key?(:content_type)

data/lib/applitools/core/batch_info.rb

@@ -1,6 +1,7 @@
 require 'securerandom'
 module Applitools
   class BatchInfo
+    attr_accessor :name, :sterted_at, :id
     def initialize(name = nil, started_at = Time.now)
       @name = name
       @started_at = started_at
@@ -14,5 +15,9 @@ module Applitools
         started_at: @started_at.iso8601
       }
     end
+
+    def to_s
+      to_hash.to_s
+    end
   end
 end

data/lib/applitools/core/eyes_base.rb

@@ -32,9 +32,10 @@ module Applitools
 
     attr_accessor :app_name, :baseline_name, :branch_name, :parent_branch_name, :batch, :agent_id, :full_agent_id,
       :match_timeout, :save_new_tests, :save_failed_tests, :failure_reports, :default_match_settings, :cut_provider,
-      :scale_ratio, :host_os, :host_app, :base_line_name, :position_provider, :viewport_size, :verbose_results
+      :scale_ratio, :host_os, :host_app, :base_line_name, :position_provider, :viewport_size, :verbose_results,
+      :inferred_environment
 
-    abstract_attr_accessor :base_agent_id, :inferred_environment
+    abstract_attr_accessor :base_agent_id
     abstract_method :capture_screenshot, true
     abstract_method :title, true
     abstract_method :set_viewport_size, true
@@ -53,6 +54,7 @@ module Applitools
       @user_inputs = UserInputArray.new
       self.app_output_provider = Object.new
       self.verbose_results = false
+      @inferred_environment = nil
 
       get_app_output_method = ->(r, s) { get_app_output_with_screenshot r, s }
 
@@ -65,6 +67,14 @@ module Applitools
       @default_match_settings = { match_level: MATCH_LEVEL[:strict], exact: nil }
     end
 
+    def batch
+      if @batch.nil?
+        logger.info 'No batch set'
+        self.batch = BatchInfo.new
+      end
+      @batch
+    end
+
     def full_agent_id
       if !agent_id.nil? && !agent_id.empty?
         "#{agent_id} [#{base_agent_id}]"
@@ -396,13 +406,8 @@ module Applitools
         self.viewport_size = get_viewport_size
       end
 
-      if batch.nil?
-        logger.info 'No batch set'
-        test_batch = BatchInfo.new
-      else
-        logger.info "Batch is #{batch}"
-        test_batch = batch
-      end
+      logger.info "Batch is #{batch}"
+      test_batch = batch
 
       app_env = app_environment
 

data/lib/applitools/version.rb

@@ -1,3 +1,3 @@
 module Applitools
-  VERSION = '3.2.1'.freeze
+  VERSION = '3.2.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eyes_core
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.2.2
 platform: ruby
 authors:
 - Applitools Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-13 00:00:00.000000000 Z
+date: 2017-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oily_png