percy-client 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 927d2422558ddcdfc7ea1ba02f45a45657533a6c
-  data.tar.gz: 780462719756a3027f400015bdf6b2d548e605a2
+  metadata.gz: 2a5c1dde854ffd27a47f940f734f8019bb66a29f
+  data.tar.gz: a2f256f6513573642f3d49fd0671c94ee030d5d5
 SHA512:
-  metadata.gz: 0e639771570ab45a086fe5153d8b06b32f7b07ec963298eec85098b7e27d663d2466b48ea8b77ec08847687ca69ce54bdb5604c8fb311ca6bc652b5182010e74
-  data.tar.gz: 45bef59d37c95316520df8d3a8e74e154daf13ffb4f7683bfdf068060c57ee214972c536cebe0832d63516c232a2def18cd2ea63bab09bab030be45de46311b1
+  metadata.gz: ad9625e9cae5c9e261847159e2273af3057926737f94eabda14321788bf08e1b812ffe928004628f720e15df3dcf824c395776ed7624396e8d20ea4de68985d4
+  data.tar.gz: b0beeba5ecbc5d99f871149848425183d4a86aa4e748003c19b52a37d1e6b8299f9097b77efc8b01aec118d2294fafbf111ffc65e2781b268b60010d05a82e87

data/lib/percy/client.rb

@@ -15,10 +15,19 @@ module Percy
     include Percy::Client::Resources
 
     class Error < Exception; end
-    class ClientError < Error
-      attr_accessor :env
-      def initialize(env, *args)
-        @env = env
+    class TimeoutError < Error; end
+    class ConnectionFailed < Error; end
+    class HttpError < Error
+      attr_reader :status
+      attr_reader :method
+      attr_reader :url
+      attr_reader :body
+
+      def initialize(status, method, url, body, *args)
+        @status = status
+        @method = method
+        @url = url
+        @body = body
         super(*args)
       end
     end

data/lib/percy/client/connection.rb

@@ -9,7 +9,6 @@ module Percy
         def client
           @client ||= ::HTTPClient.new
           @client.cookie_manager = nil
-          # Turn off SSLv2 and SSLv3 to force TLS because CloudFlare smartly blocks SSLv2 and SSLv3.
           @client.ssl_config.options |= OpenSSL::SSL::OP_NO_SSLv2
           @client.ssl_config.options |= OpenSSL::SSL::OP_NO_SSLv3
           @client
@@ -21,12 +20,10 @@ module Percy
 
         def on_complete(env)
           case env[:status]
-          when 407
-            # Mimic the behavior that we get with proxy requests with HTTPS.
-            raise Faraday::Error::ConnectionFailed, %{407 "Proxy Authentication Required "}
           when CLIENT_ERROR_STATUS_RANGE
-            raise Percy::Client::ClientError.new(
-              env, "Got #{env.status} (#{env.method.upcase} #{env.url}):\n#{env.body}")
+            raise Percy::Client::HttpError.new(
+              env.status, env.method.upcase, env.url, env.body,
+              "Got #{env.status} (#{env.method.upcase} #{env.url}):\n#{env.body}")
           end
         end
       end
@@ -45,18 +42,46 @@ module Percy
       end
 
       def get(path)
-        response = connection.get do |request|
-          request.url(path)
-          request.headers['Content-Type'] = 'application/vnd.api+json'
+        retries = 3
+        begin
+          response = connection.get do |request|
+            request.url(path)
+            request.headers['Content-Type'] = 'application/vnd.api+json'
+          end
+        rescue Faraday::TimeoutError
+          raise Percy::Client::TimeoutError
+        rescue Faraday::ConnectionFailed
+          raise Percy::Client::ConnectionFailed
+        rescue Percy::Client::HttpError => e
+          # Retry on 502 errors.
+          if e.status == 502 && (retries -= 1) >= 0
+            sleep(rand(1..3))
+            retry
+          end
+          raise e
         end
         JSON.parse(response.body)
       end
 
       def post(path, data)
-        response = connection.post do |request|
-          request.url(path)
-          request.headers['Content-Type'] = 'application/vnd.api+json'
-          request.body = data.to_json
+        retries = 3
+        begin
+          response = connection.post do |request|
+            request.url(path)
+            request.headers['Content-Type'] = 'application/vnd.api+json'
+            request.body = data.to_json
+          end
+        rescue Faraday::TimeoutError
+          raise Percy::Client::TimeoutError
+        rescue Faraday::ConnectionFailed
+          raise Percy::Client::ConnectionFailed
+        rescue Percy::Client::HttpError => e
+          # Retry on 502 errors.
+          if e.status == 502 && (retries -= 1) >= 0
+            sleep(rand(1..3))
+            retry
+          end
+          raise e
         end
         JSON.parse(response.body)
       end

