pact_broker 2.0.0.beta.6 → 2.0.0.beta.7

data/lib/pact_broker/pacticipants/service.rb

@@ -41,8 +41,8 @@ module PactBroker
         pacticipant_repository.find_by_name(name)
       end
 
-      def self.find_all_pacticipant_versions name
-        pacticipant_repository.find_all_pacticipant_versions(name)
+      def self.find_all_pacticipant_versions_in_reverse_order name
+        pacticipant_repository.find_all_pacticipant_versions_in_reverse_order(name)
       end
 
       def self.find_pacticipant_repository_url_by_pacticipant_name name
@@ -75,14 +75,17 @@ module PactBroker
       def self.delete name
         pacticipant = find_pacticipant_by_name name
         connection = PactBroker::Domain::Pacticipant.new.db
-        connection.run("delete from tags where version_id IN (select id from versions where pacticipant_id IN (select id from pacticipants where name = '#{name}'))")
-        connection.run("delete from pact_publications where consumer_version_id IN (select id from versions where pacticipant_id IN (select id from pacticipants where name = '#{name}'))")
-        connection.run("delete from pact_publications where provider_id IN (select id from pacticipants where name = '#{name}')")
-        connection.run("delete from pact_versions where provider_id IN (select id from pacticipants where name = '#{name}')")
-        connection.run("delete from pact_versions where consumer_id IN (select id from pacticipants where name = '#{name}')")
-        connection.run("delete from versions where pacticipant_id IN (select id from pacticipants where name = '#{name}')")
+        select_pacticipant = "select id from pacticipants where name = '#{name}'"
+        connection.run("delete from tags where version_id IN (select id from versions where pacticipant_id = #{pacticipant.id})")
+        connection.run("delete from pact_publications where consumer_version_id IN (select id from versions where pacticipant_id = #{pacticipant.id})")
+        connection.run("delete from pact_publications where provider_id = #{pacticipant.id}")
+        connection.run("delete from verifications where pact_version_id IN (select id from pact_versions where provider_id = #{pacticipant.id})")
+        connection.run("delete from verifications where pact_version_id IN (select id from pact_versions where consumer_id = #{pacticipant.id})")
+        connection.run("delete from pact_versions where provider_id = #{pacticipant.id}")
+        connection.run("delete from pact_versions where consumer_id = #{pacticipant.id}")
+        connection.run("delete from versions where pacticipant_id = #{pacticipant.id}")
         webhook_service.delete_by_pacticipant pacticipant
-        connection.run("delete from pacticipants where name = '#{name}'")
+        connection.run("delete from pacticipants where id = #{pacticipant.id}")
       end
 
       def self.pacticipant_names

data/lib/pact_broker/pacts/all_pact_publications.rb

@@ -46,11 +46,11 @@ module PactBroker
         end
 
         def consumer_version_order_before order
-          where('consumer_version_order < ?', order)
+          where(Sequel.lit("consumer_version_order < ?", order))
         end
 
         def consumer_version_order_after order
-          where('consumer_version_order > ?', order)
+          where(Sequel.lit("consumer_version_order > ?", order))
         end
 
         def latest

data/lib/pact_broker/pacts/repository.rb

@@ -49,10 +49,11 @@ module PactBroker
       end
 
       def find_all_pact_versions_between consumer_name, options
+        provider_name = options.fetch(:and)
         LatestPactPublicationsByConsumerVersion
           .eager(:tags)
           .consumer(consumer_name)
-          .provider(options.fetch(:and))
+          .provider(provider_name)
           .reverse_order(:consumer_version_order)
           .collect(&:to_domain)
       end
@@ -65,6 +66,14 @@ module PactBroker
         end
       end
 
+      # Returns latest pact version for the consumer_version_number
+      def find_by_consumer_version consumer_name, consumer_version_number
+        LatestPactPublicationsByConsumerVersion
+          .consumer(consumer_name)
+          .consumer_version_number(consumer_version_number)
+          .collect(&:to_domain_with_content)
+      end
+
       def find_by_version_and_provider version_id, provider_id
         LatestPactPublicationsByConsumerVersion
           .eager(:tags)
