pact_broker 1.18.0 → 2.0.0.beta.1

data/lib/pact_broker/pacts/service.rb

@@ -22,7 +22,7 @@ module PactBroker
       end
 
       def find_pact params
-        pact_repository.find_pact(params[:consumer_name], params[:consumer_version_number], params[:provider_name])
+        pact_repository.find_pact(params[:consumer_name], params[:consumer_version_number], params[:provider_name], params[:revision_number])
       end
 
       def delete params
@@ -104,7 +104,7 @@ module PactBroker
 
       def create_pact params, version, provider
         logger.info "Creating new pact version with params #{params}"
-        pact = pact_repository.create json_content: params[:json_content], version_id: version.id, provider_id: provider.id
+        pact = pact_repository.create json_content: params[:json_content], version_id: version.id, provider_id: provider.id, consumer_id: version.pacticipant_id
         trigger_webhooks pact
         pact
       end

data/lib/pact_broker/repositories.rb

@@ -27,6 +27,11 @@ module PactBroker
       Webhooks::Repository.new
     end
 
+    def verification_repository
+      require 'pact_broker/verifications/repository'
+      Verifications::Repository.new
+    end
+
     extend self
   end
 end

data/lib/pact_broker/services.rb

@@ -31,5 +31,10 @@ module PactBroker
       require 'pact_broker/versions/service'
       Versions::Service
     end
+
+    def verification_service
+      require 'pact_broker/verifications/service'
+      Verifications::Service
+    end
   end
 end

data/lib/pact_broker/ui/view_models/relationship.rb

@@ -1,5 +1,6 @@
 require 'pact_broker/api/pact_broker_urls'
 require 'pact_broker/ui/helpers/url_helper'
+require 'pact_broker/date_helper'
 
 module PactBroker
   module UI
@@ -32,6 +33,43 @@ module PactBroker
           "#{pactigration_base_url('', @relationship)}/latest"
         end
 
+        def last_verified_date
+          if @relationship.ever_verified?
+            date = @relationship.latest_verification.execution_date
+            PactBroker::DateHelper.distance_of_time_in_words(date, DateTime.now) + " ago"
+          else
+            ""
+          end
+        end
+
+        def verification_status
+          return "" unless @relationship.ever_verified?
+          if @relationship.latest_verification_successful?
+            if @relationship.pact_changed_since_last_verification?
+              "warning"
+            else
+              "success"
+            end
+          else
+            "danger"
+          end
+        end
+
+        def warning?
+          verification_status == 'warning'
+        end
+
+        def verification_tooltip
+          return nil unless @relationship.ever_verified?
+          if warning?
+            "Pact has changed since last successful verification by #{provider_name} (v#{@relationship.latest_verification_provider_version})"
+          elsif @relationship.latest_verification_successful?
+            "Successfully verified by #{provider_name} (v#{@relationship.latest_verification_provider_version})"
+          elsif !@relationship.latest_verification_successful?
+            "Verification by #{provider_name} (v#{@relationship.latest_verification_provider_version}) failed"
+          end
+        end
+
         def <=> other
           comp = consumer_name.downcase <=> other.consumer_name.downcase
           return comp unless comp == 0

data/lib/pact_broker/ui/views/relationships/show.haml

@@ -5,6 +5,7 @@
   %link{rel: 'stylesheet', href: '/stylesheets/relationships.css'}
   %script{type: 'text/javascript', src:'/javascripts/jquery-2.1.1.min.js'}
   %script{type: 'text/javascript', src:'/javascripts/jquery.tablesorter.min.js'}
+  %script{type: 'text/javascript', src:'/js/bootstrap.min.js'}
 %body
   %nav.navbase-default.navbar-right{role: "navigation"}
     .container
@@ -27,6 +28,8 @@
           Provider
           %span.glyphicon.glyphicon-sort.relationships-sort
         %th
+        %th
+          Last verified
       %tbody
 
       - relationships.each do | relationship |
