pact_broker 2.0.0.beta.3 → 2.0.0.beta.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6164f9ecfba854f9c9f50374b24f13f62ce49686
-  data.tar.gz: 98ea0f5adfc2ecdaf0bf2dfd1d5e34e698d5da48
+  metadata.gz: b2167ca7ab46b105cbf292057696ea0abbaa8e0d
+  data.tar.gz: 303b9317c8f757e4dbec194632384c77fd6fb066
 SHA512:
-  metadata.gz: 194df9e653fecb27e44451c2b805f16aed08eb26e6e37bf6c016a3f2bbe682264e21b35ecf11e4fddfacdb155fddb4e5346224c111d7acd8146d54fe3f702d3b
-  data.tar.gz: c902aea3cb9eadaf1f4b2e7e7d49a72763dcf91fccb611ee1b4e85f9deb7ebc009878d68cffe3478f4fd7433d8964a7f5c8efbe14c98d930a9264a903800ce58
+  metadata.gz: 030dc5cf549ba6929960d4ce9a987d8bb3307bf7a8af9c4bfb33561c0f41f584baa16e277e86775d253aad86e899e445af95164940b974a7ac29143fb677a060
+  data.tar.gz: 73a47ffa728bead6bbea0eafe648fa6505b55769791d65e48b9ab71e35341e7bf90b509e95a5c9a6c1a03b9e6f3b6ec3d7559493e9d7b43d52e54e26844dabac

data/CHANGELOG.md

@@ -2,6 +2,10 @@ Do this to generate your change history
 
     $ git log --pretty=format:'  * %h - %s (%an, %ad)' vX.Y.Z..HEAD
 
+#### 2.0.0.beta.4 (2017-05-02)
+* e5c14d1 - Renamed verification to verification-result in link relations and URLs (Beth Skurrie, Tue May 2 13:04:01 2017 +1000)
+* 803ea44 - Add endpoint to show a verification. (Beth Skurrie, Mon May 1 08:52:12 2017 +1000)
+
 #### 2.0.0.beta.3 (2017-04-29)
 * 7059a7e - Insert pact_publications without a specified ID so that the inbuilt sequence is kept in sync. (Beth Skurrie, Sat Apr 29 15:16:12 2017 +1000)
 

data/lib/pact_broker/api.rb

@@ -24,6 +24,7 @@ require 'pact_broker/api/resources/pact_content_diff'
 require 'pact_broker/api/resources/previous_distinct_pact_version'
 require 'pact_broker/api/resources/latest_provider_pacts'
 require 'pact_broker/api/resources/verifications'
+require 'pact_broker/api/resources/verification'
 require 'pact_broker/api/resources/latest_verifications_for_consumer_version'
 
 require 'webmachine/adapters/rack_mapped'
@@ -44,8 +45,9 @@ module PactBroker
         add ['pacts', 'provider', :provider_name, 'consumer', :consumer_name, 'version', :consumer_version_number, 'diff', 'previous-distinct'], Api::Resources::PactContentDiff
 
         # Verifications
-        add ['pacts', 'provider', :provider_name, 'consumer', :consumer_name, 'pact-version', :pact_version_sha, 'verifications'], Api::Resources::Verifications
-        add ['pacts', 'consumer', :consumer_name, 'versions', :consumer_version_number, 'verifications', 'latest'], Api::Resources::LatestVerificationsForConsumerVersion
+        add ['pacts', 'provider', :provider_name, 'consumer', :consumer_name, 'pact-version', :pact_version_sha, 'verification-results'], Api::Resources::Verifications
+        add ['pacts', 'provider', :provider_name, 'consumer', :consumer_name, 'pact-version', :pact_version_sha, 'verification-results', :verification_number], Api::Resources::Verification
+        add ['verification-results', 'consumer', :consumer_name, 'version', :consumer_version_number,'latest'], Api::Resources::LatestVerificationsForConsumerVersion
 
         # Latest pacts
         add ['pacts', 'provider', :provider_name, 'consumer', :consumer_name, 'latest'], Api::Resources::LatestPact

data/lib/pact_broker/api/decorators/pact_decorator.rb

@@ -99,7 +99,7 @@ module PactBroker
           }
         end
 
