pact_broker 2.0.0.beta.4 → 2.0.0.beta.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2167ca7ab46b105cbf292057696ea0abbaa8e0d
-  data.tar.gz: 303b9317c8f757e4dbec194632384c77fd6fb066
+  metadata.gz: 4416650392293dcec2b6643adfcac1af250c4cd7
+  data.tar.gz: a8ef1ac554a59b0093ee7be152dd0e59eca3d88c
 SHA512:
-  metadata.gz: 030dc5cf549ba6929960d4ce9a987d8bb3307bf7a8af9c4bfb33561c0f41f584baa16e277e86775d253aad86e899e445af95164940b974a7ac29143fb677a060
-  data.tar.gz: 73a47ffa728bead6bbea0eafe648fa6505b55769791d65e48b9ab71e35341e7bf90b509e95a5c9a6c1a03b9e6f3b6ec3d7559493e9d7b43d52e54e26844dabac
+  metadata.gz: b796e57abf4302c523549f6ab23403ea7f3cdc51cde324fc1f8bc03ce7527fa02cd75def279dd18b6a8e6a8a132b86670ffc24776c1152b9bd91c86f6d32a497
+  data.tar.gz: 8032820522881d1c03054d12311d99746733533cc6f7bcadbcaf979212d6a45dcd8dc02fd1bb8c76c40c9794419d1338bd560f5e722d3f80144378e6b50e88ef

data/CHANGELOG.md

@@ -2,6 +2,9 @@ Do this to generate your change history
 
     $ git log --pretty=format:'  * %h - %s (%an, %ad)' vX.Y.Z..HEAD
 
+#### 2.0.0.beta.5 (2017-05-08)
+* 4b88c4d - Add success flag to the resource for the latest verifications for a consumer version to indicate the overall success or failure of the verification results for that version. (Beth Skurrie, Mon May 8 10:54:31 2017 +1000)
+
 #### 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)
@@ -26,6 +29,13 @@ Do this to generate your change history
 * 77eaf7b - Added pb:latest-verifications link to version resource. (Beth Skurrie, Tue Apr 11 16:25:45 2017 +1000)
 * aaf44d9 - Added endpoint to view the latest verifications for a given consumer version. (Beth Skurrie, Tue Apr 11 11:16:03 2017 +1000)
 
+#### 1.17.2 (2017-05-04)
+* b8f45e1 - fix issue with pact document link not displaying #94 (Matt Fellows, Wed May 3 11:23:09 2017 +1000)
+
+#### 1.17.1 (2017-05-02)
+* 7576bc2 - Fix 500 error in webhooks endpoint. (Beth Skurrie, Tue May 2 14:35:06 2017 +1000)
+* 7351ec8 - Add restrictions for all gem versions in gemspec. Fix formatting in haml file. (Beth Skurrie, Thu Apr 27 19:55:04 2017 +1000)
+
 #### 1.17.0 (2017-04-26)
 * 5cbb9da - Added pb:publish-pact to HAL index (Beth Skurrie, Wed Apr 26 08:39:15 2017 +1000)
 * 36842d1 - Set database connection timezone to UTC in example config.ru (Beth Skurrie, Tue Apr 25 16:18:58 2017 +1000)

data/README.md

@@ -112,5 +112,5 @@ You can use the [Pact Broker Docker container][docker] or [Terraform on AWS][ter
 [pact]: https://github.com/realestate-com-au/pact
 [nerf]: https://github.com/bethesque/pact_broker/wiki/pact-broker-ci-nerf-gun
 [different-teams]: https://github.com/realestate-com-au/pact/wiki/Using-pact-where-the-consumer-team-is-different-from-the-provider-team
-[docker]: https://registry.hub.docker.com/u/dius/pact_broker/
+[docker]: https://hub.docker.com/r/dius/pact-broker
 [terraform]: https://github.com/nadnerb/terraform-pact-broker

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

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

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

@@ -5,14 +5,16 @@ module PactBroker
     module Decorators
       class VerificationDecorator < BaseDecorator
 
-        property :success
+        property :provider_name, as: :providerName, writeable: :false
         property :provider_version, as: :providerApplicationVersion
+        property :success
+        property :execution_date, as: :verificationDate
         property :build_url, as: :buildUrl
 
         link :self do | options |
           {
             title: 'Verification result',
-            name: represented.number,
+            name: "Verification result #{represented.number} for #{represented.latest_pact_publication.name}",
             href: verification_url(represented, options.fetch(:base_url), )
           }
         end
@@ -24,6 +26,10 @@ module PactBroker
             href: pact_url(options.fetch(:base_url), represented.latest_pact_publication)
           }
         end
+
+        def provider_name
+          represented.provider_name
+        end
       end
     end
   end

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

@@ -7,6 +7,7 @@ module PactBroker
 
       class VerificationsDecorator < BaseDecorator
 
+        property :success, exec_context: :decorator, if: :any_verifications?
         collection :entries, as: :'verification-results', embedded: true, :extend => PactBroker::Api::Decorators::VerificationDecorator
 
         link :self do | context |
@@ -15,6 +16,14 @@ module PactBroker
             title: "Latest verification results for consumer #{context.fetch(:consumer_name)} version #{context.fetch(:consumer_version_number)}"
           }
         end
+
+        def success
+          represented.collect(&:success).all?
+        end
+
+        def any_verifications? context
+          represented.any?
+        end
       end
     end
   end

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

@@ -33,7 +33,7 @@ module PactBroker
 
         def from_json
           created_model = pacticipant_service.create params
-          response.body = decorator_for(created_model).to_json(decorator_context)
+          response.body = decorator_for(created_model).to_json(user_options: decorator_context)
         end
 
         def create_path

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

