pact 1.29.0 → 1.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4544628feb78e41d434d8df2fa467c3795b0849
-  data.tar.gz: 22c2d7a7caa71c7da7dd33e232a44ba5374f3fd9
+  metadata.gz: ae5b619b17a3e5134fea66e3e089ce3c096af93d
+  data.tar.gz: d8b230915ee8eadb59febb4c5551862db5bed69c
 SHA512:
-  metadata.gz: e1e6ddfcaad18582eb50938d8599e02d19a68efc4053f26e677ccd44125d3c855d4447a13e11a900652612ba1eec1d13759d18fbf32824f8d4c686d06601f9fc
-  data.tar.gz: 572c7b4c21f1143d3352620f4596f923917dc974c590b78a2cc9cd2fed071d9d5a5cf2ffe41e369e9cfda4ae6201713760ff3e263a6a74a34ccec747b5b3bcd4
+  metadata.gz: 9c4b09e2c225fbda956928c81adf1cb965c9b3bac351459fb0e7a4b4ebf22ec90dde93aa02c734f5084f83919d5dca04b2379db25c533c6db93693ec0d02ae76
+  data.tar.gz: e28af9fce398f9c0835bfb874320150b0ce9e2fb154c9e590b771f935b3ce3775be87a430ace03d7b6ae7b6c14c261447fc250a14246a881a600fca0b36c8028

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+<a name="v1.30.0"></a>
+### v1.30.0 (2018-07-24)
+
+
+#### Features
+
+* raise error when an expected HAL relation cannot be found in a resource	 ([5db4134](/../../commit/5db4134))
+
+
 <a name="v1.29.0"></a>
 ### v1.29.0 (2018-07-24)
 

data/lib/pact/hal/entity.rb

@@ -4,8 +4,12 @@ require 'pact/hal/link'
 
 module Pact
   module Hal
+    class RelationNotFoundError < ::Pact::Error; end
+
     class Entity
-      def initialize(data, http_client, response = nil)
+
+      def initialize(href, data, http_client, response = nil)
+        @href = href
         @data = data
         @links = (@data || {}).fetch("_links", {})
         @client = http_client
@@ -40,6 +44,10 @@ module Pact
         end
       end
 
+      def _link!(key)
+        _link(key) or raise RelationNotFoundError.new("Could not find relation '#{key}' in resource at #{@href}")
+      end
+
       def success?
         true
       end
@@ -69,7 +77,8 @@ module Pact
 
     class ErrorEntity < Entity
 
-      def initialize(data, http_client, response = nil)
+      def initialize(href, data, http_client, response = nil)
+        @href = href
         @data = data
         @links = {}
         @client = http_client

data/lib/pact/hal/link.rb

@@ -25,15 +25,15 @@ module Pact
       end
 
       def get(payload = {}, headers = {})
-        wrap_response(@http_client.get(href, payload, headers))
+        wrap_response(href, @http_client.get(href, payload, headers))
       end
 
       def put(payload = nil, headers = {})
-        wrap_response(@http_client.put(href, payload ? JSON.dump(payload) : nil, headers))
+        wrap_response(href, @http_client.put(href, payload ? JSON.dump(payload) : nil, headers))
       end
 
       def post(payload = nil, headers = {})
-        wrap_response(@http_client.post(href, payload ? JSON.dump(payload) : nil, headers))
+        wrap_response(href, @http_client.post(href, payload ? JSON.dump(payload) : nil, headers))
       end
 
       def expand(params)
@@ -44,12 +44,12 @@ module Pact
 
       private
 
-      def wrap_response(http_response)
+      def wrap_response(href, http_response)
         require 'pact/hal/entity' # avoid circular reference
         if http_response.success?
-          Entity.new(http_response.body, @http_client, http_response)
+          Entity.new(href, http_response.body, @http_client, http_response)
         else
-          ErrorEntity.new(http_response.raw_body, @http_client, http_response)
+          ErrorEntity.new(href, http_response.raw_body, @http_client, http_response)
         end
       end
 

data/lib/pact/pact_broker/fetch_pacts.rb

@@ -64,9 +64,9 @@ module Pact
 
       def link_for(tag)
         if !tag[:all]
-          index_entity._link(LATEST_PROVIDER_TAG_RELATION)
+          index_entity._link!(LATEST_PROVIDER_TAG_RELATION)
         else
-          index_entity._link(ALL_PROVIDER_TAG_RELATION)
+          index_entity._link!(ALL_PROVIDER_TAG_RELATION)
         end
       end
 
@@ -75,7 +75,7 @@ module Pact
       end
 
       def latest_pacts_for_provider
-        link = index_entity._link(LATEST_PROVIDER_RELATION)
+        link = index_entity._link!(LATEST_PROVIDER_RELATION)
         pact_urls(link.expand(provider: provider).get)
       end
 

data/lib/pact/provider/verification_results/publish.rb

@@ -32,7 +32,7 @@ module Pact
           end
 
           @http_client = Pact::Hal::HttpClient.new(http_client_options)
-          @pact_entity = Pact::Hal::Entity.new(pact_source.pact_hash, http_client)
+          @pact_entity = Pact::Hal::Entity.new(pact_source.uri, pact_source.pact_hash, http_client)
         end
 
         def call

data/lib/pact/version.rb

@@ -1,4 +1,4 @@
 # Remember to bump pact-provider-proxy when this changes major version
 module Pact
-  VERSION = "1.29.0"
+  VERSION = "1.30.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact
 version: !ruby/object:Gem::Version
-  version: 1.29.0
+  version: 1.30.0
 platform: ruby
 authors:
 - James Fraser
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-24 00:00:00.000000000 Z
+date: 2018-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: randexp