-        link :'pb:publish-verification' do | options |
+        link :'pb:publish-verification-result' do | options |
           {
             title: "Publish verification",
             href: verification_publication_url(represented, options.fetch(:base_url))

data/lib/pact_broker/api/decorators/verification_decorator.rb

@@ -11,7 +11,7 @@ module PactBroker
 
         link :self do | options |
           {
-            title: 'Verification',
+            title: 'Verification result',
             name: represented.number,
             href: verification_url(represented, options.fetch(:base_url), )
           }

data/lib/pact_broker/api/decorators/verifications_decorator.rb

@@ -7,12 +7,12 @@ module PactBroker
 
       class VerificationsDecorator < BaseDecorator
 
-        collection :entries, as: :verifications, embedded: true, :extend => PactBroker::Api::Decorators::VerificationDecorator
+        collection :entries, as: :'verification-results', embedded: true, :extend => PactBroker::Api::Decorators::VerificationDecorator
 
         link :self do | context |
           {
             href: context.fetch(:resource_url),
-            title: "Latest verifications for consumer #{context.fetch(:consumer_name)} version #{context.fetch(:consumer_version_number)}"
+            title: "Latest verification results for consumer #{context.fetch(:consumer_name)} version #{context.fetch(:consumer_version_number)}"
           }
         end
       end

data/lib/pact_broker/api/decorators/version_decorator.rb

@@ -18,9 +18,9 @@ module PactBroker
           }
         end
 
-        link :'pb:latest-verifications' do | options |
+        link :'pb:latest-verification-results-where-pacticipant-is-consumer' do | options |
           {
-            title: "Latest verifications for consumer version",
+            title: "Latest verification results for consumer version",
             href: latest_verifications_for_consumer_version_url(represented, options.fetch(:base_url))
           }
         end

data/lib/pact_broker/api/pact_broker_urls.rb

@@ -68,7 +68,7 @@ module PactBroker
           'provider', url_encode(params[:provider_name]),
           'consumer', url_encode(params[:consumer_name]),
           'pact-version', params[:sha],
-          'verifications', number
+          'verification-results', number
         ].join('/')
       end
 
@@ -77,16 +77,16 @@ module PactBroker
           'provider', url_encode(verification.provider_name),
           'consumer', url_encode(verification.consumer_name),
           'pact-version', verification.pact_version.sha,
-          'verifications', verification.number
+          'verification-results', verification.number
         ].join('/')
       end
 
       def latest_verifications_for_consumer_version_url version, base_url
-        "#{base_url}/pacts/consumer/#{url_encode(version.pacticipant.name)}/versions/#{version.number}/verifications/latest"
+        "#{base_url}/verification-results/consumer/#{url_encode(version.pacticipant.name)}/version/#{version.number}/latest"
       end
 
       def verification_publication_url pact, base_url
-        "#{pactigration_base_url(base_url, pact)}/pact-version/#{pact.pact_version_sha}/verifications"
+        "#{pactigration_base_url(base_url, pact)}/pact-version/#{pact.pact_version_sha}/verification-results"
       end
 
       def tag_url base_url, tag

data/lib/pact_broker/api/resources/verification.rb

@@ -0,0 +1,41 @@
+require 'pact_broker/api/resources/base_resource'
+require 'pact_broker/configuration'
+require 'pact_broker/domain/verification'
+require 'pact_broker/api/contracts/verification_contract'
+require 'pact_broker/api/decorators/verification_decorator'
+
+module PactBroker
+  module Api
+    module Resources
+
+      class Verification < BaseResource
+
+        def content_types_provided
+          [["application/json", :to_json]]
+        end
+
+        def allowed_methods
+          ["GET"]
+        end
+
+        def resource_exists?
+          !!verification
+        end
+
+        def to_json
+          decorator_for(verification).to_json(user_options: {base_url: base_url})
+        end
+
+        private
+
+        def verification
+          @verification ||= verification_service.find(identifier_from_path)
+        end
+
+        def decorator_for model
+          PactBroker::Api::Decorators::VerificationDecorator.new(model)
+        end
+      end
+    end
+  end
+end

data/lib/pact_broker/doc/views/publish-verification-result.markdown

@@ -0,0 +1,14 @@
+# Publish pact verification result
+
+Allowed methods: POST
+
+Use the `pb:publish-verification-result` link in the pact resource to publish the result (either success or failure) of a pact verification. The body of the request must include the success (true or false) and the provider application version that the pact was verified against. It may also include the build URL to facilitate debugging when failures occur.
+
+    POST http://broker/pacts/provider/Foo/consumer/Bar/pact-version/1234
+    {
+      success: true,
+      providerApplicationVersion: "4.5.6",
+      buildUrl: "http://my-ci.org/build/3456"
+    }
+
+Multiple verification results may be published for the same pact resource.

