pact_broker 2.1.1 → 2.2.0

data/.travis.yml

@@ -9,12 +9,20 @@ services:
 addons:
   postgresql: "9.5"
 env:
-  - DATABASE_ADAPTER=default RUBYOPT="-W0"
-  - DATABASE_ADAPTER=postgres RUBYOPT="-W0"
-  - DATABASE_ADAPTER=mysql RUBYOPT="-W0"
+  global:
+    - CC_TEST_REPORTER_ID=dc2c30b67c9e2a5309e1aef699c30fdab55ba4f0e4f1beac029ba93e293835db
+    - GIT_COMMITTED_AT=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then git log -1 --pretty=format:%ct; else git log -1 --skip 1 --pretty=format:%ct; fi)
+  matrix:
+    - DATABASE_ADAPTER=default RUBYOPT="-W0"
+    - DATABASE_ADAPTER=postgres RUBYOPT="-W0"
+    - DATABASE_ADAPTER=mysql RUBYOPT="-W0"
 before_script:
   - cp config/database.travis.yml config/database.yml
   - psql -U postgres -c "CREATE DATABASE pact_broker;"
   - mysql -e 'CREATE DATABASE pact_broker;'
+  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+  - chmod +x ./cc-test-reporter
 script:
   - bundle exec rake
+  - if [ "$DATABASE_ADAPTER" == "postgres" ]; then ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT; fi
+  - bundle exec bundle-audit update && bundle exec bundle-audit

data/CHANGELOG.md

@@ -2,6 +2,18 @@ Do this to generate your change history
 
     $ git log --pretty=format:'  * %h - %s (%an, %ad)'
 
+#### 2.2.0 (2017-07-04)
+* 788c5d0 - chore(gems): Lock rack and red-carpet gem versions for hakiri (Beth Skurrie, Tue Jul 4 10:28:15 2017 +1000)
+* f1abebe - chore(gems): Upgrade pact gems (Beth Skurrie, Tue Jul 4 10:10:55 2017 +1000)
+* 5bccca2 - chore(gems): Upgrade rack-protection and padrino-core gems (Beth Skurrie, Tue Jul 4 10:07:58 2017 +1000)
+* 5c1392d - chore(build): Add code climate test coverage reporter (Beth Skurrie, Tue Jul 4 09:02:09 2017 +1000)
+* 6e73420 - chore(build): Add bundle-audit to build (Beth Skurrie, Tue Jul 4 08:09:49 2017 +1000)
+* de9f493 - fix(pact versions decorator): Corrected use of title and name (Beth Skurrie, Mon Jul 3 19:45:28 2017 +1000)
+* 90d4410 - feat(HTML pact): Add home link to HTML pact (Beth Skurrie, Mon Jul 3 16:57:57 2017 +1000)
+* 4eb2095 - feat(HTML pact): Add tag names next to consumer version number (Beth Skurrie, Mon Jul 3 16:56:56 2017 +1000)
+* 1f66b6d - feat(version): Add HAL links to pacts from version resource (Beth Skurrie, Mon Jul 3 16:34:34 2017 +1000)
+* 3f61fb3 - feat(retrieve latest pact): Add HAL links for latest-untagged and latest/{tag} (Beth Skurrie, Mon Jul 3 16:17:54 2017 +1000)
+
 #### 2.1.1 (2017-07-03)
 * f7af21a - fix(gemspec) (Beth Skurrie, Mon Jul 3 09:53:02 2017 +1000)
 

data/Gemfile

@@ -1,3 +1,5 @@
 source 'https://rubygems.org'
 
 gemspec
+
+gem 'simplecov', :require => false, :group => :test

data/README.md

@@ -1,6 +1,10 @@
 # Pact Broker