@@ -136,7 +145,7 @@ module PactBroker
           .consumer(pact.consumer.name)
           .provider(pact.provider.name)
           .consumer_version_order_before(pact.consumer_version.order)
-          .where('pact_version_sha != ?', current_pact_content_sha)
+          .where(Sequel.lit("pact_version_sha != ?", current_pact_content_sha))
           .latest
           .collect(&:to_domain_with_content)[0]
       end

data/lib/pact_broker/pacts/service.rb

@@ -25,6 +25,10 @@ module PactBroker
         pact_repository.find_pact(params[:consumer_name], params[:consumer_version_number], params[:provider_name], params[:revision_number])
       end
 
+      def find_by_consumer_version params
+        pact_repository.find_by_consumer_version(params[:consumer_name], params[:consumer_version_number])
+      end
+
       def delete params
         logger.info "Deleting pact version with params #{params}"
         pact_repository.delete(params)

data/lib/pact_broker/tags/repository.rb

@@ -14,12 +14,12 @@ module PactBroker
 
       def find args
         PactBroker::Domain::Tag
-          .select(:tags__name, :tags__version_id, :tags__created_at, :tags__updated_at)
+          .select(Sequel.qualify("tags", "name"), Sequel.qualify("tags", "version_id"), Sequel.qualify("tags", "created_at"), Sequel.qualify("tags", "updated_at"))
           .join(:versions, {id: :version_id})
-          .join(:pacticipants, {pacticipants__id: :versions__pacticipant_id})
-          .where(name_like(:tags__name, args.fetch(:tag_name)))
-          .where(name_like(:versions__number, args.fetch(:pacticipant_version_number)))
-          .where(name_like(:pacticipants__name, args.fetch(:pacticipant_name)))
+          .join(:pacticipants, {Sequel.qualify("pacticipants", "id") => Sequel.qualify("versions", "pacticipant_id")})
+          .where(name_like(Sequel.qualify("tags", "name"), args.fetch(:tag_name)))
+          .where(name_like(Sequel.qualify("versions", "number"), args.fetch(:pacticipant_version_number)))
+          .where(name_like(Sequel.qualify("pacticipants", "name"), args.fetch(:pacticipant_name)))
           .single_record
       end
     end

data/lib/pact_broker/verifications/repository.rb

@@ -19,7 +19,7 @@ module PactBroker
 
       def find consumer_name, provider_name, pact_version_sha, verification_number
         PactBroker::Domain::Verification
-          .join(PactBroker::Pacts::AllPactPublications, pact_version_id: :pact_version_id)
+          .join(:all_pact_publications, pact_version_id: :pact_version_id)
           .consumer(consumer_name)
           .provider(provider_name)
           .pact_version_sha(pact_version_sha)
@@ -30,15 +30,16 @@ module PactBroker
         # Use LatestPactPublicationsByConsumerVersion not AllPactPublcations because we don't
         # want verifications for shadowed revisions as it would be misleading.
         LatestVerificationsByConsumerVersion
-          .join(PactBroker::Pacts::LatestPactPublicationsByConsumerVersion, pact_version_id: :pact_version_id)
+          .join(:latest_pact_publications_by_consumer_versions, pact_version_id: :pact_version_id)
           .consumer(consumer_name)
           .consumer_version_number(consumer_version_number)
           .order(:provider_name)
+          .all
       end
 
       def find_latest_verification_for consumer_name, provider_name
         query = LatestVerificationsByConsumerVersion
-          .join(PactBroker::Pacts::AllPactPublications, pact_version_id: :pact_version_id)
+          .join(:all_pact_publications, pact_version_id: :pact_version_id)
           .consumer(consumer_name)
           .provider(provider_name)
           .latest

data/lib/pact_broker/verifications/service.rb

@@ -1,5 +1,6 @@
 require 'pact_broker/repositories'
 require 'pact_broker/api/decorators/verification_decorator'
+require 'pact_broker/verifications/summary_for_consumer_version'
 
 module PactBroker
 
