pact 1.36.0 → 1.37.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b30477b50a98ca1563f8d3dea130b68cd7cbf88c
-  data.tar.gz: 43212f356f6580287d135da4b85b6e23ad039d0c
+  metadata.gz: baaed0d9726daedaae9ffc9bfd27d8df34c2511d
+  data.tar.gz: 2af96d9cff46c3afba7d9cfc15d65af6d56ebd0b
 SHA512:
-  metadata.gz: f68cc2abcf6ad6bd93f6804c1509dc15c6f23a9f697bf988186d9b630cd846323c56082a59bf978dc5e729519cfc2f51d6a54634f083948f18a66cd599591645
-  data.tar.gz: 8495fc3f5bdf6bef3d859bcf3f4c58d2666e6423b615b79fb2542460cf0ce9947e226da184de301831f15a90a227e9ae9532d775021d481b69a3c9159f3a8437
+  metadata.gz: 19a5b152314f0af37d2aa3cf52c6d41c6cef75289eedb05deef0daffdcee4a3b6f2dbcf7e9270c9cac630f236937a6ff5cf75f87ccfeadd991494325a76f4784
+  data.tar.gz: b2a78e5985c137f49c1fa673911125934463edc0b9442dfea58d1fe2cbc408e8618e3ffa77e7b6e09818e611a4862815fbc9baf39b9d89a5cc3c995a075347d4

data/CHANGELOG.md

@@ -1,3 +1,27 @@
+<a name="v1.37.0"></a>
+### v1.37.0 (2018-11-15)
+
+
+#### Features
+
+* **hal client**
+  * ensure meaningful error is displayed when HTTP errors are returned	 ([9244c14](/../../commit/9244c14))
+
+
+#### Bug Fixes
+
+* correct url encoding for expanded HAL links	 ([4abfe7d](/../../commit/4abfe7d))
+
+
+<a name="v1.36.2"></a>
+### v1.36.2 (2018-10-22)
+
+
+#### Bug Fixes
+
+* always execute global and base states	 ([8317fe3](/../../commit/8317fe3))
+
+
 <a name="v1.36.0"></a>
 ### v1.36.0 (2018-10-04)
 

data/lib/pact/hal/entity.rb

@@ -7,6 +7,8 @@ module Pact
   module Hal
     class RelationNotFoundError < ::Pact::Error; end
 
+    class ErrorResponseReturned < ::Pact::Error; end
+
     class Entity
 
       def initialize(href, data, http_client, response = nil)
@@ -76,6 +78,10 @@ module Pact
       def respond_to_missing?(method_name, include_private = false)
         @data.key?(method_name) || @links.key?(method_name)
       end
+
+      def assert_success!
+        self
+      end
     end
 
     class ErrorEntity < Entity
@@ -91,6 +97,10 @@ module Pact
       def success?
         false
       end
+
+      def assert_success!
+        raise ErrorResponseReturned.new("Error retrieving #{@href} status=#{response ? response.code: nil} #{response ? response.raw_body : ''}")
+      end
     end
   end
 end

data/lib/pact/hal/link.rb

@@ -1,4 +1,4 @@
-require 'uri'
+require 'erb'
 require 'delegate'
 
 module Pact
@@ -54,11 +54,9 @@ module Pact
       end
 
       def expand_url(params, url)
-        new_url = url
-        params.each do | key, value |
-          new_url = new_url.gsub('{' + key.to_s + '}', URI.escape(value))
+        params.inject(url) do | url, (key, value) |
+          url.gsub('{' + key.to_s + '}', ERB::Util.url_encode(value))
         end
-        new_url
       end
     end
   end

data/lib/pact/pact_broker/fetch_pacts.rb

@@ -72,16 +72,16 @@ module Pact
       end
 
       def index
-        @index_entity ||= Pact::Hal::Link.new({ "href" => broker_base_url }, http_client).get
+        @index_entity ||= Pact::Hal::Link.new({ "href" => broker_base_url }, http_client).get.assert_success!
       end
 
       def latest_pacts_for_provider
         link = index_entity._link!(LATEST_PROVIDER_RELATION)
-        pact_urls(link.expand(provider: provider).get)
+        pact_urls(link.expand(provider: provider).get.assert_success!)
       end
 
       def pact_urls(link_by_provider)
-        link_by_provider.fetch(PB_PACTS, PACTS).collect do |pact|
+        link_by_provider.assert_success!.fetch(PB_PACTS, PACTS).collect do |pact|
           Pact::Provider::PactURI.new(pact[HREF], http_client_options)
         end
       end

data/lib/pact/pact_broker/fetch_pending_pacts.rb

@@ -36,7 +36,7 @@ module Pact
       private
 
       def index
-        @index_entity ||= Pact::Hal::Link.new({ "href" => broker_base_url }, http_client).get
+        @index_entity ||= Pact::Hal::Link.new({ "href" => broker_base_url }, http_client).get.assert_success!
       end
 
       def pending_pacts_for_provider

data/lib/pact/provider/test_methods.rb

@@ -36,12 +36,16 @@ module Pact
       end
 
       def set_up_provider_states provider_states, consumer, options = {}
+        # If there are no provider state, execute with an nil state to ensure global and base states are executed
+        Pact.configuration.provider_state_set_up.call(nil, consumer, options) if provider_states.nil? || provider_states.empty?
         provider_states.each do | provider_state |
           Pact.configuration.provider_state_set_up.call(provider_state.name, consumer, options.merge(params: provider_state.params))
         end
       end
 
       def tear_down_provider_states provider_states, consumer, options = {}
+        # If there are no provider state, execute with an nil state to ensure global and base states are executed
+        Pact.configuration.provider_state_tear_down.call(nil, consumer, options) if provider_states.nil? || provider_states.empty?
         provider_states.reverse.each do | provider_state |
           Pact.configuration.provider_state_tear_down.call(provider_state.name, consumer, options.merge(params: provider_state.params))
         end

data/lib/pact/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact
 version: !ruby/object:Gem::Version
-  version: 1.36.0
+  version: 1.37.0
 platform: ruby
 authors:
 - James Fraser
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-03 00:00:00.000000000 Z
+date: 2018-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: randexp