data/lib/pact_broker/domain/verification.rb

@@ -37,6 +37,10 @@ module PactBroker
           where(pact_version_sha: sha)
         end
 
+        def verification_number number
+          where("`verifications`.`number` = ? ", number)
+        end
+
         def latest
           reverse_order(:consumer_version_order, :number).limit(1)
         end

data/lib/pact_broker/verifications/latest_verifications_by_consumer_version.rb

@@ -0,0 +1,14 @@
+require 'pact_broker/domain/verification'
+
+module PactBroker
+  module Verifications
+    class Repository
+
+      include PactBroker::Repositories::Helpers
+
+      class LatestVerificationsByConsumerVersion < PactBroker::Domain::Verification
+        set_dataset(:latest_verifications)
+      end
+    end
+  end
+end

data/lib/pact_broker/verifications/repository.rb

@@ -1,5 +1,6 @@
 require 'sequel'
 require 'pact_broker/domain/verification'
+require 'pact_broker/verifications/latest_verifications_by_consumer_version'
 
 module PactBroker
   module Verifications
@@ -7,10 +8,6 @@ module PactBroker
 
       include PactBroker::Repositories::Helpers
 
-      class LatestVerifications < PactBroker::Domain::Verification
-        set_dataset(:latest_verifications)
-      end
-
       def create verification, pact
         verification.pact_version_id = pact_version_id_for(pact)
         verification.save
@@ -20,16 +17,27 @@ module PactBroker
         PactBroker::Domain::Verification.where(pact_version_id: pact_version_id_for(pact)).count
       end
 
+      def find consumer_name, provider_name, pact_version_sha, verification_number
+        PactBroker::Domain::Verification
+          .join(PactBroker::Pacts::AllPactPublications, pact_version_id: :pact_version_id)
+          .consumer(consumer_name)
+          .provider(provider_name)
+          .pact_version_sha(pact_version_sha)
+          .verification_number(verification_number).first
+      end
+
       def find_latest_verifications_for_consumer_version consumer_name, consumer_version_number
-        LatestVerifications
+        # Use LatestPactPublicationsByConsumerVersion not AllPactPublcations because we don't
+        # want verifications for shadowed revisions as it would be misleading.
+        LatestVerificationsByConsumerVersion
           .join(PactBroker::Pacts::LatestPactPublicationsByConsumerVersion, pact_version_id: :pact_version_id)
-          .where(name_like(:consumer_name, consumer_name))
-          .where(consumer_version_number: consumer_version_number)
+          .consumer(consumer_name)
+          .consumer_version_number(consumer_version_number)
           .order(:provider_name)
       end
 
       def find_latest_verification_for consumer_name, provider_name
-        query = LatestVerifications
+        query = LatestVerificationsByConsumerVersion
           .join(PactBroker::Pacts::AllPactPublications, pact_version_id: :pact_version_id)
           .consumer(consumer_name)
           .provider(provider_name)

data/lib/pact_broker/verifications/service.rb

@@ -28,6 +28,10 @@ module PactBroker
         contract.errors
       end
 
+      def find params
+        verification_repository.find(params.fetch(:consumer_name), params.fetch(:provider_name), params.fetch(:pact_version_sha), params.fetch(:verification_number))
+      end
+
       def find_latest_verifications_for_consumer_version params
         verification_repository.find_latest_verifications_for_consumer_version params[:consumer_name], params[:consumer_version_number]
       end

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = '2.0.0.beta.3'
+  VERSION = '2.0.0.beta.4'
 end

data/spec/features/get_verifications_for_consumer_version_spec.rb

@@ -2,7 +2,7 @@ require 'spec/support/provider_state_builder'
 
 describe "Get verifications for consumer version" do
 
-  let(:path) { "/pacts/consumer/Consumer/versions/1.2.3/verifications/latest" }
+  let(:path) { "/verification-results/consumer/Consumer/version/1.2.3/latest" }
   let(:last_response_body) { JSON.parse(subject.body, symbolize_names: true) }
 
   subject { get path; last_response }
@@ -27,7 +27,7 @@ describe "Get verifications for consumer version" do
     end
 
     it "returns a list of verifications" do
-      expect(last_response_body[:_embedded][:verifications].size).to eq 2
+      expect(last_response_body[:_embedded][:'verification-results'].size).to eq 2
     end
   end
 end