-
-[![Build Status](https://travis-ci.org/pact-foundation/pact_broker.svg?branch=master)](https://travis-ci.org/pact-foundation/pact_broker) [![Join the chat at https://gitter.im/pact-foundation/pact_broker](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/pact-foundation/pact_broker?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Gem Version](https://badge.fury.io/rb/pact_broker.svg)](http://badge.fury.io/rb/pact_broker)
+ [![Build Status](https://travis-ci.org/pact-foundation/pact_broker.svg?branch=master)](https://travis-ci.org/pact-foundation/pact_broker) [![Join the chat at https://gitter.im/pact-foundation/pact_broker](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/pact-foundation/pact_broker?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+ [![Code Climate](https://codeclimate.com/github/pact-foundation/pact_broker/badges/gpa.svg)](https://codeclimate.com/github/pact-foundation/pact_broker)
+ [![Test Coverage](https://codeclimate.com/github/pact-foundation/pact_broker/badges/coverage.svg)](https://codeclimate.com/github/pact-foundation/pact_broker/coverage)
+ [![Issue Count](https://codeclimate.com/github/pact-foundation/pact_broker/badges/issue_count.svg)](https://codeclimate.com/github/pact-foundation/pact_broker)
+ [![Dependency Status](https://gemnasium.com/badges/github.com/pact-foundation/pact_broker.svg)](https://gemnasium.com/github.com/pact-foundation/pact_broker)
 
 The Pact Broker provides a repository for consumer driven contracts created using the pact gem.
 
@@ -44,9 +48,15 @@ If you don't have a [Pact Broker CI Nerf Gun][nerf], you'll probably want to rea
 
 ## Documentation
 
-See the [Pact Broker Client](https://github.com/pact-foundation/pact_broker-client) for documentation on how to publish a pact to the Pact Broker, and configure the URLs in the provider project.
+See the [wiki][wiki] for documentation on the Pact Broker.
+
+## Support
 
-See the [wiki](https://github.com/pact-foundation/pact_broker/wiki) for documentation related to the Pact Broker itself.
+* Check the [wiki][wiki] first.
+* See if there is an existing or closed [issue][issues] and raise a new issue if not.
+* See if there is an existing question on [stackoverflow][stackoverflow] tagged with `pact-broker`, and ask a new question if not.
+* Have a chat to us on the Pact [gitter][gitter].
+* Tweet us at [@pact_up][twitter] on the twitters.
 
 ### Screenshots
 
@@ -101,7 +111,7 @@ In a hurry? Hate having to run your own infrastructure? Check out the [Hosted Pa
 
 #### Container solutions
 
-You can use the [Pact Broker Docker container][docker] or [Terraform on AWS][terraform] 
+You can use the [Pact Broker Docker container][docker] or [Terraform on AWS][terraform]
 
 #### Rolling your own
 
@@ -121,3 +131,8 @@ You can use the [Pact Broker Docker container][docker] or [Terraform on AWS][ter
 [docker]: https://hub.docker.com/r/dius/pact-broker
 [terraform]: https://github.com/nadnerb/terraform-pact-broker
 [hosted]: https://pact.dius.com.au/?utm_source=github&utm_campaign=GITHUB_BROKER&utm_medium=github
+[wiki]: https://github.com/pact-foundation/pact_broker/wiki
+[stackoverflow]: http://stackoverflow.com/questions/tagged/pact-broker
+[twitter]: https://twitter.com/pact_up
+[gitter]: https://gitter.im/realestate-com-au/pact
+[issues]: https://github.com/pact-foundation/pact_broker/issues

data/RELEASING.md

@@ -3,7 +3,7 @@
 1. Increment the version in `./lib/pact_broker/version.rb`
 2. Update the `CHANGELOG.md` using:
 
-      $ git log --pretty=format:'  * %h - %s (%an, %ad)' vX.Y.Z..HEAD
+      $ git log --pretty=format:'  * %h - %s (%an, %ad)'
 
 3. Add files to git
 

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

@@ -37,6 +37,14 @@ module PactBroker
           }
         end
 
+        link :'pb:consumer-version' do | options |
+          {
+            title: "Consumer version",
+            name: represented.consumer_version_number,
+            href: version_url(options.fetch(:base_url), represented.consumer_version)
+          }
+        end
+
         link :'pb:provider' do | options |
           {
             title: "Provider",
@@ -45,6 +53,7 @@ module PactBroker
           }
         end
 
+
         link :'pb:latest-pact-version' do | options |
           {
             title: "Pact",
@@ -54,6 +63,23 @@ module PactBroker
           }
         end
 
+        link :'pb:latest-untagged-pact-version' do | options |
+          {
+            title: "Pact",
+            name: "Latest untagged version of this pact",
+            href: latest_untagged_pact_url(represented, options.fetch(:base_url))
+          }
+        end
+
+        link :'pb:latest-tagged-pact-version' do | options |
+          {
+            title: "Pact",
+            name: "Latest tagged version of this pact",
+            href: "#{latest_pact_url(options.fetch(:base_url), represented)}/{tag}",
+            templated: true
+          }
+        end
+
         link :'pb:previous-distinct' do | options |
           {
             title: "Pact",
@@ -71,13 +97,6 @@ module PactBroker
           }
         end
 
-        # link :'pb:pact-versions' do | options |
-        #   {
-        #     title: "All versions of the pact between #{represented.consumer.name} and #{represented.provider.name}",
-        #     href: pact_versions_url(represented.consumer.name, represented.provider.name, options.fetch(:base_url))
-        #   }
-        # end
-
         link :'pb:pact-webhooks' do | options |
           {
             title: "Webhooks for the pact between #{represented.consumer.name} and #{represented.provider.name}",
@@ -87,14 +106,14 @@ module PactBroker
 
         link :'pb:tag-prod-version' do | options |
           {
-            title: "Tag this version as 'production'",
+            title: "PUT to this resource to tag this consumer version as 'production'",
             href: tags_url(options.fetch(:base_url), represented.consumer_version) + "/prod"
           }
         end
 
         link :'pb:tag-version' do | options |
           {
-            title: "Tag version",
+            title: "PUT to this resource to tag this consumer version",
             href: tags_url(options.fetch(:base_url), represented.consumer_version) + "/{tag}"
           }
         end

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

@@ -8,22 +8,12 @@ module PactBroker
 
     module Decorators
 
-      class EmbeddedVersionDecorator < BaseDecorator
-
-        property :number
-
-        link :self do | options |
-          version_url(options[:base_url], represented)
-        end
-      end
-
       class PactVersionDecorator < BaseDecorator
 
         include Timestamps
 
         property :consumer_version, as: :consumerVersion, embedded: true, decorator: EmbeddedVersionDecorator
 
-
         link :self do | options |
           {
             href: pact_url(options[:base_url], represented),

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

@@ -15,21 +15,24 @@ module PactBroker
         link :self do | context |
           {
             href: context[:resource_url],
-            title: "All versions of the pact between #{context[:consumer_name]} and #{context[:provider_name]}"
+            title: "Pact versions",
+            name: "All versions of the pact between #{context[:consumer_name]} and #{context[:provider_name]}"
           }
         end
 
         link :consumer do | context |
           {
             href: pacticipant_url(context[:base_url], OpenStruct.new(name: context[:consumer_name])),
-            title: context[:consumer_name]
+            title: "Consumer",
+            name: context[:consumer_name]
           }
         end
 
         link :provider do | context |
           {
             href: pacticipant_url(context[:base_url], OpenStruct.new(name: context[:provider_name])),
-            title: context[:provider_name]
+            title: "Provider",
+            name: context[:provider_name]
           }
         end
 
@@ -37,7 +40,8 @@ module PactBroker
           represented.collect do | pact |
             {
               :href => pact_url(context[:base_url], pact),
-              :title => pact.version_and_updated_date
+              :title => "Pact",
+              :name => pact.version_and_updated_date
             }
           end
         end

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

@@ -18,6 +18,14 @@ module PactBroker
           }
         end
 
+        link :'pb:pacticipant' do | options |
+          {
+            title: 'Pacticipant',
+            name: represented.pacticipant.name,
+            href: pacticipant_url(options.fetch(:base_url), represented.pacticipant)
+          }
+        end
+
         link :'pb:latest-verification-results-where-pacticipant-is-consumer' do | options |
           {
             title: "Latest verification results for consumer version",
@@ -25,12 +33,14 @@ module PactBroker
           }
         end
 
-        link :'pb:pacticipant' do | options |
-          {
-            title: 'Pacticipant',
-            name: represented.pacticipant.name,
-            href: pacticipant_url(options.fetch(:base_url), represented.pacticipant)
-          }
+        links :'pb:pact-versions' do | context |
+          sorted_pacts.collect do | pact |
+            {
+              title: "Pact",
+              name: pact.name,
+              href: pact_url(context[:base_url], pact),
+            }
+          end
         end
 
         curies do | options |
@@ -40,6 +50,12 @@ module PactBroker
             templated: true
           }]
         end
+
+        private
+
+        def sorted_pacts
+          represented.pact_publications.sort{ |a, b| a.provider_name.downcase <=> b.provider_name.downcase }
+        end
       end
     end
   end

data/lib/pact_broker/api/pact_broker_urls.rb

@@ -43,6 +43,10 @@ module PactBroker
         "#{pactigration_base_url(base_url, pact)}/latest"
       end
 
+      def latest_untagged_pact_url pact, base_url
+        "#{pactigration_base_url(base_url, pact)}/latest-untagged"
+      end
+
       def latest_pacts_url base_url
         "#{base_url}/pacts/latest"
       end

data/lib/pact_broker/api/renderers/html_pact_renderer.rb

@@ -48,7 +48,7 @@ module PactBroker
             <ul>
               <li>
                 <span class='name'>#{@pact.consumer.name} version:</span>
-                <span class='value'>#{@pact.consumer_version_number}</span>
+                <span class='value'>#{@pact.consumer_version_number}#{tags}</span>
               </li>
               <li>
                 <span class='name'>Date published:</span>
@@ -57,6 +57,9 @@ module PactBroker
               <li>
                 <a href=\"#{json_url}\">View in HAL Browser</a>
               </li>
+              <li>
+                <a href=\"/\">Home</a>
+              </li>
             </ul>
           </div>"
         end
@@ -77,6 +80,14 @@ module PactBroker
           PactBroker::Api::PactBrokerUrls.pact_url '', @pact
         end
 
+        def tags
+          if @pact.consumer_version_tag_names.any?
+            " (#{@pact.consumer_version_tag_names.join(", ")})"
+          else
+            ""
+          end
+        end
+
         def markdown
           Pact::Doc::Markdown::ConsumerContractRenderer.call consumer_contract
         rescue NotAPactError

data/lib/pact_broker/domain/pact.rb

@@ -26,6 +26,10 @@ module PactBroker
         consumer_version.pacticipant
       end
 
+      def consumer_version_tag_names
+        consumer_version.tags.collect(&:name)
+      end
+
       def to_s
         "Pact: consumer=#{consumer.name} provider=#{provider.name}"
       end

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = '2.1.1'
+  VERSION = '2.2.0'
 end

data/pact_broker.gemspec

@@ -29,16 +29,16 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'sequel', '~> 4.23'
   gem.add_runtime_dependency 'webmachine', '1.4.0'
   gem.add_runtime_dependency 'semver2', '~> 3.4.2'
-  gem.add_runtime_dependency 'rack', '< 3.0'
-  gem.add_runtime_dependency 'redcarpet', '~>3.1'
-  gem.add_runtime_dependency 'pact', '~>1.4'
-  gem.add_runtime_dependency 'pact-support', '~>0.4', '>=0.4.2'
-  gem.add_runtime_dependency 'padrino-core', '~>0.12.4'
+  gem.add_runtime_dependency 'rack', '~>2.0'
+  gem.add_runtime_dependency 'redcarpet', '>=3.3.2', '~>3.3'
+  gem.add_runtime_dependency 'pact', '~>1.14'
+  gem.add_runtime_dependency 'padrino-core', '~>0.14.1'
   gem.add_runtime_dependency 'haml', '~>4.0'
   gem.add_runtime_dependency 'sucker_punch', '~>2.0'
-  gem.add_runtime_dependency 'rack-protection', '~>1.5'
+  gem.add_runtime_dependency 'rack-protection', '~>2.0'
   gem.add_runtime_dependency 'dry-types', '~> 0.10.3' # https://travis-ci.org/pact-foundation/pact_broker/jobs/249448621
 
+  gem.add_development_dependency 'bundler-audit', '~>0.4'
   gem.add_development_dependency 'sqlite3'
   gem.add_development_dependency 'pry-byebug'
   gem.add_development_dependency 'rake', '~>10.0'

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

@@ -19,8 +19,9 @@ module PactBroker
         end
 
         let(:options) { { user_options: { base_url: 'http://example.org' } } }
+        let(:json) { EmbeddedTagDecorator.new(tag).to_json(options) }
 
-        subject { JSON.parse TagDecorator.new(tag).to_json(options), symbolize_names: true }
+        subject { JSON.parse json, symbolize_names: true }
 
         it "includes the tag name" do
           expect(subject[:name]).to eq "prod"

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

@@ -21,11 +21,11 @@ module PactBroker
           expect(subject[:_links][:self][:href]).to eq "http://example.org/pacticipants/Consumer/versions/1.2.3"
         end
 
-        xit "includes the version number in the link" do
+        it "includes the version number in the link" do
           expect(subject[:_links][:self][:name]).to eq "1.2.3"
         end
 
-        xit "includes its title in the link" do
+        it "includes its title in the link" do
           expect(subject[:_links][:self][:title]).to eq "Version"
         end
 

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

@@ -85,9 +85,18 @@ module PactBroker
             expect(subject[:_links][:'pb:latest-pact-version'][:href]).to eq "http://example.org/pacts/provider/A%20Provider/consumer/A%20Consumer/latest"
           end
 
-          xit "includes a link to the pact versions" do
-            expect(subject[:_links][:'pb:pact-versions'][:title]).to eq "All versions of the pact between A Consumer and A Provider"
-            expect(subject[:_links][:'pb:pact-versions'][:href]).to eq "http://example.org/pacts/provider/A%20Provider/consumer/A%20Consumer/versions"
+          it "includes a link to the pact version" do
+            expect(subject[:_links][:'pb:consumer-version'][:title]).to eq "Consumer version"
+            expect(subject[:_links][:'pb:consumer-version'][:name]).to eq "1234"
+            expect(subject[:_links][:'pb:consumer-version'][:href]).to eq "http://example.org/pacticipants/A%20Consumer/versions/1234"
+          end
+
+          it "includes a link to the latest untagged version" do
+            expect(subject[:_links][:'pb:latest-untagged-pact-version'][:href]).to eq "http://example.org/pacts/provider/A%20Provider/consumer/A%20Consumer/latest-untagged"
+          end
+
+          it "includes a link to the latest tagged version" do
+            expect(subject[:_links][:'pb:latest-tagged-pact-version'][:href]).to eq "http://example.org/pacts/provider/A%20Provider/consumer/A%20Consumer/latest/{tag}"
           end
 
           it "includes a link to publish a verification" do

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

@@ -9,9 +9,13 @@ module PactBroker
         let(:version) do
           TestDataBuilder.new
             .create_consumer("Consumer")
+            .create_provider("providerA")
             .create_consumer_version("1.2.3")
             .create_consumer_version_tag("prod")
-          PactBroker::Versions::Repository.new.find_by_pacticipant_name_and_number "Consumer", "1.2.3"
+            .create_pact
+            .create_provider("ProviderB")
+            .create_pact
+            .and_return(:consumer_version)
         end
 
         let(:options) { { user_options: { base_url: 'http://example.org' } } }
@@ -43,10 +47,17 @@ module PactBroker
           expect(subject[:_embedded][:tags].first[:name]).to eq "prod"
         end
 
+        it "includes a list of sorted pacts" do
+          expect(subject[:_links][:'pb:pact-versions']).to be_instance_of(Array)
+          expect(subject[:_links][:'pb:pact-versions'].first[:href]).to include ("1.2.3")
+          expect(subject[:_links][:'pb:pact-versions'].first[:name]).to include ("Pact between")
+          expect(subject[:_links][:'pb:pact-versions'].first[:name]).to include ("providerA")
+          expect(subject[:_links][:'pb:pact-versions'].last[:name]).to include ("ProviderB")
+        end
+
         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
     end
   end