pact_broker 1.14.0 → 1.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 082fae49739e644a0b575b9242ac248f63606e04
-  data.tar.gz: 19c28520e5b3076c27d7e5f806f8aafae3ba0c1d
+  metadata.gz: ee70ece82ed0bd78c3ab1d09fef1248d7686e252
+  data.tar.gz: 30b3bf57e83a827fbd7e62fb80dd4fe8414662b6
 SHA512:
-  metadata.gz: be084a3e0fb139081fdb05acd03317cd0a7b7b9617196a0a8f2c1accd2b5df18d94cc4532f4e4ac03c6613c3acaf60f8cebc5f2fc1806674f1d0c7c33049b25e
-  data.tar.gz: 0bfcd1da43d8f1ebb81fa5b5661d5632a0c82be9383b1dfc0217c338386cf4b337be32c488a41a13853e600ae647475ae0f92ac971d4f6ec5ba946deaf13b0ac
+  metadata.gz: c416ab1439d9975218b456a03f3f5cf67784f1f785f27c2a84da53022daa1fc99af14105949b8e26191180ed10487d49eff97aac5754d916e6ffaf4a91ff9108
+  data.tar.gz: 964b25fcd0b9bfabd935b5830fbad6706aab0886c554456c085ca08a47c79a2b9e165e3e231a8c68bfbbfe31b2fef2438a28c64fe55654a48c7c90cf2174d1b4

data/.travis.yml

@@ -2,3 +2,4 @@ language: ruby
 rvm:
   - 2.2.5
   - 2.3.1
+  - 2.4.0

data/CHANGELOG.md

@@ -2,6 +2,17 @@ Do this to generate your change history
 
     $ git log --pretty=format:'  * %h - %s (%an, %ad)' vX.Y.Z..HEAD
 
+#### 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)
+* 06bcbc8 - Added ruby 2.4.0 to travis.yml (Beth Skurrie, Tue Mar 28 19:09:06 2017 +1100)
+* 6d7653b - Bump pact_broker version to 1.14.0 to resolve twisted dependencies. (Tan Le, Mon Mar 27 22:36:22 2017 +1100)
+* c8eeab4 - Remove trailblazer dependency. (Tan Le, Mon Mar 27 21:56:43 2017 +1100)
+* e62c5ec - Added copyright year and owner. (Beth Skurrie, Fri Mar 24 10:39:39 2017 +1100)
+* 5007f5b - Bump trailblazer version due to roar compatibility. (Tan Le, Mon Feb 20 10:22:41 2017 +1100)
+* 4865948 - Bump reform and friends versions. (Tan Le, Wed Feb 15 09:16:29 2017 +1100)
+* 0920e45 - Add hosted pact broker to usage section in README (Matt Fellows, Sat Feb 4 11:28:36 2017 +1100)
+
 #### 1.14.0 (2017-01-30)
 * 83ac7a5 - Adds ability to delete tags (Ivan Vojinovic, Fri Jan 27 15:19:51 2017 -0500)
 

data/LICENSE.txt

@@ -1,3 +1,5 @@
+Copyright (c) 2013 Bethany Skurrie
+
 MIT License
 
 Permission is hereby granted, free of charge, to any person obtaining

data/README.md

@@ -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
+* 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). )
 * Run `git clone git@github.com:bethesque/pact_broker.git && cd pact_broker/example`
 * Run `bundle`
 * Run `bundle exec rackup -p 8080`
@@ -90,6 +90,11 @@ Use the HAL browser to view documentation as you browse.
 * Click on the HAL Browser link to have a poke around the API.
 * Click on the book icon under "docs" to view documentation related to a given relation.
 
+### Hosted
+
+In a hurry? Hate having to run your own infrastructure? Check out
+the [Hosted Pact Broker](https://pact.dius.com.au/?utm_source=github&utm_campaign=GITHUB_BROKER&utm_medium=github) - it's fast, it's secure and it's free!
+
 ### For reals
 
 You can use the [Pact Broker Docker container][docker] or [Terraform on AWS][terraform] or to roll your own...
@@ -109,4 +114,3 @@ You can use the [Pact Broker Docker container][docker] or [Terraform on AWS][ter
 [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/
 [terraform]: https://github.com/nadnerb/terraform-pact-broker
-

data/example/Gemfile

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

@@ -1,7 +1,12 @@
+require 'reform'
+require 'reform/form/dry'
+
 require 'pact_broker/version'
 require 'pact_broker/logging'
 require 'pact_broker/app'
 
 module PactBroker
-
+  Reform::Form.class_eval do
+    feature Reform::Form::Dry
+  end
 end

data/lib/pact_broker/api.rb

@@ -1,3 +1,9 @@
+require 'reform'
+require 'reform/form/dry'
+Reform::Form.class_eval do
+  feature Reform::Form::Dry
+end
+
 require 'pact_broker/api/resources/pact'
 require 'pact_broker/api/resources/latest_pact'
 require 'pact_broker/api/resources/latest_pacts'
@@ -13,11 +19,11 @@ require 'pact_broker/api/resources/webhooks'
 require 'pact_broker/api/resources/webhook'
 require 'pact_broker/api/resources/webhook_execution'
 require 'pact_broker/api/resources/version'
+require 'pact_broker/api/resources/versions'
 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 'webmachine/adapters/rack_mapped'
 
 module PactBroker
@@ -44,6 +50,7 @@ module PactBroker
         add ['pacts', 'latest'], Api::Resources::LatestPacts
         add ['pacticipants'], Api::Resources::Pacticipants
         add ['pacticipants', :name], Api::Resources::Pacticipant
+        add ['pacticipants', :pacticipant_name, 'versions'], Api::Resources::Versions
         add ['pacticipants', :pacticipant_name, 'versions', :pacticipant_version_number], Api::Resources::Version
         add ['pacticipants', :pacticipant_name, 'versions', :pacticipant_version_number, 'tags', :tag_name], Api::Resources::Tag
         add ['relationships'], Api::Resources::Relationships

data/lib/pact_broker/api/contracts/pacticipant_name_contract.rb

@@ -1,17 +1,15 @@
 require 'reform'
-require 'reform/contract'
+require 'reform/form'
 
 module PactBroker
   module Api
     module Contracts
-
-      class PacticipantNameContract < Reform::Contract
+      class PacticipantNameContract < Reform::Form
         property :name
         property :name_in_pact
         property :pacticipant
         property :message_args
 
-
         include PactBroker::Messages
 
         def blank? string

data/lib/pact_broker/api/contracts/put_pact_params_contract.rb

@@ -1,54 +1,47 @@
 require 'reform'
-require 'reform/contract'
-require 'pact_broker/messages'
-require 'pact_broker/constants'
-require 'pact_broker/api/contracts/pacticipant_name_contract'
-require 'pact_broker/api/contracts/consumer_version_number_validation'
+require 'reform/form'
 
 module PactBroker
   module Api
     module Contracts
+      class PutPacticipantNameContract < Reform::Form
+        property :name
+        property :name_in_pact
+        property :pacticipant
+        property :message_args
+
+        validation do
+          configure do
+            config.messages_file = File.expand_path("../../../locale/en.yml", __FILE__)
+          end
 
-      class PutPacticipantNameContract < PacticipantNameContract
-
-        validates :name, presence: true, blank: false
-        validate :name_in_path_matches_name_in_pact
+          required(:name).maybe
+          required(:name_in_pact).maybe
 
-        def name_in_path_matches_name_in_pact
-          if present?(name) && present?(name_in_pact)
-            if name != name_in_pact
-              errors.add(:name, validation_message('pacticipant_name_mismatch', message_args))
-            end
+          rule(name_in_path_matches_name_in_pact?: [:name, :name_in_pact]) do |name, name_in_pact|
+            name_in_pact.filled?.then(name.eql?(value(:name_in_pact)))
           end
         end
-
-        def present? string
-          string && !blank?(string)
-        end
-
       end
 
-      class PutPactParamsContract < Reform::Contract
-
-        include PactBroker::Messages
-
+      class PutPactParamsContract < Reform::Form
         property :consumer_version_number
         property :consumer, form: PutPacticipantNameContract
         property :provider, form: PutPacticipantNameContract
 
-        validates :consumer_version_number, presence: true
-        validate :consumer_version_number_valid
-
+        validation do
+          configure do
+            config.messages_file = File.expand_path("../../../locale/en.yml", __FILE__)
 
-        include ConsumerVersionNumberValidation
+            def valid_consumer_version_number?(value)
+              parsed_version_number = PactBroker.configuration.version_parser.call(value)
+              !parsed_version_number.nil?
+            end
+          end
 
-        def consumer_version_number_validation_message
-          validation_message('consumer_version_number_invalid', consumer_version_number: consumer_version_number)
+          required(:consumer_version_number).filled(:valid_consumer_version_number?)
         end
-
       end
-
-
     end
   end
 end

data/lib/pact_broker/api/contracts/request_validations.rb

@@ -8,9 +8,7 @@ module PactBroker
 
       module RequestValidations
         def method_is_valid
-          if http_method && !valid_method?
-            errors.add(:method, "is not a recognised HTTP method")
-          end
+          http_method && !valid_method?
         end
 
         def valid_method?
@@ -18,9 +16,7 @@ module PactBroker
         end
 
         def url_is_valid
-          if url && !url_valid?
-            errors.add(:url, "is not a valid URL eg. http://example.org")
-          end
+          url && !url_valid?
         end
 
         def url_valid?
@@ -28,11 +24,9 @@ module PactBroker
         end
 
         def uri
-          begin
-            URI(url)
-          rescue URI::InvalidURIError
-            nil
-          end
+          URI(url)
+        rescue URI::InvalidURIError
+          nil
         end
       end
     end

data/lib/pact_broker/api/contracts/webhook_contract.rb

@@ -1,31 +1,44 @@
 require 'reform'
-require 'reform/contract'
-require 'pact_broker/api/contracts/request_validations'
+require 'reform/form'
 
 module PactBroker
   module Api
     module Contracts
-
-      class WebhookContract < Reform::Contract
-
+      class WebhookContract < Reform::Form
         property :request
-        validates :request, presence: true
 
-        property :request do
+        validation do
+          configure do
+            config.messages_file = File.expand_path("../../../locale/en.yml", __FILE__)
+          end
 
-          include RequestValidations
+          required(:request).filled
+        end
 
+        property :request do
           property :url
           property :http_method
 
-          validates :url, presence: true
-          validates :http_method, presence: true
-
-          validate :method_is_valid
-          validate :url_is_valid
-
+          validation do
+            configure do
+              config.messages_file = File.expand_path("../../../locale/en.yml", __FILE__)
+
+              def valid_method?(value)
+                Net::HTTP.const_defined?(value.capitalize)
+              end
+
+              def valid_url?(value)
+                uri = URI(value)
+                uri.scheme && uri.host
+              rescue URI::InvalidURIError
+                false
+              end
+            end
+
+            required(:http_method).filled(:valid_method?)
+            required(:url).filled(:valid_url?)
+          end
         end
-
       end
     end
   end

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

@@ -0,0 +1,41 @@
+require_relative 'base_decorator'
+require_relative 'version_decorator'
+
+module PactBroker
+
+  module Api
+
+    module Decorators
+
+
+      class VersionsDecorator < BaseDecorator
+
+        collection :entries, as: :versions, embedded: true, :extend => PactBroker::Api::Decorators::VersionDecorator
+
+        link :self do | context |
+          {
+            href: context[:resource_url],
+            title: "All versions of the pacticipant #{context[:pacticipant_name]}"
+          }
+        end
+
+        link :pacticipant do | context |
+          {
+            href: pacticipant_url(context[:base_url], OpenStruct.new(name: context[:pacticipant_name])),
+            title: context[:pacticipant_name]
+          }
+        end
+
+        links :'versions' do | context |
+          represented.collect do | version |
+            {
+              :href => version_url(context[:base_url], version),
+              :title => version.version_and_updated_date
+            }
+          end
+        end
+
+      end
+    end
+  end
+end

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

@@ -89,6 +89,10 @@ module PactBroker
           identifier_from_path[:provider_name]
         end
 
+        def pacticipant_name
+          identifier_from_path[:pacticipant_name]
+        end
+
         def invalid_json?
           begin
             JSON.parse(request_body, PACT_PARSING_OPTIONS) #Not load! Otherwise it will try to load Ruby classes.
@@ -110,9 +114,9 @@ module PactBroker
           end
         end
 
-        def contract_validation_errors? contract
-          if (invalid = !contract.validate)
-            set_json_validation_error_messages contract.errors.full_messages
+        def contract_validation_errors? contract, pact_params
+          if (invalid = !contract.validate(pact_params))
+            set_json_validation_error_messages contract.errors.messages
           end
           invalid
         end

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

@@ -22,7 +22,7 @@ module PactBroker
 
         def to_json
           response.headers['X-Pact-Consumer-Version'] = pact.consumer_version_number
-          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 to_html

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

@@ -15,7 +15,7 @@ module PactBroker
         end
 
         def to_json
-          PactBroker::Api::Decorators::PactCollectionDecorator.new(pacts).to_json(base_url: base_url)
+          PactBroker::Api::Decorators::PactCollectionDecorator.new(pacts).to_json(user_options: { base_url: base_url })
         end
 
         def pacts
@@ -26,4 +26,4 @@ module PactBroker
     end
 
   end
-end
+end

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

@@ -21,7 +21,7 @@ module PactBroker
         end
 
         def to_json
-          PactBroker::Api::Decorators::ProviderPactsDecorator.new(pacts).to_json(decorator_context(identifier_from_path))
+          PactBroker::Api::Decorators::ProviderPactsDecorator.new(pacts).to_json(user_options: decorator_context(identifier_from_path))
         end
 
         def pacts

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

@@ -49,7 +49,7 @@ module PactBroker
         def malformed_request?
           if request.patch? || request.put?
             invalid_json? ||
-              contract_validation_errors?(Contracts::PutPactParamsContract.new(pact_params))
+              contract_validation_errors?(Contracts::PutPactParamsContract.new(pact_params), pact_params)
           else
             false
           end
@@ -73,7 +73,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 delete_resource