pact_broker 1.15.0 → 1.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee70ece82ed0bd78c3ab1d09fef1248d7686e252
-  data.tar.gz: 30b3bf57e83a827fbd7e62fb80dd4fe8414662b6
+  metadata.gz: 6ec4bf1313472e88e1f22f7fb9856b56bec60eb8
+  data.tar.gz: 8f2b0b91cfd1a495ffd64485685cbf0308e95aea
 SHA512:
-  metadata.gz: c416ab1439d9975218b456a03f3f5cf67784f1f785f27c2a84da53022daa1fc99af14105949b8e26191180ed10487d49eff97aac5754d916e6ffaf4a91ff9108
-  data.tar.gz: 964b25fcd0b9bfabd935b5830fbad6706aab0886c554456c085ca08a47c79a2b9e165e3e231a8c68bfbbfe31b2fef2438a28c64fe55654a48c7c90cf2174d1b4
+  metadata.gz: 9e223d0c5472b1eccd80e8fc4e388d0d8d00fc5c315ac4ff741321fb9053157b99cddd86fed3b895e12a75d9b0828796715d1fd2754c7eacb0719703cbac4ffc
+  data.tar.gz: aeee301687d838c763786b54c5fa05da34907dd45bd53b278e67b02f3ef51bb23651cfafc460fa1d05b2b491d83867fc8b1de029534011cace5cdbfed4728ee5

data/CHANGELOG.md

@@ -2,6 +2,13 @@ Do this to generate your change history
 
     $ git log --pretty=format:'  * %h - %s (%an, %ad)' vX.Y.Z..HEAD
 
+#### 1.16.0 (2017-04-10)
+* 990575f - Added HTML content type for request to get a specific version of a pact. As per request in https://github.com/bethesque/pact_broker/issues/82 (Beth Skurrie, Mon Apr 10 15:34:28 2017 +1000)
+* b47b8d8 - Use /versions rather than /version in test endpoint. Singular will be deprecated. (Beth Skurrie, Fri Apr 7 16:03:19 2017 +1000)
+* dd4daee - Removed version restriction for pact_broker gem in the example Gemfile. This will avoid a repetition of the twisted dependencies fixed by https://github.com/bethesque/pact_broker/pull/84 (Beth Skurrie, Tue Apr 4 09:53:39 2017 +1000)
+* e447b3f - Updated sqlite database. (Beth Skurrie, Mon Apr 3 08:25:41 2017 +1000)
+* 149efc0 - Update REAME to reflect 2.4 support. (Tan Le, Fri Mar 31 21:42:47 2017 +1100)
+
 #### 1.15.0 (2017-03-28)
 * 588c33e - Adds versions decorator spec (Ivan Vojinovic, Wed Feb 22 00:00:46 2017 -0500)
 * c4a7daf - Adds pacticipant versions endpoint (Ivan Vojinovic, Tue Feb 21 21:15:39 2017 -0500)

data/README.md

@@ -2,9 +2,9 @@
 
 [![Build Status](https://travis-ci.org/bethesque/pact_broker.svg?branch=master)](https://travis-ci.org/bethesque/pact_broker) [![Join the chat at https://gitter.im/bethesque/pact_broker](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/bethesque/pact_broker?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
-The Pact Broker provides a repository for consumer driven contracts created using the pact gem. 
+The Pact Broker provides a repository for consumer driven contracts created using the pact gem.
 
-It: 
+It:
 
 * solves the problem of how to share pacts between consumer and provider projects
 * allows you to [decouple your service release cycles][decouple]
@@ -80,7 +80,7 @@ Use the HAL browser to view documentation as you browse.
 
 ### To have a play around on your local machine
 
-* Install ruby 1.9.3 or later and bundler >= 1.12.0 (NOTE! Currently broken on ruby 2.4.0. See [issue 78](https://github.com/bethesque/pact_broker/issues/78). )
+* Install ruby 1.9.3 or later and bundler >= 1.12.0
 * Run `git clone git@github.com:bethesque/pact_broker.git && cd pact_broker/example`
 * Run `bundle`
 * Run `bundle exec rackup -p 8080`

data/example/Gemfile

@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
 
-gem 'pact_broker', '~> 1.14'
+gem 'pact_broker'
 gem 'sqlite3' # Replace with your choice of database driver eg. gem "pg"
 gem 'thin' # Keep, or replace with your choice of web server

data/lib/pact_broker/api.rb

@@ -37,7 +37,7 @@ module PactBroker
         # Todo, rename /version/ to /versions
         add ['pacts', 'provider', :provider_name, 'consumer', :consumer_name, 'latest'], Api::Resources::LatestPact
         add ['pacts', 'provider', :provider_name, 'consumer', :consumer_name, 'latest', :tag], Api::Resources::LatestPact
-        add ['pacts', 'provider', :provider_name, 'consumer', :consumer_name, 'version', :consumer_version_number], Api::Resources::Pact # Deprecate
+        add ['pacts', 'provider', :provider_name, 'consumer', :consumer_name, 'version', :consumer_version_number], Api::Resources::Pact # Deprecate, singular version
         add ['pacts', 'provider', :provider_name, 'consumer', :consumer_name, 'versions', :consumer_version_number], Api::Resources::Pact
         add ['pacts', 'provider', :provider_name, 'consumer', :consumer_name, 'versions'], Api::Resources::PactVersions
         add ['pacts', 'provider', :provider_name, 'consumer', :consumer_name, 'version', :consumer_version_number, 'previous-distinct'], Api::Resources::PreviousDistinctPactVersion
@@ -45,7 +45,7 @@ module PactBroker
         add ['pacts', 'provider', :provider_name, 'latest'], Api::Resources::LatestProviderPacts
         add ['pacts', 'provider', :provider_name, 'latest', :tag], Api::Resources::LatestProviderPacts
 
-        add ['pact', 'provider', :provider_name, 'consumer', :consumer_name, 'version', :consumer_version_number], Api::Resources::Pact
+        add ['pact', 'provider', :provider_name, 'consumer', :consumer_name, 'version', :consumer_version_number], Api::Resources::Pact # Deprecate, singular /pact
         add ['pact', 'provider', :provider_name, 'consumer', :consumer_name, 'latest'], Api::Resources::LatestPact
         add ['pacts', 'latest'], Api::Resources::LatestPacts
         add ['pacticipants'], Api::Resources::Pacticipants

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

@@ -1,6 +1,7 @@
 require_relative 'base_decorator'
 require_relative 'embedded_version_decorator'
 require 'pact_broker/api/decorators/timestamps'
+require 'pact_broker/domain'
 
 module PactBroker
 

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

@@ -18,14 +18,6 @@ module PactBroker
           }
         end
 
-        link :self do | options |
-          {
-            title: 'Version',
-            name: represented.number,
-            href: version_url(options.fetch(:base_url), represented)
-          }
-        end
-
         link :pacticipant do | options |
           {
             title: 'Pacticipant',

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

@@ -24,7 +24,8 @@ module PactBroker
         include PacticipantResourceMethods
 
         def content_types_provided
-          [["application/json", :to_json]]
+          [["application/json", :to_json],
+           ["text/html", :to_html]]
         end
 
         def content_types_accepted
@@ -76,6 +77,10 @@ module PactBroker
           PactBroker::Api::Decorators::PactDecorator.new(pact).to_json(user_options: { base_url: base_url })
         end
 
+        def to_html
+          PactBroker.configuration.html_pact_renderer.call(pact)
+        end
+
         def delete_resource
           pact_service.delete(pact_params)
           true

data/lib/pact_broker/{services/group_service.rb → groups/service.rb}

@@ -3,8 +3,8 @@ require 'pact_broker/relationships/groupify'
 
 module PactBroker
 
-  module Services
-    module GroupService
+  module Groups
+    module Service
 
       extend self
 

data/lib/pact_broker/{repositories/pacticipant_repository.rb → pacticipants/repository.rb}

@@ -3,10 +3,10 @@ require 'pact_broker/domain/pacticipant'
 require 'pact_broker/repositories/helpers'
 
 module PactBroker
-  module Repositories
-    class PacticipantRepository
+  module Pacticipants
+    class Repository
 
-      include Helpers
+      include PactBroker::Repositories::Helpers
 
       def find_by_name name
         PactBroker::Domain::Pacticipant.where(name_like(:name, name)).single_record

data/lib/pact_broker/{services/pacticipant_service.rb → pacticipants/service.rb}

@@ -6,8 +6,8 @@ require 'pact_broker/pacticipants/find_potential_duplicate_pacticipant_names'
 
 module PactBroker
 
-  module Services
-    class PacticipantService
+  module Pacticipants
+    class Service
 
       extend PactBroker::Repositories
       extend PactBroker::Services

data/lib/pact_broker/repositories.rb

@@ -1,19 +1,16 @@
 require 'pact_broker/domain'
-require 'pact_broker/repositories/pacticipant_repository'
-require 'pact_broker/repositories/version_repository'
 require 'pact_broker/pacts/repository'
-require 'pact_broker/repositories/tag_repository'
-require 'pact_broker/repositories/webhook_repository'
-
 
 module PactBroker
   module Repositories
     def pacticipant_repository
-      PacticipantRepository.new
+      require 'pact_broker/pacticipants/repository'
+      Pacticipants::Repository.new
     end
 
     def version_repository
-      VersionRepository.new
+      require 'pact_broker/versions/repository'
+      Versions::Repository.new
     end
 
     def pact_repository
@@ -21,11 +18,13 @@ module PactBroker
     end
 
     def tag_repository
-      TagRepository.new
+      require 'pact_broker/tags/repository'
+      Tags::Repository.new
     end
 
     def webhook_repository
-      WebhookRepository.new
+      require 'pact_broker/webhooks/repository'
+      Webhooks::Repository.new
     end
 
     extend self

data/lib/pact_broker/services.rb

@@ -1,9 +1,3 @@
-require 'pact_broker/services/pacticipant_service'
-require 'pact_broker/services/tag_service'
-require 'pact_broker/services/group_service'
-require 'pact_broker/services/webhook_service'
-require 'pact_broker/services/version_service'
-
 module PactBroker
   module Services
 
@@ -14,23 +8,28 @@ module PactBroker
     end
 
     def pacticipant_service
-      PacticipantService
+      require 'pact_broker/pacticipants/service'
+      Pacticipants::Service
     end
 
     def tag_service
-      TagService
+      require 'pact_broker/tags/service'
+      Tags::Service
     end
 
     def group_service
-      GroupService
+      require 'pact_broker/groups/service'
+      Groups::Service
     end
 
     def webhook_service
-      WebhookService
+      require 'pact_broker/webhooks/service'
+      Webhooks::Service
     end
 
     def version_service
-      VersionService
+      require 'pact_broker/versions/service'
+      Versions::Service
     end
   end
 end

data/lib/pact_broker/{repositories/tag_repository.rb → tags/repository.rb}

@@ -3,10 +3,10 @@ require 'pact_broker/repositories/helpers'
 
 
 module PactBroker
-  module Repositories
-    class TagRepository
+  module Tags
+    class Repository
 
-      include Helpers
+      include PactBroker::Repositories::Helpers
 
       def create args
         Domain::Tag.new(name: args.fetch(:name), version: args.fetch(:version)).save

data/lib/pact_broker/{services/tag_service.rb → tags/service.rb}

@@ -2,8 +2,8 @@ require 'pact_broker/repositories'
 
 module PactBroker
 
-  module Services
-    module TagService
+  module Tags
+    module Service
 
       extend self
 
@@ -28,4 +28,4 @@ module PactBroker
     end
   end
 
-end
+end

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = '1.15.0'
+  VERSION = '1.16.0'
 end

data/lib/pact_broker/{repositories/version_repository.rb → versions/repository.rb}

@@ -1,12 +1,12 @@
 require 'sequel'
 require 'pact_broker/domain/version'
-require 'pact_broker/repositories/tag_repository'
+require 'pact_broker/tags/repository'
 
 module PactBroker
-  module Repositories
-    class VersionRepository
+  module Versions
+    class Repository
 
-      include Helpers
+      include PactBroker::Repositories::Helpers
 
       def find_by_pacticipant_id_and_number pacticipant_id, number
         PactBroker::Domain::Version.where(number: number, pacticipant_id: pacticipant_id).single_record

data/lib/pact_broker/{services/version_service.rb → versions/service.rb}

@@ -2,8 +2,8 @@ require 'pact_broker/repositories'
 
 module PactBroker
 
-  module Services
-    class VersionService
+  module Versions
+    class Service
 
       extend PactBroker::Repositories
 

data/lib/pact_broker/{repositories/webhook_repository.rb → webhooks/repository.rb}

@@ -2,13 +2,13 @@ require 'sequel'
 require 'pact_broker/domain/webhook'
 require 'pact_broker/domain/pacticipant'
 require 'pact_broker/db'
-require 'pact_broker/repositories/webhook'
+require 'pact_broker/webhooks/webhook'
 
 
 module PactBroker
-  module Repositories
+  module Webhooks
 
-    class WebhookRepository
+    class Repository
 
       include Repositories
 
@@ -17,7 +17,7 @@ module PactBroker
         db_webhook.uuid = uuid
         db_webhook.save
         webhook.request.headers.each_pair do | name, value |
-          db_webhook.add_header WebhookHeader.from_domain(name, value, db_webhook.id)
+          db_webhook.add_header PactBroker::Webhooks::WebhookHeader.from_domain(name, value, db_webhook.id)
         end
         find_by_uuid db_webhook.uuid
       end

data/lib/pact_broker/{services/webhook_service.rb → webhooks/service.rb}

@@ -4,8 +4,8 @@ require 'base64'
 
 module PactBroker
 
-  module Services
-    class WebhookService
+  module Webhooks
+    class Service
 
       extend Repositories
       include Logging

data/lib/pact_broker/{repositories → webhooks}/webhook.rb

@@ -3,13 +3,13 @@ require 'pact_broker/domain/webhook'
 require 'pact_broker/domain/pacticipant'
 
 module PactBroker
-  module Repositories
+  module Webhooks
     class Webhook < Sequel::Model
 
       set_primary_key :id
       associate(:many_to_one, :provider, :class => "PactBroker::Domain::Pacticipant", :key => :provider_id, :primary_key => :id)
       associate(:many_to_one, :consumer, :class => "PactBroker::Domain::Pacticipant", :key => :consumer_id, :primary_key => :id)
-      one_to_many :headers, :class => "PactBroker::Repositories::WebhookHeader", :reciprocal => :webhook
+      one_to_many :headers, :class => "PactBroker::Webhooks::WebhookHeader", :reciprocal => :webhook
 
       def before_destroy
         WebhookHeader.where(webhook_id: id).destroy

data/spec/features/publish_not_a_pact_spec.rb

@@ -1,6 +1,6 @@
 describe "Publishing a contract that is not a pact" do
 
-  let(:path) { "/pacts/provider/A%20Provider/consumer/A%20Consumer/version/1.2.3" }
+  let(:path) { "/pacts/provider/A%20Provider/consumer/A%20Consumer/versions/1.2.3" }
   let(:parsed_response_body) { JSON.parse(subject.body) }
 
   subject { put path, pact_content, {'CONTENT_TYPE' => 'application/json' }; last_response  }

data/spec/features/publish_pact_spec.rb

@@ -1,7 +1,7 @@
 describe "Publishing a pact" do
 
   let(:pact_content) { load_fixture('a_consumer-a_provider.json') }
-  let(:path) { "/pacts/provider/A%20Provider/consumer/A%20Consumer/version/1.2.3" }
+  let(:path) { "/pacts/provider/A%20Provider/consumer/A%20Consumer/versions/1.2.3" }
   let(:response_body_json) { JSON.parse(subject.body) }
 
   subject { put path, pact_content, {'CONTENT_TYPE' => 'application/json' }; last_response  }

data/spec/features/update_pacticipant_spec.rb

@@ -22,5 +22,4 @@ xdescribe "Publishing a pact" do
       expect(subject.status).to be 404
     end
   end
-
 end

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

@@ -1,5 +1,5 @@
 require 'pact_broker/api/decorators/embedded_tag_decorator'
-require 'pact_broker/repositories/tag_repository'
+require 'pact_broker/tags/repository'
 require 'support/provider_state_builder'
 
 module PactBroker
@@ -15,7 +15,7 @@ module PactBroker
             .create_consumer("Consumer")
             .create_version("1.2.3")
             .create_tag("prod")
-          PactBroker::Repositories::TagRepository.new.find(tag_name: 'prod', pacticipant_version_number: '1.2.3', pacticipant_name: 'Consumer')
+          PactBroker::Tags::Repository.new.find(tag_name: 'prod', pacticipant_version_number: '1.2.3', pacticipant_name: 'Consumer')
         end
 
         let(:options) { { user_options: { base_url: 'http://example.org' } } }

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

@@ -10,7 +10,7 @@ module PactBroker
           ProviderStateBuilder.new
             .create_consumer("Consumer")
             .create_version("1.2.3")
-          PactBroker::Repositories::VersionRepository.new.find_by_pacticipant_name_and_number "Consumer", "1.2.3"
+          PactBroker::Versions::Repository.new.find_by_pacticipant_name_and_number "Consumer", "1.2.3"
         end
 
         let(:options) { { user_options: { base_url: 'http://example.org' } } }

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

@@ -1,5 +1,5 @@
 require 'pact_broker/api/decorators/tag_decorator'
-require 'pact_broker/repositories/tag_repository'
+require 'pact_broker/tags/repository'
 
 require 'support/provider_state_builder'
 
@@ -16,7 +16,7 @@ module PactBroker
             .create_consumer("Consumer")
             .create_version("1.2.3")
             .create_tag("prod")
-          PactBroker::Repositories::TagRepository.new.find tag_name: 'prod', pacticipant_version_number: '1.2.3', pacticipant_name: 'Consumer'
+          PactBroker::Tags::Repository.new.find tag_name: 'prod', pacticipant_version_number: '1.2.3', pacticipant_name: 'Consumer'
         end
 
         let(:options) { { user_options: { base_url: 'http://example.org' } } }