@@ -42,6 +45,11 @@
             %a{:href => relationship.provider_group_url}
               = relationship.provider_name
           %td
+          %td{class: relationship.verification_status}
+            %div{title: relationship.verification_tooltip, "data-toggle": "tooltip", "data-placement": "left"}
+              = relationship.last_verified_date
+              - if relationship.warning?
+                %span.glyphicon.glyphicon-warning-sign{'aria-hidden':true}
     %div.relationships-size
       = relationships.size_label
 
@@ -52,4 +60,5 @@
 
   $(document).ready(function(){
     $("span.pact").load("/images/doc-text.svg");
+    $('[data-toggle="tooltip"]').tooltip();
   });

data/lib/pact_broker/verifications/repository.rb

@@ -0,0 +1,45 @@
+require 'sequel'
+require 'pact_broker/domain/verification'
+
+module PactBroker
+  module Verifications
+    class Repository
+
+      include PactBroker::Repositories::Helpers
+
+      class LatestVerifications < PactBroker::Domain::Verification
+        set_dataset(:latest_verifications)
+      end
+
+      def create verification, pact
+        verification.pact_version_id = pact_version_id_for(pact)
+        verification.save
+      end
+
+      def verification_count_for_pact pact
+        PactBroker::Domain::Verification.where(pact_version_id: pact_version_id_for(pact)).count
+      end
+
+      def find_latest_verifications_for_consumer_version consumer_name, consumer_version_number
+        LatestVerifications
+          .join(PactBroker::Pacts::LatestPactPublicationsByConsumerVersion, pact_version_id: :pact_version_id)
+          .where(name_like(:consumer_name, consumer_name))
+          .where(consumer_version_number: consumer_version_number)
+          .order(:provider_name)
+      end
+
+      def find_latest_verification_for consumer_name, provider_name
+        query = LatestVerifications
+          .join(PactBroker::Pacts::AllPactPublications, pact_version_id: :pact_version_id)
+          .consumer(consumer_name)
+          .provider(provider_name)
+          .latest
+          query.first
+      end
+
+      def pact_version_id_for pact
+        PactBroker::Pacts::PactPublication.select(:pact_version_id).where(id: pact.id)
+      end
+    end
+  end
+end

data/lib/pact_broker/verifications/service.rb

@@ -0,0 +1,40 @@
+require 'pact_broker/repositories'
+require 'pact_broker/api/decorators/verification_decorator'
+
+module PactBroker
+
+  module Verifications
+    module Service
+
+      extend self
+
+      extend PactBroker::Repositories
+
+      def next_number_for pact
+        verification_repository.verification_count_for_pact(pact) + 1
+      end
+
+      def create next_verification_number, params, pact
+        PactBroker.logger.info "Creating verification #{next_verification_number} for pact_id=#{pact.id} from params #{params}"
+        verification = PactBroker::Domain::Verification.new
+        PactBroker::Api::Decorators::VerificationDecorator.new(verification).from_hash(params)
+        verification.number = next_verification_number
+        verification_repository.create(verification, pact)
+      end
+
+      def errors params
+        contract = PactBroker::Api::Contracts::VerificationContract.new(PactBroker::Domain::Verification.new)
+        contract.validate(params)
+        contract.errors
+      end
+
+      def find_latest_verifications_for_consumer_version params
+        verification_repository.find_latest_verifications_for_consumer_version params[:consumer_name], params[:consumer_version_number]
+      end
+
+      def find_latest_verification_for consumer, provider
+        verification_repository.find_latest_verification_for consumer.name, provider.name
+      end
+    end
+  end
+end

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = '1.18.0'
+  VERSION = '2.0.0.beta.1'
 end

data/lib/pact_broker/versions/parse_semantic_version.rb

@@ -1,17 +1,20 @@
-require 'versionomy'
+require 'semver'
 
 module PactBroker
   module Versions
     class ParseSemanticVersion
+      SEMVER_FORMAT = "%M.%m.%p%s%d"
 
       def self.call string_version
-        begin
-          ::Versionomy.parse(string_version)
-        rescue ::Versionomy::Errors::ParseError => e
-          nil
-        end
+        version = ::SemVer.parse(string_version, SEMVER_FORMAT)
+        return SemVerWrapper.new(version) unless version.nil?
       end
 
+      class SemVerWrapper < SimpleDelegator
+        def to_s
+          format(SEMVER_FORMAT)
+        end
+      end
     end
   end
 end

data/lib/pact_broker/webhooks/service.rb

@@ -1,8 +1,6 @@
 require 'pact_broker/repositories'
 require 'pact_broker/logging'
-require 'pact_broker/webhooks/job'
 require 'base64'
-require 'securerandom'
 
 module PactBroker
 
@@ -52,7 +50,6 @@ module PactBroker
 
       def self.execute_webhooks pact
         webhooks = webhook_repository.find_by_consumer_and_provider pact.consumer, pact.provider
-
         if webhooks.any?
           run_later(webhooks)
         else
@@ -60,13 +57,15 @@ module PactBroker
         end
       end
 
+      # TODO background job?
       def self.run_later webhooks
-        webhooks.each do | webhook |
-          begin
-            logger.info "Scheduling job for #{webhook.description} with uuid #{webhook.uuid}"
-            Job.perform_async webhook: webhook
-          rescue StandardError => e
-            log_error e
+        Thread.new do
+          webhooks.each do | webhook |
+            begin
+              webhook.execute
+            rescue StandardError => e
+              # Exceptions are already logged, no need to log again.
+            end
           end
         end
       end

data/lib/pact_broker/webhooks/webhook.rb

@@ -46,7 +46,7 @@ module PactBroker
       end
 
       def request_attributes
-        values.merge(headers: parsed_headers, body: parsed_body, password: plain_text_password, uuid: uuid)
+        values.merge(headers: parsed_headers, body: parsed_body, password: plain_text_password)
       end
 
       def plain_text_password

data/pact_broker.gemspec

@@ -28,17 +28,16 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'dry-validation', '~> 0.10.5'
   gem.add_runtime_dependency 'sequel', '~> 4.23'
   gem.add_runtime_dependency 'webmachine', '1.4.0'
-  gem.add_runtime_dependency 'versionomy', '~> 0.4'
+  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 'haml', '~>4.0'
-  gem.add_runtime_dependency 'sucker_punch', '~>2.0'
 
-  gem.add_development_dependency 'sqlite3'
-  gem.add_development_dependency 'pry-byebug'
+  gem.add_development_dependency 'sqlite3', '~>1.3'
+  gem.add_development_dependency 'pry'
   gem.add_development_dependency 'rake', '~>10.0'
   gem.add_development_dependency 'fakefs', '~>0.4'
   gem.add_development_dependency 'mysql2', '~>0.3.15'

data/pact_broker_client-pact_broker.json