data/spec/features/publish_verification_spec.rb

@@ -2,7 +2,7 @@ require 'pact_broker/domain/verification'
 
 describe "Recording a pact verification" do
 
-  let(:path) { "/pacts/provider/Provider/consumer/Consumer/pact-version/#{pact.pact_version_sha}/verifications" }
+  let(:path) { "/pacts/provider/Provider/consumer/Consumer/pact-version/#{pact.pact_version_sha}/verification-results" }
   let(:verification_content) { load_fixture('verification.json') }
   let(:parsed_response_body) { JSON.parse(subject.body) }
 
@@ -25,4 +25,11 @@ describe "Recording a pact verification" do
   it "saves a verification against the pact" do
     expect { subject }.to change { PactBroker::Domain::Verification.count }.by(1)
   end
+
+  it "returns a link to itself that can be followed" do
+    get_verification_link = parsed_response_body['_links']['self']['href']
+    get get_verification_link
+    expect(last_response.status).to be 200
+    expect(JSON.parse(subject.body)).to include JSON.parse(verification_content)
+  end
 end

data/spec/lib/pact_broker/api/decorators/pact_decorator_spec.rb

@@ -91,7 +91,7 @@ module PactBroker
           end
 
           it "includes a link to publish a verification" do
-            expect(subject[:_links][:'pb:publish-verification'][:href]).to match %r{http://example.org/.*/verifications}
+            expect(subject[:_links][:'pb:publish-verification-result'][:href]).to match %r{http://example.org/.*/verification-results}
           end
 
           it "includes a curie" do

data/spec/lib/pact_broker/api/decorators/verification_decorator_spec.rb

@@ -49,7 +49,7 @@ module PactBroker
         end
 
         it "includes a link to itself" do
-          expect(subject[:_links][:self][:href]).to match %r{http://example.org/.*/verifications/1}
+          expect(subject[:_links][:self][:href]).to match %r{http://example.org/.*/verification-results/1}
         end
 
         it "includes a link to its pact" do

data/spec/lib/pact_broker/api/decorators/verifications_decorator_spec.rb

@@ -23,13 +23,13 @@ module PactBroker
 
         subject { JSON.parse VerificationsDecorator.new(verifications).to_json(user_options: options), symbolize_names: true }
 
-        it "includes a list of verifications" do
-          expect(subject[:_embedded][:verifications]).to be_instance_of(Array)
-          expect(subject[:_embedded][:verifications].size).to eq 1
+        it "includes a list of verification results" do
+          expect(subject[:_embedded][:'verification-results']).to be_instance_of(Array)
+          expect(subject[:_embedded][:'verification-results'].size).to eq 1
         end
 
         it "includes a title" do
-          expect(subject[:_links][:self][:title]).to eq "Latest verifications for consumer Foo version 1.2.3"
+          expect(subject[:_links][:self][:title]).to eq "Latest verification results for consumer Foo version 1.2.3"
         end
 
         it "includes a link to itself" do

data/spec/lib/pact_broker/api/decorators/version_decorator_spec.rb

@@ -43,8 +43,8 @@ module PactBroker
           expect(subject[:_embedded][:tags].first[:name]).to eq "prod"
         end
 
-        it "includes a link to the latest verifications for the pacts for this version" do
-          expect(subject[:_links][:'pb:latest-verifications'][:href]).to match(%r{http://.*/verifications/latest})
+        it "includes a link to the latest verification results for the pacts for this version" do
+          expect(subject[:_links][:'pb:latest-verification-results-where-pacticipant-is-consumer'][:href]).to match(%r{http://.*/verification-results/.*/latest})
         end
 
       end

data/spec/lib/pact_broker/api/resources/latest_verifications_for_consumer_version_spec.rb

@@ -7,7 +7,7 @@ module PactBroker
 
       describe LatestVerificationsForConsumerVersion do
         describe "GET" do
-          let(:url) { '/pacts/consumer/Consumer/versions/1.2.3/verifications/latest' }
+          let(:url) { '/verification-results/consumer/Consumer/version/1.2.3/latest' }
           let(:response_body) { JSON.parse(subject.body, {symbolize_names: true}) }
           let(:version) { double(:version) }
 

data/spec/lib/pact_broker/api/resources/verifications_spec.rb

@@ -12,7 +12,7 @@ module PactBroker
 
         describe "post" do
 
-          let(:url) { "/pacts/provider/Provider/consumer/Consumer/pact-version/1234/verifications" }
+          let(:url) { "/pacts/provider/Provider/consumer/Consumer/pact-version/1234/verification-results" }
           let(:request_body) { {some: 'params'}.to_json }
           subject { post url, request_body, {'CONTENT_TYPE' => 'application/json' }; last_response }
           let(:response_body) { JSON.parse(subject.body, {symbolize_names: true}) }
@@ -55,7 +55,7 @@ module PactBroker
             end
 
             it "returns the path of the newly created resource in the headers" do
-              expect(subject.headers['Location']).to end_with("/verifications/2")
+              expect(subject.headers['Location']).to end_with("/verification-results/2")
             end
 
             it "stores the verification in the database" do

data/spec/lib/pact_broker/verifications/repository_spec.rb

@@ -30,6 +30,42 @@ module PactBroker
         end
       end
 
+      describe "#find" do
+        let!(:pact) do
+          builder = ProviderStateBuilder.new
+          pact = builder
+            .create_provider("Provider1")
+            .create_consumer("Consumer1")
+            .create_consumer_version("1.0.0")
+            .create_pact
+            .and_return(:pact)
+
+          builder
+            .create_verification(number: 1)
+            .create_verification(number: 2, provider_version: '3.7.4')
+            .create_consumer_version("1.2.3")
+            .create_pact
+            .create_verification(number: 1)
+
+            ProviderStateBuilder.new
+            .create_provider("Provider3")
+            .create_consumer("Consumer2")
+            .create_consumer_version("1.2.3")
+            .create_pact
+            .create_verification(number: 1)
+          pact
+        end
+
+        let(:verification) { Repository.new.find "Consumer1", "Provider1", pact.pact_version_sha, 2}
+
+        it "finds the latest verifications for the given consumer version" do
+          expect(verification.provider_version).to eq "3.7.4"
+          expect(verification.consumer_name).to eq "Consumer1"
+          expect(verification.provider_name).to eq "Provider1"
+          expect(verification.pact_version_sha).to eq pact.pact_version_sha
+        end
+      end
+
       describe "#find_latest_verifications_for_consumer_version" do
         before do
           ProviderStateBuilder.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta.3
+  version: 2.0.0.beta.4
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-29 00:00:00.000000000 Z
+date: 2017-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -483,6 +483,7 @@ files:
 - lib/pact_broker/api/resources/previous_distinct_pact_version.rb
 - lib/pact_broker/api/resources/relationships.rb
 - lib/pact_broker/api/resources/tag.rb
+- lib/pact_broker/api/resources/verification.rb
 - lib/pact_broker/api/resources/verifications.rb
 - lib/pact_broker/api/resources/version.rb
 - lib/pact_broker/api/resources/versions.rb
@@ -511,7 +512,7 @@ files:
 - lib/pact_broker/doc/views/pacticipants.markdown
 - lib/pact_broker/doc/views/provider.markdown
 - lib/pact_broker/doc/views/publish-pact.markdown
-- lib/pact_broker/doc/views/publish-verification.markdown
+- lib/pact_broker/doc/views/publish-verification-result.markdown
 - lib/pact_broker/doc/views/self.markdown
 - lib/pact_broker/doc/views/tag-prod-version.markdown
 - lib/pact_broker/doc/views/tag-version.markdown
@@ -574,6 +575,7 @@ files:
 - lib/pact_broker/ui/views/groups/show.html.erb
 - lib/pact_broker/ui/views/layouts/main.haml
 - lib/pact_broker/ui/views/relationships/show.haml
+- lib/pact_broker/verifications/latest_verifications_by_consumer_version.rb
 - lib/pact_broker/verifications/repository.rb
 - lib/pact_broker/verifications/service.rb
 - lib/pact_broker/version.rb

data/lib/pact_broker/doc/views/publish-verification.markdown

@@ -1,14 +0,0 @@
-# Publish pact verification
-
-Allowed methods: POST
-
-Use the `pb:publish-verification` link in the pact resource to publish the results (either success or failure) of a pact verification. The body of the request must include the success (true or false) and the provider application version that the pact was verified against. It may also include the build URL to facilitate debugging when failures occur.
-
-    POST http://broker/pacts/provider/Foo/consumer/Bar/pact-version/1234
-    {
-      success: true,
-      providerApplicationVersion: "4.5.6",
-      buildUrl: "http://my-ci.org/build/3456"
-    }
-
-Multiple verifications may be published for the same pact resource.