@@ -22,7 +22,7 @@ module PactBroker
         end
 
         def to_json
-          PactBroker::Api::Decorators::PactDecorator.new(pact).to_json(base_url: base_url)
+          PactBroker::Api::Decorators::PactDecorator.new(pact).to_json(user_options: {base_url: base_url})
         end
 
         def pact

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

@@ -16,7 +16,7 @@ module PactBroker
         end
 
         def to_json
-          Decorators::WebhooksDecorator.new(webhooks).to_json(decorator_context(resource_title: "Webhooks"))
+          Decorators::WebhooksDecorator.new(webhooks).to_json(user_options: decorator_context(resource_title: "Webhooks"))
         end
 
         def webhooks

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

@@ -0,0 +1,14 @@
+# Publish pact verification result
+
+Allowed methods: POST
+
+Use the `pb:publish-verification-results` 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/pacts/all_pact_publications.rb

@@ -9,6 +9,10 @@ module PactBroker
 
     class AllPactPublications < Sequel::Model(:all_pact_publications)
 
+      extend Forwardable
+
+      def_delegators :cached_domain, :name
+
       set_primary_key :id
       associate(:one_to_many, :tags, :class => "PactBroker::Domain::Tag", :reciprocal => :version, :key => :version_id, :primary_key => :consumer_version_id)
       associate(:many_to_one, :pact_version, :key => :pact_version_sha, :primary_key => :sha)
@@ -90,6 +94,12 @@ module PactBroker
         end
       end
 
+      private
+
+      def cached_domain
+        @cached_domain ||= to_domain
+      end
+
     end
 
   end

data/lib/pact_broker/pacts/pact_version.rb

@@ -22,7 +22,7 @@ module PactBroker
       end
 
       def latest_pact_publication
-        latest_consumer_version.latest_pact_publication
+        PactBroker::Pacts::LatestPactPublicationsByConsumerVersion.where(pact_version_id: id).order(:consumer_version_order).last
       end
 
       def consumer_versions

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = '2.0.0.beta.4'
+  VERSION = '2.0.0.beta.5'
 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-result'][:href]).to match %r{http://example.org/.*/verification-results}
+            expect(subject[:_links][:'pb:publish-verification-results'][: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

@@ -14,7 +14,8 @@ module PactBroker
             consumer_name: 'Consumer',
             build_url: 'http://build-url',
             pact_version: pact_version,
-            latest_pact_publication: pact_publication)
+            latest_pact_publication: pact_publication,
+            execution_date: DateTime.now)
         end
 
         let(:pact_version) do

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

@@ -13,7 +13,8 @@ module PactBroker
             provider_name: 'provider',
             consumer_name: 'consumer',
             pact_version: pact_version,
-            latest_pact_publication: pact)
+            latest_pact_publication: pact,
+            execution_date: DateTime.now)
         end
         let(:pact_version) do
           instance_double("PactBroker::Pacts::PactVersion", sha: '1234', name: 'Name')
@@ -35,6 +36,18 @@ module PactBroker
         it "includes a link to itself" do
           expect(subject[:_links][:self][:href]).to eq "http://self"
         end
+
+        it "includes a flag to indicate the overall success or failure of all the verification results" do
+          expect(subject[:success]).to be true
+        end
+
+        context "when there are no verifications" do
+          let(:verifications) { [] }
+
+          it "does not include a flag to indicate the overall success or failure of all the verification results" do
+            expect(subject).to_not have_key(:success)
+          end
+        end
       end
     end
   end

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

@@ -68,7 +68,7 @@ module PactBroker
 
             it "creates a JSON representation of the new pacticipant" do
               expect(decorator_class).to receive(:new).with(created_model)
-              expect(decorator).to receive(:to_json).with(instance_of(Decorators::DecoratorContext))
+              expect(decorator).to receive(:to_json).with(user_options: instance_of(Decorators::DecoratorContext))
               subject
             end
 

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

@@ -27,7 +27,7 @@ module PactBroker::Api
 
         it "generates a JSON representation of the webhook" do
           expect(Decorators::WebhooksDecorator).to receive(:new).with(webhooks)
-          expect(decorator).to receive(:to_json).with(instance_of(Decorators::DecoratorContext))
+          expect(decorator).to receive(:to_json).with(user_options: instance_of(Decorators::DecoratorContext))
           subject
         end
 

data/spec/lib/pact_broker/pacts/pact_version_spec.rb

@@ -19,7 +19,30 @@ module PactBroker
       end
 
       describe "#latest_pact_publication" do
+        before do
+          ProviderStateBuilder.new
+            .create_provider("Bar")
+            .create_consumer("Foo")
+            .create_consumer_version("1.2.100")
+            .create_pact
+            .revise_pact
+            .create_consumer_version("1.2.101")
+            .create_pact
+            .create_consumer_version("1.2.102")
+            .create_pact
+            .revise_pact
+            .create_provider("Animals")
+            .create_pact
+            .create_provider("Wiffles")
+            .create_pact
+        end
 
+        it "returns the latest pact publication for the given pact version" do
+          pact = PactBroker::Pacts::Repository.new.find_pact("Foo", "1.2.102", "Animals")
+          pact_version = PactBroker::Pacts::PactVersion.find(sha: pact.pact_version_sha)
+          latest_pact_publication = pact_version.latest_pact_publication
+          expect(latest_pact_publication.id).to eq pact.id
+        end
       end
 
       describe "#latest_consumer_version_number" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta.4
+  version: 2.0.0.beta.5
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-02 00:00:00.000000000 Z
+date: 2017-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -512,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-result.markdown
+- lib/pact_broker/doc/views/publish-verification-results.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
@@ -794,7 +794,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: See description

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

@@ -1,14 +0,0 @@
-# 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.