pact_broker 1.3.0 → 1.3.1

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

@@ -15,7 +15,7 @@ module PactBroker::Api
 
       describe "PUT" do
 
-        subject { put "/pacts/provider/Provider/consumer/Consumer/version/1.2", json, {'CONTENT_TYPE' => "application/json"} }
+        subject { put "/pacts/provider/Provider/consumer/Consumer/version/1.2", json, {'CONTENT_TYPE' => "application/json"} ; last_response }
 
         let(:response) { subject; last_response }
 
@@ -35,6 +35,20 @@ module PactBroker::Api
           end
         end
 
+        context "with validation errors" do
+
+          let(:errors) { double(:errors, full_messages: ['messages']) }
+
+          before do
+            allow_any_instance_of(Contracts::PutPactParamsContract).to receive(:validate).and_return(false)
+            allow_any_instance_of(Contracts::PutPactParamsContract).to receive(:errors).and_return(errors)
+          end
+
+          it "returns a 400 error" do
+            expect(subject).to be_a_json_error_response 'messages'
+          end
+        end
+
         context "with a potential duplicate pacticipant" do
 
           let(:pacticipant_service) { PactBroker::Services::PacticipantService }

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

@@ -6,6 +6,8 @@ module PactBroker::Api
 
     describe PactWebhooks do
 
+
+      let(:webhook_service) { PactBroker::Services::WebhookService }
       let(:uuid) { '1483234k24DKFGJ45K' }
       let(:path) { "/webhooks/provider/Some%20Provider/consumer/Some%20Consumer" }
       let(:headers) { {'CONTENT_TYPE' => 'application/json'} }
@@ -25,7 +27,7 @@ module PactBroker::Api
         let(:decorator) { instance_double(Decorators::WebhooksDecorator, to_json: json) }
 
         before do
-          allow(PactBroker::Services::WebhookService).to receive(:find_by_consumer_and_provider).and_return(webhooks)
+          allow(webhook_service).to receive(:find_by_consumer_and_provider).and_return(webhooks)
           allow(Decorators::WebhooksDecorator).to receive(:new).and_return(decorator)
         end
 
@@ -58,12 +60,13 @@ module PactBroker::Api
         end
         let(:next_uuid) { '123k2nvkkwjrwk34' }
 
-        let(:errors) { [] }
+        let(:valid) { true }
+        let(:errors) { double("errors", any?: !valid, full_messages: ['messages']) }
 
         before do
-          allow(PactBroker::Services::WebhookService).to receive(:create).and_return(saved_webhook)
-          allow(PactBroker::Services::WebhookService).to receive(:next_uuid).and_return(next_uuid)
-          allow(webhook).to receive(:validate).and_return(errors)
+          allow(webhook_service).to receive(:create).and_return(saved_webhook)
+          allow(webhook_service).to receive(:next_uuid).and_return(next_uuid)
+          allow(webhook_service).to receive(:errors).and_return(errors)
           allow(PactBroker::Models::Webhook).to receive(:new).and_return(webhook)
         end
 
@@ -117,7 +120,7 @@ module PactBroker::Api
 
         context "with invalid attributes" do
 
-          let(:errors) { ['errors'] }
+          let(:valid) { false }
 
           it "returns a 400" do
             subject
@@ -131,7 +134,7 @@ module PactBroker::Api
 
           it "returns the validation errors" do
             subject
-            expect(JSON.parse(last_response.body, symbolize_names: true)).to eq errors: errors
+            expect(JSON.parse(last_response.body, symbolize_names: true)).to eq errors: ['messages']
           end
 
         end
@@ -146,7 +149,7 @@ module PactBroker::Api
           end
 
           it "saves the webhook" do
-            expect(PactBroker::Services::WebhookService).to receive(:create).with(next_uuid, webhook, consumer, provider)
+            expect(webhook_service).to receive(:create).with(next_uuid, webhook, consumer, provider)
             subject
           end
 

data/spec/lib/pact_broker/models/webhook_request_spec.rb

@@ -137,37 +137,6 @@ module PactBroker
 
       end
 