data/lib/percy/client/resources.rb

@@ -65,8 +65,8 @@ module Percy
         }
         begin
           post("#{config.api_url}/builds/#{build_id}/resources/", data)
-        rescue Percy::Client::ClientError => e
-          raise e if e.env.status != 409
+        rescue Percy::Client::HttpError => e
+          raise e if e.status != 409
           STDERR.puts "[percy] Warning: unnecessary resource reuploaded with SHA-256: #{sha}"
         end
         true

data/lib/percy/client/version.rb

@@ -1,5 +1,5 @@
 module Percy
   class Client
-    VERSION = '0.3.2'
+    VERSION = '0.4.0'
   end
 end

data/spec/lib/percy/client/connection_spec.rb

@@ -10,6 +10,33 @@ RSpec.describe Percy::Client::Connection do
       data = Percy.client.get("#{Percy.config.api_url}/test")
       expect(data).to eq({'foo' => true})
     end
+    it 'raises customized timeout errors' do
+      stub_request(:get, "#{Percy.config.api_url}/test").to_raise(Faraday::TimeoutError)
+      expect do
+        Percy.client.get("#{Percy.config.api_url}/test")
+      end.to raise_error(Percy::Client::TimeoutError)
+    end
+    it 'raises customized connection failed errors' do
+      stub_request(:get, "#{Percy.config.api_url}/test").to_raise(Faraday::ConnectionFailed)
+      expect do
+        Percy.client.get("#{Percy.config.api_url}/test")
+      end.to raise_error(Percy::Client::ConnectionFailed)
+    end
+    it 'retries on 502 errors' do
+      stub_request(:get, "#{Percy.config.api_url}/test")
+        .to_return(body: {foo: true}.to_json, status: 502)
+        .then.to_return(body: {foo: true}.to_json, status: 200)
+
+      data = Percy.client.get("#{Percy.config.api_url}/test")
+      expect(data).to eq({'foo' => true})
+    end
+    it 'raises error after 3 retries' do
+      stub_request(:get, "#{Percy.config.api_url}/test")
+        .to_return(body: {foo: true}.to_json, status: 502).times(3)
+      expect do
+        Percy.client.get("#{Percy.config.api_url}/test")
+      end.to raise_error(Percy::Client::HttpError)
+    end
   end
   describe '#post' do
     it 'performs a POST request to the api_url and parses response' do
@@ -17,5 +44,32 @@ RSpec.describe Percy::Client::Connection do
       data = Percy.client.post("#{Percy.config.api_url}/test", {})
       expect(data).to eq({'foo' => true})
     end
+    it 'raises customized timeout errors' do
+      stub_request(:post, "#{Percy.config.api_url}/test").to_raise(Faraday::TimeoutError)
+      expect do
+        Percy.client.post("#{Percy.config.api_url}/test", {})
+      end.to raise_error(Percy::Client::TimeoutError)
+    end
+    it 'raises customized connection failed errors' do
+      stub_request(:post, "#{Percy.config.api_url}/test").to_raise(Faraday::ConnectionFailed)
+      expect do
+        Percy.client.post("#{Percy.config.api_url}/test", {})
+      end.to raise_error(Percy::Client::ConnectionFailed)
+    end
+    it 'retries on 502 errors' do
+      stub_request(:post, "#{Percy.config.api_url}/test")
+        .to_return(body: {foo: true}.to_json, status: 502)
+        .then.to_return(body: {foo: true}.to_json, status: 200)
+
+      data = Percy.client.post("#{Percy.config.api_url}/test", {})
+      expect(data).to eq({'foo' => true})
+    end
+    it 'raises error after 3 retries' do
+      stub_request(:post, "#{Percy.config.api_url}/test")
+        .to_return(body: {foo: true}.to_json, status: 502).times(3)
+      expect do
+        Percy.client.post("#{Percy.config.api_url}/test", {})
+      end.to raise_error(Percy::Client::HttpError)
+    end
   end
 end

data/spec/lib/percy/client/snapshots_spec.rb

@@ -20,7 +20,7 @@ RSpec.describe Percy::Client::Snapshots, :vcr do
       build = Percy.create_build('fotinakis/percy-examples')
       expect do
         Percy.create_snapshot(build['data']['id'], [])
-      end.to raise_error(Percy::Client::ClientError)
+      end.to raise_error(Percy::Client::HttpError)
     end
   end
   describe '#finalize_snapshot' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: percy-client
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Perceptual Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-08 00:00:00.000000000 Z
+date: 2015-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday