pact 1.41.0 → 1.42.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 96a4c13319a6a73992c90671ac2bd8534c5cc8b7
-  data.tar.gz: 635cd37e9d7dfb4e0e96df05ed6f04fe5950d715
+  metadata.gz: e4b327f444ffe97e8a904aa40ccdf20086de7507
+  data.tar.gz: 4885272ca8b7b4eb1e3ebd8d5f995ec50fbb96b5
 SHA512:
-  metadata.gz: e7e439fab1aa8e5ac7213bdd07b3253477c15c5f134bb85587569e20aaf78b474121b1979ec97deb699af37e510a9a140b5cceb2a7ab83aa841ad861792ee8e4
-  data.tar.gz: 2fe5aff283d9aa665ae86612d37cf39e1472b9c38120d8d5caf6ce1239e57b29e899576c7cbc9c48d38a511266c3e926c5589b9b5999b43f69effb1ace20ef29
+  metadata.gz: 3e26230cf9736addab312532d9ca89bf519872b08d5a2b9a0934f4b033ca815b0c09c20f96b68fd43912621c634f6a0ca03dfc05b4475dfe6d229674c6c13f0b
+  data.tar.gz: 5765ee8272e673040156be5cea50512bbfa613e93424260bb556bc412dded504ea25d3608f4a743bcb42b2febe4995cfe35e368c953f397c607d0ca73bb44df7

data/CHANGELOG.md

@@ -1,3 +1,33 @@
+<a name="v1.42.0"></a>
+### v1.42.0 (2019-09-26)
+
+
+#### Features
+
+* use new 'pacts for verification' endpoint to retrieve pacts (#199)	 ([55bb935](/../../commit/55bb935))
+
+
+<a name="v1.41.2"></a>
+### v1.41.2 (2019-09-10)
+
+
+#### Bug Fixes
+
+* **pact_helper_locator**
+  * add 'test' dir to file patterns (#196)	 ([746883d](/../../commit/746883d))
+
+* file upload spec	 ([0fe072c](/../../commit/0fe072c))
+
+
+<a name="v1.41.1"></a>
+### v1.41.1 (2019-09-04)
+
+
+#### Bug Fixes
+
+* use to_json instead of JSON.dump because it generates different JSON when used in conjuction with other libraries (eg. Oj)	 ([14566fb](/../../commit/14566fb))
+
+
 <a name="v1.41.0"></a>
 ### v1.41.0 (2019-05-22)
 

data/lib/pact/cli/run_pact_verification.rb

@@ -44,15 +44,17 @@ module Pact
       end
 
       def run_specs
-        exit_code = if options[:pact_uri]
-          run_with_pact_uri
+        exit_code = if options[:pact_uri].is_a?(String)
+          run_with_pact_url_string
+        elsif options[:pact_uri]
+          run_with_pact_uri_object # from pact-provider-verifier
         else
-          run_with_configured_pacts
+          run_with_configured_pacts_from_pact_helper
         end
         exit exit_code
       end
 
-      def run_with_pact_uri
+      def run_with_pact_url_string
         pact_repository_uri_options = {}
         pact_repository_uri_options[:username] = options[:pact_broker_username] if options[:pact_broker_username]
         pact_repository_uri_options[:password] = options[:pact_broker_password] if options[:pact_broker_password]
@@ -61,7 +63,11 @@ module Pact
         Pact::Provider::PactSpecRunner.new([pact_uri], pact_spec_options).run
       end
 
-      def run_with_configured_pacts
+      def run_with_pact_uri_object
+        Pact::Provider::PactSpecRunner.new([options[:pact_uri]], pact_spec_options).run
+      end
+
+      def run_with_configured_pacts_from_pact_helper
         pact_urls = Pact.provider_world.pact_urls
         raise "Please configure a pact to verify" if pact_urls.empty?
         Pact::Provider::PactSpecRunner.new(pact_urls, pact_spec_options).run

data/lib/pact/hal/http_client.rb

@@ -1,6 +1,7 @@
 require 'pact/retry'
 require 'pact/hal/authorization_header_redactor'
 require 'net/http'
+require 'rack'
 
 module Pact
   module Hal
@@ -15,9 +16,11 @@ module Pact
       end
 
       def get href, params = {}, headers = {}
-        query = params.collect{ |(key, value)| "#{CGI::escape(key)}=#{CGI::escape(value)}" }.join("&")
         uri = URI(href)
-        uri.query = query
+        if params && params.any?
+          existing_params = Rack::Utils.parse_nested_query(uri.query)
+          uri.query = Rack::Utils.build_nested_query(existing_params.merge(params))
+        end
         perform_request(create_request(uri, 'Get', nil, headers), uri)
       end
 

data/lib/pact/hal/link.rb

@@ -40,22 +40,40 @@ module Pact
         wrap_response(href, @http_client.get(href, payload, headers))
       end
 
+      def get!(*args)
+        get(*args).assert_success!
+      end
+
       def put(payload = nil, headers = {})
-        wrap_response(href, @http_client.put(href, payload ? JSON.dump(payload) : nil, headers))
+        wrap_response(href, @http_client.put(href, payload ? payload.to_json : nil, headers))
       end
 
       def post(payload = nil, headers = {})
-        wrap_response(href, @http_client.post(href, payload ? JSON.dump(payload) : nil, headers))
+        wrap_response(href, @http_client.post(href, payload ? payload.to_json : nil, headers))
       end
 
       def expand(params)
         expanded_url = expand_url(params, href)
         new_attrs = @attrs.merge('href' => expanded_url)
-        Link.new(new_attrs, @http_client)
+        Link.new(new_attrs, http_client)
+      end
+
+      def with_query(query)
+        if query && query.any?
+          uri = URI(href)
+          existing_query_params = Rack::Utils.parse_nested_query(uri.query)
+          uri.query = Rack::Utils.build_nested_query(existing_query_params.merge(query))
+          new_attrs = attrs.merge('href' => uri.to_s)
+          Link.new(new_attrs, http_client)
+        else
+          self
+        end
       end
 
       private
 
+      attr_reader :attrs, :http_client
+
       def wrap_response(href, http_response)
         require 'pact/hal/entity' # avoid circular reference
         if http_response.success?

data/lib/pact/pact_broker/fetch_pact_uris_for_verification.rb

@@ -0,0 +1,96 @@
+require 'pact/hal/entity'
+require 'pact/hal/http_client'
+require 'pact/provider/pact_uri'
+require 'pact/errors'
+require 'pact/pact_broker/fetch_pacts'
+
+module Pact
+  module PactBroker
+    class FetchPactURIsForVerification
+      attr_reader :provider, :consumer_version_selectors, :provider_version_tags, :broker_base_url, :http_client_options, :http_client
+
+      PACTS_FOR_VERIFICATION_RELATION = 'beta:provider-pacts-for-verification'.freeze
+      PACTS = 'pacts'.freeze
+      HREF = 'href'.freeze
+      LINKS = '_links'.freeze
+      SELF = 'self'.freeze
+      EMBEDDED = '_embedded'.freeze
+
+      def initialize(provider, consumer_version_selectors, provider_version_tags, broker_base_url, http_client_options)
+        @provider = provider
+        @consumer_version_selectors = consumer_version_selectors
+        @provider_version_tags = provider_version_tags
+        @http_client_options = http_client_options
+        @broker_base_url = broker_base_url
+        @http_client = Pact::Hal::HttpClient.new(http_client_options)
+      end
+
+      def self.call(provider, consumer_version_selectors, provider_version_tags, broker_base_url, http_client_options)
+        new(provider, consumer_version_selectors, provider_version_tags, broker_base_url, http_client_options).call
+      end
+
+      def call
+        if index.can?(PACTS_FOR_VERIFICATION_RELATION)
+          log_message
+          pacts_for_verification
+        else
+          # Fall back to old method of fetching pacts
+          consumer_version_tags = consumer_version_selectors.collect{ | selector | selector[:tag] }
+          FetchPacts.call(provider, consumer_version_tags, broker_base_url, http_client_options)
+        end
+      end
+
+      private
+
+      def index
+        @index_entity ||= Pact::Hal::Link.new({ "href" => broker_base_url }, http_client).get.assert_success!
+      end
+
+      def pacts_for_verification
+        pacts_for_verification_entity.response.body[EMBEDDED][PACTS].collect do | pact |
+          metadata = {
+            pending: pact["verificationProperties"]["pending"],
+            pending_reason: pact["verificationProperties"]["pendingReason"],
+            inclusion_reason: pact["verificationProperties"]["inclusionReason"],
+          }
+          Pact::Provider::PactURI.new(pact[LINKS][SELF][HREF], http_client_options, metadata)
+        end
+      end
+
+      def pacts_for_verification_entity
+        index
+          ._link(PACTS_FOR_VERIFICATION_RELATION)
+          .expand(provider: provider)
+          .with_query(query)
+          .get!
+      end
+
+      def query
+        q = {}
+        if consumer_version_selectors&.any?
+          q["consumer_version_selectors"] = consumer_version_selectors
+        end
+
+        if provider_version_tags&.any?
+          q["provider_version_tags"] = provider_version_tags
+        end
+        q
+      end
+
+      def log_message
+        latest = consumer_version_selectors&.any? ? "" : "latest "
+        message = "INFO: Fetching #{latest}pacts for #{provider} from #{broker_base_url}"
+        if consumer_version_selectors&.any?
+          desc = consumer_version_selectors.collect do |selector|
+            all_or_latest = selector[:all] ? "all" : "latest"
+            # TODO support fallback
+            name = selector[:fallback] ? "#{selector[:tag]} (or #{selector[:fallback]} if not found)" : selector[:tag]
+            "#{all_or_latest} #{name}"
+          end.join(", ")
+          message << " for tags: #{desc}"
+        end
+        Pact.configuration.output_stream.puts message
+      end
+    end
+  end
+end

data/lib/pact/pact_broker.rb

@@ -1,19 +1,25 @@
 require 'pact/pact_broker/fetch_pacts'
-require 'pact/pact_broker/fetch_pending_pacts'
+require 'pact/pact_broker/fetch_pact_uris_for_verification'
+require 'pact/provider/pact_uri'
 
 #
-# @public Use by Pact Provider Verifier
+# @public Used by Pact Provider Verifier
 #
 module Pact
   module PactBroker
     extend self
 
+    # Keep for backwards compatibility with pact-provider-verifier < 1.23.1
     def fetch_pact_uris *args
       Pact::PactBroker::FetchPacts.call(*args).collect(&:uri)
     end
 
-    def fetch_pending_pact_uris *args
-      Pact::PactBroker::FetchPendingPacts.call(*args).collect(&:uri)
+    def fetch_pact_uris_for_verification *args
+      Pact::PactBroker::FetchPactURIsForVerification.call(*args)
+    end
+
+    def build_pact_uri(*args)
+      Pact::Provider::PactURI.new(*args)
     end
   end
 end

data/lib/pact/provider/configuration/pact_verification_from_broker.rb

@@ -1,6 +1,6 @@
 require 'pact/shared/dsl'
 require 'pact/provider/world'
-require 'pact/pact_broker/fetch_pacts'
+require 'pact/pact_broker/fetch_pact_uris_for_verification'
 require 'pact/errors'
 
 module Pact
@@ -14,10 +14,11 @@ module Pact
         # in parent scope, it will clash with these ones,
         # so put an underscore in front of the name to be safer.
 
-        attr_accessor :_provider_name, :_pact_broker_base_url, :_consumer_version_tags, :_basic_auth_options, :_verbose
+        attr_accessor :_provider_name, :_pact_broker_base_url, :_consumer_version_tags, :_provider_version_tags, :_basic_auth_options, :_verbose
 
-        def initialize(provider_name)
+        def initialize(provider_name, provider_version_tags)
           @_provider_name = provider_name
+          @_provider_version_tags = provider_version_tags
           @_consumer_version_tags = []
           @_verbose = false
         end
@@ -45,10 +46,27 @@ module Pact
         private
 
         def create_pact_verification
-          fetch_pacts = Pact::PactBroker::FetchPacts.new(_provider_name, _consumer_version_tags, _pact_broker_base_url, _basic_auth_options.merge(verbose: _verbose))
+          fetch_pacts = Pact::PactBroker::FetchPactURIsForVerification.new(
+            _provider_name,
+            consumer_version_selectors,
+            _provider_version_tags,
+            _pact_broker_base_url,
+            _basic_auth_options.merge(verbose: _verbose)
+          )
+
           Pact.provider_world.add_pact_uri_source fetch_pacts
         end
 
+        def consumer_version_selectors
+          # TODO support "all"
+          _consumer_version_tags.collect do | tag |
+            {
+              tag: tag,
+              latest: true
+            }
+          end
+        end
+
         def validate
           raise Pact::Error.new("Please provide a pact_broker_base_url from which to retrieve the pacts") unless _pact_broker_base_url
         end

data/lib/pact/provider/configuration/service_provider_dsl.rb

@@ -65,7 +65,7 @@ module Pact
         end
 
         def create_pact_verification_from_broker(&block)
-          PactVerificationFromBroker.build(name, &block)
+          PactVerificationFromBroker.build(name, tags, &block)
         end
 
         def finalize

data/lib/pact/provider/pact_helper_locator.rb

@@ -1,21 +1,24 @@
 module Pact
   module Provider
     module PactHelperLocater
-        PACT_HELPER_FILE_PATTERNS = [
+      PACT_HELPER_FILE_PATTERNS = [
         "spec/**/*service*consumer*/pact_helper.rb",
         "spec/**/*consumer*/pact_helper.rb",
         "spec/**/pact_helper.rb",
-        "**/pact_helper.rb"]
+        "test/**/*service*consumer*/pact_helper.rb",
+        "test/**/*consumer*/pact_helper.rb",
+        "test/**/pact_helper.rb",
+        "**/pact_helper.rb"
+      ]
 
-        NO_PACT_HELPER_FOUND_MSG = "Please create a pact_helper.rb file that can be found using one of the following patterns: #{PACT_HELPER_FILE_PATTERNS.join(", ")}"
-
-        def self.pact_helper_path
-          pact_helper_search_results = []
-          PACT_HELPER_FILE_PATTERNS.find { | pattern | (pact_helper_search_results.concat(Dir.glob(pattern))).any? }
-          raise NO_PACT_HELPER_FOUND_MSG if pact_helper_search_results.empty?
-          File.join(Dir.pwd, pact_helper_search_results[0])
-        end
+      NO_PACT_HELPER_FOUND_MSG = "Please create a pact_helper.rb file that can be found using one of the following patterns: #{PACT_HELPER_FILE_PATTERNS.join(", ")}"
 
+      def self.pact_helper_path
+        pact_helper_search_results = []
+        PACT_HELPER_FILE_PATTERNS.find { | pattern | (pact_helper_search_results.concat(Dir.glob(pattern))).any? }
+        raise NO_PACT_HELPER_FOUND_MSG if pact_helper_search_results.empty?
+        File.join(Dir.pwd, pact_helper_search_results[0])
+      end
     end
   end
 end

data/lib/pact/provider/pact_uri.rb

@@ -1,17 +1,19 @@
 module Pact
   module Provider
     class PactURI
-      attr_reader :uri, :options
+      attr_reader :uri, :options, :metadata
 
-      def initialize (uri, options={})
+      def initialize (uri, options = nil, metadata = nil)
         @uri = uri
-        @options = options
+        @options = options || {}
+        @metadata = metadata || {} # make sure it's not nil if nil is passed in
       end
 
       def == other
         other.is_a?(PactURI) &&
           uri == other.uri &&
-          options == other.options
+          options == other.options &&
+          metadata == other.metadata
       end
 
       def basic_auth?

data/lib/pact/provider/rspec.rb

@@ -21,11 +21,13 @@ module Pact
         include ::RSpec::Core::DSL
 
         def honour_pactfile pact_uri, pact_json, options
-          pact_description = options[:ignore_failures] ? "Pending pact" : "pact"
-          Pact.configuration.output_stream.puts "INFO: Reading #{pact_description} at #{pact_uri}"
-          Pact.configuration.output_stream.puts "INFO: Filtering interactions by: #{options[:criteria]}" if options[:criteria] && options[:criteria].any?
+          Pact.configuration.output_stream.puts "INFO: Reading pact at #{pact_uri}"
+          Pact.configuration.output_stream.puts("DEBUG: #{pact_uri.metadata[:inclusion_reason]}") if pact_uri.metadata[:inclusion_reason]
+          Pact.configuration.output_stream.puts("DEBUG: #{pact_uri.metadata[:pending_reason]}") if pact_uri.metadata[:pending_reason]
+          Pact.configuration.output_stream.puts "DEBUG: Filtering interactions by: #{options[:criteria]}" if options[:criteria] && options[:criteria].any?
           consumer_contract = Pact::ConsumerContract.from_json(pact_json)
-          ::RSpec.describe "Verifying a #{pact_description} between #{consumer_contract.consumer.name} and #{consumer_contract.provider.name}", pactfile_uri: pact_uri do
+          suffix = pact_uri.metadata[:pending] ? " [PENDING]": ""
+          ::RSpec.describe "Verifying a pact between #{consumer_contract.consumer.name} and #{consumer_contract.provider.name}#{suffix}", pactfile_uri: pact_uri do
             honour_consumer_contract consumer_contract, options.merge(pact_json: pact_json, pact_uri: pact_uri)
           end
         end
@@ -74,7 +76,7 @@ module Pact
             pact_interaction: interaction,
             pact_interaction_example_description: interaction_description_for_rerun_command(interaction),
             pact_uri: options[:pact_uri],
-            pact_ignore_failures: options[:ignore_failures]
+            pact_ignore_failures: options[:pact_uri].metadata[:pending]
           }
 
           describe description_for(interaction), metadata do

data/lib/pact/version.rb

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

data/pact.gemspec

@@ -20,6 +20,12 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.license       = 'MIT'
 
+  gem.metadata = {
+    'source_code_uri'   => 'https://github.com/pact-foundation/pact-ruby',
+    'bug_tracker_uri'   => 'https://github.com/pact-foundation/pact-ruby/issues',
+    'documentation_uri' => 'https://github.com/pact-foundation/pact-ruby/blob/master/README.md'
+  }
+
   gem.add_runtime_dependency 'randexp', '~> 0.1.7'
   gem.add_runtime_dependency 'rspec', '>=2.14'
   gem.add_runtime_dependency 'rack-test', '>= 0.6.3', '< 2.0.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact
 version: !ruby/object:Gem::Version
-  version: 1.41.0
+  version: 1.42.0
 platform: ruby
 authors:
 - James Fraser
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-22 00:00:00.000000000 Z
+date: 2019-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: randexp
@@ -323,8 +323,8 @@ files:
 - lib/pact/hal/http_client.rb
 - lib/pact/hal/link.rb
 - lib/pact/pact_broker.rb
+- lib/pact/pact_broker/fetch_pact_uris_for_verification.rb
 - lib/pact/pact_broker/fetch_pacts.rb
-- lib/pact/pact_broker/fetch_pending_pacts.rb
 - lib/pact/project_root.rb
 - lib/pact/provider.rb
 - lib/pact/provider/configuration.rb
@@ -380,7 +380,10 @@ files:
 homepage: https://github.com/pact-foundation/pact-ruby
 licenses:
 - MIT
-metadata: {}
+metadata:
+  source_code_uri: https://github.com/pact-foundation/pact-ruby
+  bug_tracker_uri: https://github.com/pact-foundation/pact-ruby/issues
+  documentation_uri: https://github.com/pact-foundation/pact-ruby/blob/master/README.md
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -397,7 +400,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.14.3
 signing_key: 
 specification_version: 4
 summary: Enables consumer driven contract testing, providing a mock service and DSL

data/lib/pact/pact_broker/fetch_pending_pacts.rb

@@ -1,58 +0,0 @@
-require 'pact/hal/entity'
-require 'pact/hal/http_client'
-require 'pact/provider/pact_uri'
-require 'pact/errors'
-
-module Pact
-  module PactBroker
-    class FetchPendingPacts
-      attr_reader :provider, :tags, :broker_base_url, :http_client_options, :http_client, :index_entity
-
-      PENDING_PROVIDER_RELATION = 'beta:pending-provider-pacts'.freeze
-      WIP_PROVIDER_RELATION = 'beta:wip-provider-pacts'.freeze # deprecated
-      PACTS = 'pacts'.freeze
-      PB_PACTS = 'pb:pacts'.freeze
-      HREF = 'href'.freeze
-
-      def initialize(provider, broker_base_url, http_client_options)
-        @provider = provider
-        @http_client_options = http_client_options
-        @broker_base_url = broker_base_url
-        @http_client = Pact::Hal::HttpClient.new(http_client_options)
-      end
-
-      def self.call(provider, broker_base_url, http_client_options)
-        new(provider, broker_base_url, http_client_options).call
-      end
-
-      def call
-        if index.success?
-          pending_pacts_for_provider
-        else
-          raise Pact::Error.new("Error retrieving #{broker_base_url} status=#{index_entity.response.code} #{index_entity.response.raw_body}")
-        end
-      end
-
-      private
-
-      def index
-        @index_entity ||= Pact::Hal::Link.new({ "href" => broker_base_url }, http_client).get.assert_success!
-      end
-
-      def pending_pacts_for_provider
-        link = index_entity._link(WIP_PROVIDER_RELATION, PENDING_PROVIDER_RELATION)
-        if link
-          get_pact_urls(link.expand(provider: provider).get)
-        else
-          []
-        end
-      end
-
-      def get_pact_urls(link_by_provider)
-        link_by_provider.fetch(PB_PACTS, PACTS).collect do |pact|
-          Pact::Provider::PactURI.new(pact[HREF], http_client_options)
-        end
-      end
-    end
-  end
-end