-
-      describe "validate" do
-        let(:method) { 'POST' }
-        let(:url) { "http://example.org" }
-        subject { WebhookRequest.new(method: method, url: url)}
-        context "with a missing method" do
-          let(:method) { nil }
-          it "returns an error" do
-            expect(subject.validate.first).to eq "Missing required attribute 'method'"
-          end
-        end
-        context "with an invalid method" do
-          let(:method) { 'INVALID' }
-          it "returns an error" do
-            expect(subject.validate.first).to eq "Invalid HTTP method 'INVALID'"
-          end
-        end
-        context "with a missing url" do
-          let(:url) { nil }
-          it "returns an error" do
-            expect(subject.validate.first).to eq "Missing required attribute 'url'"
-          end
-        end
-        context "with a URL that is missing the scheme" do
-          let(:url) { "example.org" }
-          it "returns an error" do
-            expect(subject.validate.first).to eq "Invalid URL 'example.org'. Expected format: http://example.org"
-          end
-        end
-
-      end
     end
 
   end

data/spec/lib/pact_broker/models/webhook_spec.rb

@@ -12,27 +12,6 @@ module PactBroker
       let(:request) { instance_double(PactBroker::Models::WebhookRequest, execute: nil)}
       subject { Webhook.new(request: request, consumer: consumer, provider: provider,) }
 
-      describe "#validate" do
-        let(:errors) { ['errors'] }
-
-
-        context "when the request is not present" do
-          let(:request) { nil }
-
-          it "returns an error message" do
-            expect(subject.validate).to include "Missing required attribute 'request'"
-          end
-        end
-
-        context "when the request is present" do
-
-          it "validates the request" do
-            expect(request).to receive(:validate).and_return(errors)
-            expect(subject.validate).to eq errors
-          end
-        end
-      end
-
       describe "description" do
         it "returns a description of the webhook" do
           expect(subject.description).to eq "A webhook for the pact between Consumer and Provider"

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

@@ -0,0 +1,69 @@
+require 'spec_helper'
+require 'pact_broker/pacts/pact_params'
+
+module PactBroker
+  module Pacts
+    describe PactParams do
+
+      let(:body) { load_fixture('consumer-provider.json') }
+      let(:consumer_version_number) { '1.2.3' }
+      let(:headers) { { 'X-Pact-Consumer-Version' => consumer_version_number } }
+
+      describe "from_request" do
+
+        context "from a PUT request" do
+          let(:request) { Webmachine::Request.new("PUT", "/", headers, body)}
+          let(:path_info) do
+            {
+              consumer_name: 'Consumer',
+              provider_name: 'Provider',
+              consumer_version_number: '1.2.3'
+            }
+          end
+
+          subject { PactParams.from_request(request, path_info) }
+
+          it "extracts the consumer name from the path" do
+            expect(subject.consumer_name).to eq "Consumer"
+          end
+
+          it "extracts the provider name from the path" do
+            expect(subject.provider_name).to eq "Provider"
+          end
+
+          it "extracts the consumer_version_number from the path" do
+            expect(subject.consumer_version_number).to eq "1.2.3"
+          end
+
+          it "extracts the json_content" do
+            expect(subject.json_content).to eq body
+          end
+
+          it "extracts the consumer name from the pact" do
+            expect(subject.consumer_name_in_pact).to eq "A Consumer"
+          end
+
+          it "extracts the provider name from the pact" do
+            expect(subject.provider_name_in_pact).to eq "A Provider"
+          end
+
+          context "with missing data" do
+            let(:body){ '' }
+
+            it "the consumer name from the pact is nil" do
+              expect(subject.consumer_name_in_pact).to be nil
+            end
+
+            it "the provider name from the pact is nil" do
+              expect(subject.provider_name_in_pact).to be nil
+            end
+
+            it "extracts the json_content" do
+              expect(subject.json_content).to eq ''
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/spec/support/shared_examples_for_responses.rb

@@ -18,6 +18,20 @@ RSpec::Matchers.define :be_a_hal_json_success_response do
   end
 end
 
+RSpec::Matchers.define :be_a_json_response do
+  match do | actual |
+    expect(actual.headers['Content-Type']).to eq 'application/json'
+  end
+end
+
+RSpec::Matchers.define :be_a_json_error_response do | message |
+  match do | actual |
+    expect(actual.status).to be 400
+    expect(actual.headers['Content-Type']).to eq 'application/json'
+    expect(actual.body).to include message
+  end
+end
+
 RSpec::Matchers.define :be_a_404_response do
   match do | actual |
     expect(actual.status).to be 404

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -10,292 +10,306 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-14 00:00:00.000000000 Z
+date: 2014-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: roar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.12.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.12.9
+- !ruby/object:Gem::Dependency
+  name: reform
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.12'
 - !ruby/object:Gem::Dependency
   name: webmachine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: versionomy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: pact
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.2
 - !ruby/object:Gem::Dependency
   name: padrino
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.12'
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.15
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.15
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A server that stores and returns pact files generated by the pact gem.
@@ -308,8 +322,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - README.md
@@ -338,6 +353,12 @@ files:
 - lib/db.rb
 - lib/pact_broker.rb
 - lib/pact_broker/api.rb
+- lib/pact_broker/api/contracts/consumer_version_number_validation.rb
+- lib/pact_broker/api/contracts/pacticipant_name_contract.rb
+- lib/pact_broker/api/contracts/pacticipant_name_validation.rb
+- lib/pact_broker/api/contracts/put_pact_params_contract.rb
+- lib/pact_broker/api/contracts/request_validations.rb
+- lib/pact_broker/api/contracts/webhook_contract.rb
 - lib/pact_broker/api/decorators.rb
 - lib/pact_broker/api/decorators/base_decorator.rb
 - lib/pact_broker/api/decorators/basic_pacticipant_decorator.rb
@@ -381,6 +402,7 @@ files:
 - lib/pact_broker/api/resources/webhooks.rb
 - lib/pact_broker/app.rb
 - lib/pact_broker/configuration.rb
+- lib/pact_broker/constants.rb
 - lib/pact_broker/db.rb
 - lib/pact_broker/doc/controllers/app.rb
 - lib/pact_broker/doc/views/latest-pacts.markdown
@@ -407,6 +429,7 @@ files:
 - lib/pact_broker/models/webhook_execution_result.rb
 - lib/pact_broker/models/webhook_request.rb
 - lib/pact_broker/models/webhook_request_header.rb
+- lib/pact_broker/pacts/pact_params.rb
 - lib/pact_broker/project_root.rb
 - lib/pact_broker/repositories.rb
 - lib/pact_broker/repositories/pact.rb
@@ -471,9 +494,13 @@ files:
 - script/update-hal-browser
 - spec/fixtures/consumer-provider.json
 - spec/fixtures/renderer_pact.json
+- spec/fixtures/webhook_valid.json
 - spec/integration/app_spec.rb
 - spec/integration/endpoints/group.rb
 - spec/integration/endpoints/pact_put_spec.rb
+- spec/integration/endpoints/pact_webhooks_spec.rb
+- spec/lib/pact_broker/api/contracts/put_pact_params_contract_spec.rb
+- spec/lib/pact_broker/api/contracts/webhook_contract_spec.rb
 - spec/lib/pact_broker/api/decorators/latest_pact_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/pact_collection_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/pact_decorator_spec.rb
@@ -506,6 +533,7 @@ files:
 - spec/lib/pact_broker/models/pacticipant_spec.rb
 - spec/lib/pact_broker/models/webhook_request_spec.rb
 - spec/lib/pact_broker/models/webhook_spec.rb
+- spec/lib/pact_broker/pacts/pact_params_spec.rb
 - spec/lib/pact_broker/repositories/pact_repository_spec.rb
 - spec/lib/pact_broker/repositories/pacticipant_repository_spec.rb
 - spec/lib/pact_broker/repositories/tag_repository_spec.rb
@@ -578,26 +606,30 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: See description
 test_files:
 - spec/fixtures/consumer-provider.json
 - spec/fixtures/renderer_pact.json
+- spec/fixtures/webhook_valid.json
 - spec/integration/app_spec.rb
 - spec/integration/endpoints/group.rb
 - spec/integration/endpoints/pact_put_spec.rb
+- spec/integration/endpoints/pact_webhooks_spec.rb
+- spec/lib/pact_broker/api/contracts/put_pact_params_contract_spec.rb
+- spec/lib/pact_broker/api/contracts/webhook_contract_spec.rb
 - spec/lib/pact_broker/api/decorators/latest_pact_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/pact_collection_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/pact_decorator_spec.rb
@@ -630,6 +662,7 @@ test_files:
 - spec/lib/pact_broker/models/pacticipant_spec.rb
 - spec/lib/pact_broker/models/webhook_request_spec.rb
 - spec/lib/pact_broker/models/webhook_spec.rb
+- spec/lib/pact_broker/pacts/pact_params_spec.rb
 - spec/lib/pact_broker/repositories/pact_repository_spec.rb
 - spec/lib/pact_broker/repositories/pacticipant_repository_spec.rb
 - spec/lib/pact_broker/repositories/tag_repository_spec.rb