@@ -9,6 +10,7 @@ module PactBroker
       extend self
 
       extend PactBroker::Repositories
+      extend PactBroker::Services
 
       def next_number_for pact
         verification_repository.verification_count_for_pact(pact) + 1
@@ -39,6 +41,12 @@ module PactBroker
       def find_latest_verification_for consumer, provider
         verification_repository.find_latest_verification_for consumer.name, provider.name
       end
+
+      def verification_summary_for_consumer_version params
+        verifications = find_latest_verifications_for_consumer_version(params)
+        pacts = pact_service.find_by_consumer_version(params)
+        SummaryForConsumerVersion.new(verifications, pacts)
+      end
     end
   end
 end

data/lib/pact_broker/verifications/summary_for_consumer_version.rb

@@ -0,0 +1,41 @@
+module PactBroker
+  module Verifications
+    class SummaryForConsumerVersion
+
+      attr_reader :verifications
+
+      def initialize verifications, pacts
+        @verifications = verifications
+        @pacts = pacts
+      end
+
+      def success
+        successful.count == pacts.count
+      end
+
+      def provider_summary
+        OpenStruct.new(
+          successful: successful,
+          failed: failed,
+          unknown: unknown
+          )
+      end
+
+      private
+
+      attr_reader :pacts
+
+      def successful
+        verifications.select(&:success).collect(&:provider_name)
+      end
+
+      def failed
+        verifications.select{|verification| !verification.success }.collect(&:provider_name)
+      end
+
+      def unknown
+        pacts.collect(&:provider_name) - verifications.collect(&:provider_name)
+      end
+    end
+  end
+end

data/lib/pact_broker/version.rb

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

data/lib/pact_broker/versions/parse_semantic_version.rb

@@ -1,18 +1,28 @@
 require 'semver'
+require 'pact_broker/configuration'
 
 module PactBroker
   module Versions
     class ParseSemanticVersion
-      SEMVER_FORMAT = "%M.%m.%p%s%d"
+
 
       def self.call string_version
-        version = ::SemVer.parse(string_version, SEMVER_FORMAT)
-        return SemVerWrapper.new(version) unless version.nil?
+        PactBroker.configuration.semver_formats.each do |semver_format|
+          parsed_version = ::SemVer.parse(string_version, semver_format)
+          return SemVerWrapper.new(parsed_version, semver_format) unless parsed_version.nil?
+        end
+        nil
       end
 
       class SemVerWrapper < SimpleDelegator
+
+        def initialize target, semver_format
+          super target
+          @semver_format = semver_format
+        end
+
         def to_s
-          format(SEMVER_FORMAT)
+          format(@semver_format)
         end
       end
     end

data/lib/pact_broker/versions/repository.rb

@@ -14,7 +14,7 @@ module PactBroker
 
       def find_by_pacticipant_name_and_number pacticipant_name, number
         PactBroker::Domain::Version
-          .select(:versions__id, :versions__number, :versions__pacticipant_id, :versions__order, :versions__created_at, :versions__updated_at)
+          .select(Sequel[:versions][:id], Sequel[:versions][:number], Sequel[:versions][:pacticipant_id], Sequel[:versions][:order], Sequel[:versions][:created_at], Sequel[:versions][:updated_at])
           .join(:pacticipants, {id: :pacticipant_id})
           .where(name_like(:number, number))
           .where(name_like(:name, pacticipant_name))

data/lib/pact_broker/webhooks/job.rb

@@ -0,0 +1,46 @@
+require 'sucker_punch'
+require 'pact_broker/webhooks/service'
+require 'pact_broker/logging'
+
+module PactBroker
+  module Webhooks
+    class Job
+
+      BACKOFF_TIMES = [10, 60, 120, 300, 600, 1200] #10 sec, 1 min, 2 min, 5 min, 10 min, 20 min => 38 minutes
+
+      include SuckerPunch::Job
+      include PactBroker::Logging
+
+      def perform data
+        @webhook = data[:webhook]
+        @error_count = data[:error_count] || 0
+        begin
+          webhook_execution_result = PactBroker::Webhooks::Service.execute_webhook_now webhook
+          reschedule_job unless webhook_execution_result.success?
+        rescue StandardError => e
+          handle_error e
+        end
+      end
+
+      private
+
+      attr_reader :webhook, :error_count
+
+      def handle_error e
+        log_error e
+        reschedule_job
+      end
+
+      def reschedule_job
+        case error_count
+        when 0...BACKOFF_TIMES.size
+          logger.debug "Re-enqeuing job for webhook #{webhook.uuid} to run in #{BACKOFF_TIMES[error_count]} seconds"
+          Job.perform_in(BACKOFF_TIMES[error_count], {webhook: webhook, error_count: error_count+1})
+        else
+          logger.error "Failed to execute webhook #{webhook.uuid} after #{BACKOFF_TIMES.size} times."
+        end
+      end
+
+    end
+  end
+end

data/lib/pact_broker/webhooks/service.rb

@@ -1,6 +1,8 @@
 require 'pact_broker/repositories'
 require 'pact_broker/logging'
+require 'pact_broker/webhooks/job'
 require 'base64'
+require 'securerandom'
 
 module PactBroker
 
@@ -50,6 +52,7 @@ 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
@@ -57,15 +60,13 @@ module PactBroker
         end
       end
 
-      # TODO background job?
       def self.run_later webhooks
-        Thread.new do
-          webhooks.each do | webhook |
-            begin
-              webhook.execute
-            rescue StandardError => e
-              # Exceptions are already logged, no need to log again.
-            end
+        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
           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)
+        values.merge(headers: parsed_headers, body: parsed_body, password: plain_text_password, uuid: uuid)
       end
 
       def plain_text_password

data/pact_broker.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'httparty', '~> 0.14'
   gem.add_runtime_dependency 'json', '> 1.8', '< 3.0'
   gem.add_runtime_dependency 'roar', '~> 1.1'
-  gem.add_runtime_dependency 'reform', '~> 2.2.0'
+  gem.add_runtime_dependency 'reform', '~> 2.2'
   gem.add_runtime_dependency 'dry-validation', '~> 0.10.5'
   gem.add_runtime_dependency 'sequel', '~> 4.23'
   gem.add_runtime_dependency 'webmachine', '1.4.0'
@@ -35,9 +35,10 @@ Gem::Specification.new do |gem|
   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', '~>1.3'
-  gem.add_development_dependency 'pry'
+  gem.add_development_dependency 'sqlite3'
+  gem.add_development_dependency 'pry-byebug'
   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",
-    "provider_state": "an error occurs while publishing a pact",
+    "providerState": "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'",
-    "provider_state": "the 'Pricing Service' does not exist in the pact-broker",
+    "providerState": "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",
-      "provider_state": "the 'Pricing Service' does not exist in the pact-broker",
+      "providerState": "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'",
-    "provider_state": "the 'Pricing Service' already exists in the pact-broker",
+    "providerState": "the 'Pricing Service' already exists in the pact-broker",
     "request": {
       "method": "get",
       "path": "/pacticipant/Pricing%20Service/repository_url",

data/script/foo-bar.json

@@ -0,0 +1,22 @@
+{
+  "consumer": {
+    "name": "Foo"
+  },
+  "provider": {
+    "name": "Bar"
+  },
+  "interactions": [
+    {
+      "description" : "a request for something",
+      "providerState": null,
+      "request": {
+        "method": "get",
+        "path" : "/something"
+      },
+      "response": {
+        "status": 200,
+        "body" : "something"
+      }
+    }
+  ]
+}

data/script/publish-new.sh

@@ -0,0 +1,7 @@
+# set -x
+BODY=$(ruby -e "require 'json'; j = JSON.parse(File.read('script/foo-bar.json')); j['interactions'][0]['providerState'] = 'it is ' + Time.now.to_s; puts j.to_json")
+echo ${BODY} >> tmp.json
+curl -v -XPUT \-H "Content-Type: application/json" \
+-d@tmp.json \
+http://127.0.0.1:9292/pacts/provider/Bar/consumer/Foo/version/1.0.0
+rm tmp.json