@@ -35,7 +35,7 @@
   },
   {
     "description": "a request to publish a pact",
-    "providerState": "an error occurs while publishing a pact",
+    "provider_state": "an error occurs while publishing a pact",
     "request": {
       "method": "put",
       "path": "/pacticipant/Condor/versions/1.3.0/pacts/Pricing%20Service",
@@ -72,7 +72,7 @@
   },
   {
     "description": "a request to retrieve the repository URL of the 'Pricing Service'",
-    "providerState": "the 'Pricing Service' does not exist in the pact-broker",
+    "provider_state": "the 'Pricing Service' does not exist in the pact-broker",
     "request": {
       "method": "get",
       "path": "/pacticipant/Pricing%20Service/repository_url",
@@ -90,7 +90,7 @@
 
     {
       "description": "a request to register the repository URL of a pacticipant",
-      "providerState": "the 'Pricing Service' does not exist in the pact-broker",
+      "provider_state": "the 'Pricing Service' does not exist in the pact-broker",
       "request": {
         "method": "patch",
         "path": "/pacticipant/Pricing%20Service",
@@ -108,7 +108,7 @@
     },
   {
     "description": "a request to retrieve the repository URL of the 'Pricing Service'",
-    "providerState": "the 'Pricing Service' already exists in the pact-broker",
+    "provider_state": "the 'Pricing Service' already exists in the pact-broker",
     "request": {
       "method": "get",
       "path": "/pacticipant/Pricing%20Service/repository_url",

data/script/publish.sh

@@ -1,3 +1,3 @@
 curl -v -XPUT \-H "Content-Type: application/json" \
--d@script/foo-bar.json \
-http://127.0.0.1:9292/pacts/provider/Bar/consumer/Foo/version/1.0.0
+-d@spec/fixtures/a_consumer-a_provider.json \
+http://localhost:9292/pacts/provider/A%20Provider/consumer/A%20Consumer/version/1.0.0

data/script/record_verification.sh

@@ -0,0 +1,3 @@
+curl -v -XPOST \-H "Content-Type: application/json" \
+-d@spec/fixtures/record_verification.json \
+http://127.0.0.1:9292/pacts/provider/Animal%20Service/consumer/Zoo%20App/version/1.0.2/verifications

data/spec/features/delete_pact_spec.rb

@@ -12,7 +12,7 @@ describe "Deleting a pact" do
     end
 
     it "deletes the pact" do
-      expect{ subject }.to change{ PactBroker::Pacts::DatabaseModel.count }.by(-1)
+      expect{ subject }.to change{ PactBroker::Pacts::PactPublication.count }.by(-1)
     end
 
     it "returns a 204" do

data/spec/features/get_verifications_for_consumer_version_spec.rb

@@ -0,0 +1,33 @@
+require 'spec/support/provider_state_builder'
+
+describe "Get verifications for consumer version" do
+
+  let(:path) { "/pacts/consumer/Consumer/versions/1.2.3/verifications/latest" }
+  let(:last_response_body) { JSON.parse(subject.body, symbolize_names: true) }
+
+  subject { get path; last_response }
+
+  context "when the consumer exists" do
+
+    before do
+      ProviderStateBuilder.new
+        .create_provider("Provider")
+        .create_consumer("Consumer")
+        .create_consumer_version("1.2.3")
+        .create_pact
+        .create_verification(number: 1)
+        .create_verification(number: 2)
+        .create_provider("Another provider")
+        .create_pact
+        .create_verification(number: 1)
+    end
+
+    it "returns a 200 HAL JSON response" do
+      expect(subject).to be_a_hal_json_success_response
+    end
+
+    it "returns a list of verifications" do
+      expect(last_response_body[:_embedded][:verifications].size).to eq 2
+    end
+  end
+end

data/spec/features/publish_verification_spec.rb

@@ -0,0 +1,28 @@
+require 'pact_broker/domain/verification'
+
+describe "Recording a pact verification" do
+
+  let(:path) { "/pacts/provider/Provider/consumer/Consumer/pact-version/#{pact.pact_version_sha}/verifications" }
+  let(:verification_content) { load_fixture('verification.json') }
+  let(:parsed_response_body) { JSON.parse(subject.body) }
+
+  subject { post path, verification_content, {'CONTENT_TYPE' => 'application/json' }; last_response  }
+
+  let(:pact) do
+    ProviderStateBuilder.new
+      .create_provider("Provider")
+      .create_consumer("Consumer")
+      .create_consumer_version("1.2.3")
+      .create_pact
+      .revise_pact
+      .and_return(:pact)
+  end
+
+  it "Responds with a 201 Created" do
+    expect(subject.status).to be 201
+  end
+
+  it "saves a verification against the pact" do
+    expect { subject }.to change { PactBroker::Domain::Verification.count }.by(1)
+  end
+end