pact_broker-client 1.31.0 → 1.32.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6d01915e01529a223ea249ec54672916c03f7518564710937570e8236c6317d
-  data.tar.gz: 9afcd886e4a3028fdfa66f7cca8a9f1d37e1fab30db469507b49843c84a6a4aa
+  metadata.gz: 9fc996a2d95d7c3755d063cd244b273fa5924f6956cf18b26ebe9531fa59e304
+  data.tar.gz: '018d1d764a83f040d57d6ef504a6b4229f34f3fff38cf938c8c3f2202e03cc7a'
 SHA512:
-  metadata.gz: 1099d5d729df80630cb6f95e916a1d05628f536adaa4e939ff7dbf4158145179b6676746ce3e71ea9dadf89ac565a0ebdbea7229bfb00167bc301f783342830d
-  data.tar.gz: 40bed81357857aeb44dd7c0acaa81a7b51ceda70294586daf78d058b16357dce5f814b0c6562000d55c47db1527509fae2d745119511180588c97e2a80a96e93
+  metadata.gz: 95944c92c42aa29803c5bd37b5b4c8526359cb910c4a983123379ac2f0482483aae75fc9179d2e6341e1931019c3f1588e1d7a385ffa628c203fd829d3137bfb
+  data.tar.gz: 5391400fa12118608718161c3ea286ffe1b3b7aebbe1eca074b999b1903b25f6a3f15e257459e35240e30faf768949d45c45a052616378507b0eaf970590ee1b

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+<a name="v1.32.0"></a>
+### v1.32.0 (2020-10-26)
+
+#### Features
+
+* Improve HTTP errors handling (#76)	 ([d8eaf16](/../../commit/d8eaf16))
+
+#### Bug Fixes
+
+* **list-latest-pact-versions**
+  * correct json output	 ([cf77666](/../../commit/cf77666))
+
 <a name="v1.31.0"></a>
 ### v1.31.0 (2020-10-22)
 

data/lib/pact_broker/client/base_client.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'erb'
 require 'httparty'
 require 'pact_broker/client/error'
@@ -30,6 +32,12 @@ module PactBroker
     end
 
     class BaseClient
+      ERROR_CODE_MAPPING = {
+        401 => "Authentication failed",
+        403 => "Authorization failed (insufficient permissions)",
+        409 => "Potential duplicate pacticipants"
+      }.freeze
+
       include UrlHelpers
       include HTTParty
       include StringToSymbol
@@ -69,14 +77,8 @@ module PactBroker
           yield response
         elsif response.code == 404
           nil
-        elsif response.code == 403
-          message = "Authorization failed (insufficient permissions)"
-          if response.body && response.body.size > 0
-            message = message + ": #{response.body}"
-          end
-          raise Error.new(message)
-        elsif response.code == 401
-          message = "Authentication failed"
+        elsif ERROR_CODE_MAPPING.key?(response.code)
+          message = ERROR_CODE_MAPPING.fetch(response.code)
           if response.body && response.body.size > 0
             message = message + ": #{response.body}"
           end
@@ -93,7 +95,7 @@ module PactBroker
               response.body
             end
           rescue
-            raise Error.new(response.body)
+            raise Error.new("status=#{response.code} #{response.body}")
           end
           raise Error.new(error_message)
         end

data/lib/pact_broker/client/matrix.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'base_client'
 require 'pact_broker/client/matrix/resource'
 
@@ -39,7 +41,7 @@ module PactBroker
               response.body
             end
           rescue
-            raise Error.new(response.body)
+            raise Error.new("status=#{response.code} #{response.body}")
           end
           raise Error.new(error_message)
         end

data/lib/pact_broker/client/pacts/list_latest_versions.rb

@@ -20,7 +20,7 @@ module PactBroker
 
         def call
           message = if output == 'json'
-            versions_resource.response.body
+            versions_resource.response.raw_body
           else
             to_text(versions)
           end

data/lib/pact_broker/client/version.rb

@@ -1,5 +1,5 @@
 module PactBroker
   module Client
-    VERSION = '1.31.0'
+    VERSION = '1.32.0'
   end
 end

data/spec/lib/pact_broker/client/base_client_spec.rb

@@ -2,10 +2,11 @@ require 'pact_broker/client/base_client'
 module PactBroker
   module Client
     describe BaseClient do
-      describe '#initialize' do
-        subject { BaseClient.new(base_url: base_url) }
+      subject { BaseClient.new(base_url: base_url) }
+
+      let(:base_url) { 'http://pact_broker_base_url'}
 
-        let(:base_url) { 'http://pact_broker_base_url'}
+      describe '#initialize' do
         let(:username) { 'pact_repo_username'}
         let(:password) { 'pact_repo_password'}
         let(:token) { '123456789' }
@@ -119,6 +120,63 @@ module PactBroker
           end
         end
       end
+
+      describe '#handle_response' do
+        let(:response) { double('Response', success?: true) }
+
+        it 'yields response object' do
+          expect { |block| subject.handle_response(response, &block) }.to yield_with_args(response)
+        end
+
+        context 'with 404 response' do
+          let(:response) { double('Response', success?: false, code: 404) }
+          it 'returns nil' do
+            expect(subject.handle_response(response)).to be_nil
+          end
+        end
+
+        context 'with 401 response' do
+          let(:response) { double('Response', success?: false, code: 401, body: 'body') }
+          it 'raise an exception with meaningful message' do
+            expect { subject.handle_response(response) }
+              .to raise_error(PactBroker::Client::Error, "Authentication failed: body")
+          end
+        end
+
+        context 'with 403 response' do
+          let(:response) { double('Response', success?: false, code: 403, body: 'body') }
+          it 'raise an exception with meaningful message' do
+            expect { subject.handle_response(response) }
+              .to raise_error(PactBroker::Client::Error, "Authorization failed (insufficient permissions): body")
+          end
+        end
+
+        context 'with 409 response' do
+          let(:response) { double('Response', success?: false, code: 409, body: 'body') }
+          it 'raise an exception with meaningful message' do
+            expect { subject.handle_response(response) }
+              .to raise_error(PactBroker::Client::Error, "Potential duplicate pacticipants: body")
+          end
+        end
+
+        context 'with unsuccessful JSON response' do
+          let(:response) do
+            double('Response', success?: false, code: 500, body: '{"errors": ["Internal server error"]}')
+          end
+          it 'raise an exception with meaningful message' do
+            expect { subject.handle_response(response) }
+              .to raise_error(PactBroker::Client::Error, "Internal server error")
+          end
+        end
+
+        context 'with unsucessful nono-JSON response ' do
+          let(:response) { double('Response', success?: false, code: 500, body: 'Internal server error') }
+          it 'raise an exception with meaningful message' do
+            expect { subject.handle_response(response) }
+              .to raise_error(PactBroker::Client::Error, "status=500 Internal server error")
+          end
+        end
+      end
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker-client
 version: !ruby/object:Gem::Version
-  version: 1.31.0
+  version: 1.32.0
 platform: ruby
 authors:
 - Beth Skurrie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-22 00:00:00.000000000 Z
+date: 2020-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty