pact_broker 2.12.0 → 2.13.0

data/lib/pact_broker/error.rb

@@ -0,0 +1,5 @@
+module PactBroker
+
+  class Error < StandardError; end
+
+end

data/lib/pact_broker/matrix/parse_query.rb

@@ -7,10 +7,10 @@ module PactBroker
         params = Rack::Utils.parse_nested_query(query)
         selectors = (params['q'] || []).collect do |i|
           p = {}
-          p[:pacticipant_name] = i['pacticipant'] if i['pacticipant']
-          p[:pacticipant_version_number] = i['version'] if i['version']
+          p[:pacticipant_name] = i['pacticipant'] if i['pacticipant'] && i['pacticipant'] != ''
+          p[:pacticipant_version_number] = i['version'] if i['version'] && i['version'] != ''
           p[:latest] = true if i['latest'] == 'true'
-          p[:tag] = i['tag'] if i['tag']
+          p[:tag] = i['tag'] if i['tag'] && i['tag'] != ''
           p
         end
         options = {}
@@ -22,19 +22,16 @@ module PactBroker
         if params.key?('success') && params['success'].is_a?(String)
           options[:success] = [params['success'] == '' ? nil : params['success'] == 'true']
         end
-        if params.key?('scope')
-          options[:scope] = params['scope']
-        end
-        if params.key?('latestby')
+        if params.key?('latestby') && params['latestby'] != ''
           options[:latestby] = params['latestby']
         end
-        if params.key?('limit')
+        if params.key?('limit') && params['limit'] != ''
           options[:limit] = params['limit']
         end
-        if params.key?('latest')
+        if params.key?('latest') && params['latest'] != ''
           options[:latest] = params['latest']
         end
-        if params.key?('tag')
+        if params.key?('tag') && params['tag'] != ''
           options[:tag] = params['tag']
         end
         return selectors, options

data/lib/pact_broker/matrix/repository.rb

@@ -1,9 +1,13 @@
 require 'pact_broker/repositories/helpers'
 require 'pact_broker/matrix/row'
 require 'pact_broker/matrix/latest_row'
+require 'pact_broker/error'
 
 module PactBroker
   module Matrix
+
+    class Error < PactBroker::Error; end
+
     class Repository
       include PactBroker::Repositories::Helpers
       include PactBroker::Repositories
@@ -78,7 +82,7 @@ module PactBroker
           # resource validation currently stops tag being specified without latest=true
           if selector[:tag] && selector[:latest]
             version = version_repository.find_by_pacticpant_name_and_latest_tag(selector[:pacticipant_name], selector[:tag])
-            raise "Could not find version with tag #{selector[:tag].inspect} for #{selector[:pacticipant_name]}" unless version
+            raise Error.new("Could not find version with tag #{selector[:tag].inspect} for #{selector[:pacticipant_name]}") unless version
             # validation in resource should ensure we always have a version
             {
               pacticipant_name: selector[:pacticipant_name],
@@ -122,37 +126,6 @@ module PactBroker
           .flatten
           .uniq
       end
-
-      # def where_row_matches_selectors selectors, query
-      #   if selectors.size == 1
-      #     where_consumer_or_provider_is(selectors.first, query)
-      #   else
-      #     where_consumer_and_provider_in(selectors, query)
-      #   end
-      # end
-
-      # def where_consumer_and_provider_in selectors, query
-      #     query.where{
-      #       Sequel.&(
-      #         Sequel.|(
-      #           *selectors.collect{ |s| s[:pacticipant_version_number] ? Sequel.&(consumer_name: s[:pacticipant_name], consumer_version_number: s[:pacticipant_version_number]) :  Sequel.&(consumer_name: s[:pacticipant_name]) }
-      #         ),
-      #         Sequel.|(
-      #           *(selectors.collect{ |s| s[:pacticipant_version_number] ? Sequel.&(provider_name: s[:pacticipant_name], provider_version_number: s[:pacticipant_version_number]) :  Sequel.&(provider_name: s[:pacticipant_name]) } +
-      #             selectors.collect{ |s| Sequel.&(provider_name: s[:pacticipant_name], provider_version_number: nil) })
-      #         )
-      #       )
-      #     }
-      # end
-
-      # def where_consumer_or_provider_is s, query
-      #   query.where{
-      #     Sequel.|(
-      #       s[:pacticipant_version_number] ? Sequel.&(consumer_name: s[:pacticipant_name], consumer_version_number: s[:pacticipant_version_number]) :  Sequel.&(consumer_name: s[:pacticipant_name]),
-      #       s[:pacticipant_version_number] ? Sequel.&(provider_name: s[:pacticipant_name], provider_version_number: s[:pacticipant_version_number]) :  Sequel.&(provider_name: s[:pacticipant_name])
-      #     )
-      #   }
-      # end
     end
   end
 end

data/lib/pact_broker/matrix/service.rb

@@ -16,6 +16,26 @@ module PactBroker
         matrix_repository.find_for_consumer_and_provider params[:consumer_name], params[:provider_name]
       end
 
+      def find_for_consumer_and_provider_with_tags params
+        consumer_criteria = {
+          pacticipant_name: params[:consumer_name],
+          tag: params[:tag],
+          latest: true
+        }
+        provider_criteria = {
+          pacticipant_name: params[:provider_name],
+          tag: params[:provider_tag],
+          latest: true
+        }
+        selectors = [consumer_criteria, provider_criteria]
+        options = { latestby: 'cvpv' }
+        if validate_selectors(selectors).empty?
+          matrix_repository.find(selectors, options).first
+        else
+          nil
+        end
+      end
+
       def find_compatible_pacticipant_versions criteria
         matrix_repository.find_compatible_pacticipant_versions criteria
       end
@@ -24,9 +44,7 @@ module PactBroker
         error_messages = []
 
         selectors.each do | s |
-          if s[:pacticipant_name].nil? && s[:pacticipant_version_number].nil?
-            error_messages << "Please specify the pacticipant name and version"
-          elsif s[:pacticipant_name].nil?
+          if s[:pacticipant_name].nil?
             error_messages << "Please specify the pacticipant name"
           else
             if s.key?(:pacticipant_version_number) && s.key?(:latest)

data/lib/pact_broker/pacts/repository.rb

@@ -103,13 +103,20 @@ module PactBroker
       end
 
       def find_pact consumer_name, consumer_version, provider_name, pact_version_sha = nil
-        query = pact_version_sha ? AllPactPublications.pact_version_sha(pact_version_sha) : LatestPactPublicationsByConsumerVersion
+        query = if pact_version_sha
+          AllPactPublications
+            .pact_version_sha(pact_version_sha)
+            .reverse_order(:consumer_version_order)
+            .limit(1)
+        else
+          LatestPactPublicationsByConsumerVersion
+        end
         query = query
           .eager(:tags)
           .consumer(consumer_name)
           .provider(provider_name)
         query = query.consumer_version_number(consumer_version) if consumer_version
-        query.limit(1).collect(&:to_domain_with_content)[0]
+        query.collect(&:to_domain_with_content)[0]
       end
 
       def find_all_revisions consumer_name, consumer_version, provider_name

data/lib/pact_broker/pacts/service.rb

@@ -102,7 +102,7 @@ module PactBroker
         updated_pact = pact_repository.update existing_pact.id, params
 
         if existing_pact.json_content != updated_pact.json_content
-          webhook_service.execute_webhooks updated_pact
+          webhook_service.execute_webhooks updated_pact, PactBroker::Webhooks::WebhookEvent::CONTRACT_CONTENT_CHANGED
         end
 
         updated_pact
@@ -117,7 +117,7 @@ module PactBroker
 
       def trigger_webhooks pact
         if pact_has_changed_since_previous_version? pact
-          webhook_service.execute_webhooks pact
+          webhook_service.execute_webhooks pact, PactBroker::Webhooks::WebhookEvent::CONTRACT_CONTENT_CHANGED
         end
       end
     end

data/lib/pact_broker/services.rb

@@ -56,5 +56,10 @@ module PactBroker
       require 'pact_broker/matrix/service'
       Matrix::Service
     end
+
+    def certificate_service
+      require 'pact_broker/certificates/service'
+      Certificates::Service
+    end
   end
 end

data/lib/pact_broker/ui/app.rb

@@ -3,8 +3,22 @@ require 'pact_broker/ui/controllers/groups'
 require 'pact_broker/ui/controllers/matrix'
 require 'pact_broker/doc/controllers/app'
 
+
 module PactBroker
   module UI
+    class PathInfoFixer
+      PATH_INFO = 'PATH_INFO'.freeze
+
+      def initialize app
+        @app = app
+      end
+
+      def call env
+        env[PATH_INFO] = '/' if env[PATH_INFO] == ''
+        @app.call(env)
+      end
+    end
+
     class App
 
       def initialize
@@ -23,6 +37,7 @@ module PactBroker
           end
 
           map "/matrix" do
+            use PathInfoFixer
             run PactBroker::UI::Controllers::Matrix
           end
 

data/lib/pact_broker/ui/controllers/matrix.rb

@@ -1,5 +1,7 @@
 require 'pact_broker/ui/controllers/base_controller'
 require 'pact_broker/ui/view_models/matrix_line'
+require 'pact_broker/matrix/parse_query'
+require 'pact_broker/logging'
 require 'haml'
 
 module PactBroker
@@ -8,20 +10,73 @@ module PactBroker
       class Matrix < Base
 
         include PactBroker::Services
+        include PactBroker::Logging
+
+        get "/" do
+          selectors = [OpenStruct.new, OpenStruct.new]
+          options = { limit: 100, latestby: 'cvpv' }
+          locals = {
+            lines: [],
+            title: "The Matrix",
+            selectors: create_selector_objects(selectors),
+            options: create_options_model(options)
+          }
+          begin
+            if params[:q]
+              selectors, options = PactBroker::Matrix::ParseQuery.call(request.env['QUERY_STRING'])
+              locals[:selectors] = create_selector_objects(selectors)
+              locals[:options] = create_options_model(options)
+              errors = matrix_service.validate_selectors(selectors)
+              if errors.empty?
+                lines = matrix_service.find(selectors, options)
+                locals[:lines] = lines.collect{ |line| PactBroker::UI::ViewDomain::MatrixLine.new(line) }
+              else
+                locals[:errors] = errors
+              end
+            end
+          rescue StandardError => e
+            log_error(e) unless e.is_a?(PactBroker::Error)
+            locals[:errors] = [e.message]
+          end
+          haml :'matrix/show', {locals: locals, layout: :'layouts/main'}
+        end
 
         get "/provider/:provider_name/consumer/:consumer_name" do
           selectors = [{ pacticipant_name: params[:consumer_name] }, { pacticipant_name: params[:provider_name] } ]
-          lines = matrix_service.find(selectors, {latestby: 'cvpv', limit: 1000})
-          lines = lines.collect{|line| PactBroker::UI::ViewDomain::MatrixLine.new(line) }.sort
+          options = {latestby: 'cvpv', limit: 100}
+          lines = matrix_service.find(selectors, options)
+          lines = lines.collect{ |line| PactBroker::UI::ViewDomain::MatrixLine.new(line) }.sort
           locals = {
             lines: lines,
             title: "The Matrix",
             consumer_name: params[:consumer_name],
-            provider_name: params[:provider_name]
+            provider_name: params[:provider_name],
+            selectors: create_selector_objects(selectors),
+            options: create_options_model(options)
           }
           haml :'matrix/show', {locals: locals, layout: :'layouts/main'}
         end
 
+        def create_selector_objects(selector_hashes)
+          selector_hashes.collect do | selector_hash |
+            o = OpenStruct.new(selector_hash)
+            o.tag_disabled = o.tag ? nil : 'disabled'
+            o.version_disabled = o.pacticipant_version_number ? nil : 'disabled'
+            o.specify_latest_tag_checked = o.tag ? 'checked' : nil
+            o.specify_latest_checked = o.latest ? 'checked' : nil
+            o.specify_version_checked = o.pacticipant_version_number ? 'checked' : nil
+            o.specify_all_versions_checked = !(o.tag || o.pacticipant_version_number) ? 'checked' : nil
+            o
+          end
+        end
+
+        def create_options_model(options)
+          o = OpenStruct.new(options)
+          o.cvpv_checked = o.latestby == 'cvpv' ? 'checked' : nil
+          o.cvp_checked = o.latestby == 'cvp' ? 'checked' : nil
+          o.all_rows_checked = o.latestby.nil? ? 'checked' : nil
+          o
+        end
       end
     end
   end

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

@@ -1,13 +1,78 @@
 %body
   %link{rel: 'stylesheet', href: '/css/bootstrap.min.css'}
   %link{rel: 'stylesheet', href: '/stylesheets/index.css'}
+  %link{rel: 'stylesheet', href: '/stylesheets/matrix.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:'/javascripts/matrix.js'}
   %script{type: 'text/javascript', src:'/js/bootstrap.min.js'}
 
+-# This code is an embarassment. Sorry. Just trying to get as much stuff done in the little time I have.
+
 .container
   %h1.page-header
     = title
+
+  - if defined?(errors) && errors.any?
+    - errors.each do | error |
+      %div.alert.alert-danger
+        = error
+
+  %form{action: '/matrix', onsubmit:'return onSubmit()'}
+    - selectors.each_with_index do | selector, index |
+      .selector
+        %label{for: "pacticipant#{index}"}
+          Pacticipant name
+        %input{name: 'q[]pacticipant', id: "pacticipant1#{index}", value: selector.pacticipant_name}
+
+        .input-group
+          %input{type: 'radio', name: "ignorethis#{index}", class: 'specify-all-versions version-selectorizor', value: 'all_versions', id: "pacticipant#{index}_all_versions", checked: selector.specify_all_versions_checked}
+          %label{for: "pacticipant#{index}_all_versions"}
+            All versions
+
+        .input-group
+          %input{type: 'radio', name: "ignorethis#{index}", class: 'specify-version version-selectorizor', value: 'version', id: "pacticipant#{index}_by_version", checked: selector.specify_version_checked}
+          %label{for: "pacticipant#{index}_by_version"}
+            Version
+          %input{name: 'q[]version', type: 'text', id: "pacticipant#{index}_version", class: 'by-version', value: selector.pacticipant_version_number}
+
+        .input-group
+          %input{type: 'radio', name: "ignorethis#{index}", class: 'specify-latest version-selectorizor', value: 'tag', id: "pacticipant#{index}_latest", checked: selector.specify_latest_checked}
+          %label{for: "pacticipant#{index}_latest"}
+            Latest version
+          %input{name: 'q[]latest', value: 'true', hidden: true, class: 'latest-flag'}
+
+        .input-group
+          %input{type: 'radio', name: "ignorethis#{index}", class: 'specify-latest-tag version-selectorizor', value: 'tag', id: "pacticipant#{index}_by_tag", checked: selector.specify_latest_tag_checked}
+          %label{for: "pacticipant#{index}_by_tag"}
+            Latest version with tag
+          %input{name: 'q[]tag', type: 'text', id: "pacticipant#{index}_tag", class: "by-latest-tag", value: selector.tag}
+          %input{name: 'q[]latest', value: 'true', hidden: true, class: 'latest-flag'}
+
+    %div.top-of-group
+      .input-group
+        %input{type: 'radio', name: "latestby", class: '', value: 'cvpv', id: 'cvpv', checked: options.cvpv_checked}
+        %label{for: 'cvpv'}
+          Show latest row for each consumer version/provider version
+    %div
+      .input-group
+        %input{type: 'radio', name: "latestby", class: '', value: 'cvp', id: 'cvp', checked: options.cvp_checked}
+        %label{for: 'cvp'}
+          Show latest row for each consumer version/provider
+    %div
+      .input-group
+        %input{type: 'radio', name: "latestby", class: '', value: '', id: 'all_rows', checked: options.all_rows_checked}
+        %label{for: 'all_rows'}
+          Show all rows
+    %div.top-of-group
+      %label{for: "limit"}
+        Limit
+      %input{name: 'limit', id: "limit", value: options.limit}
+    %div.top-of-group
+      %input{type: 'submit'}
+
+
+
   %table.table.table-bordered.table-striped{id: 'matrix'}
     %thead
       %th.consumer
@@ -45,13 +110,3 @@
             = line.provider_version_number
         %td.verification-result{class: line.verification_status_class}
           = line.verification_status
-
-:javascript
-  $(function(){
-    $("#matrix").tablesorter({
-      textExtraction : function(node, table, cellIndex){
-        n = $(node);
-        return n.attr('data-sort-value') || n.text();
-      }
-    });
-  });

data/lib/pact_broker/verifications/service.rb

@@ -22,7 +22,8 @@ module PactBroker
         provider_version_number = params.fetch('providerApplicationVersion')
         PactBroker::Api::Decorators::VerificationDecorator.new(verification).from_hash(params)
         verification.number = next_verification_number
-        verification_repository.create(verification, provider_version_number, pact)
+        webhook_service.execute_webhooks pact, PactBroker::Webhooks::WebhookEvent::VERIFICATION_PUBLISHED
+        verification = verification_repository.create(verification, provider_version_number, pact)
       end
 
       def errors params
@@ -35,6 +36,10 @@ module PactBroker
         verification_repository.find(params.fetch(:consumer_name), params.fetch(:provider_name), params.fetch(:pact_version_sha), params.fetch(:verification_number))
       end
 
+      def find_by_id id
+        PactBroker::Domain::Verification.find(id: id)
+      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

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = '2.12.0'
+  VERSION = '2.13.0'
 end

data/lib/pact_broker/webhooks/job.rb

@@ -45,7 +45,7 @@ module PactBroker
       end
 
       def handle_error e
-        log_error e
+        log_error e, "Error executing triggered webhook with ID #{triggered_webhook ? triggered_webhook.id : nil}"
         handle_failure
       end
 

data/lib/pact_broker/webhooks/repository.rb

@@ -3,6 +3,7 @@ require 'pact_broker/domain/webhook'
 require 'pact_broker/domain/pacticipant'
 require 'pact_broker/db'
 require 'pact_broker/webhooks/webhook'
+require 'pact_broker/webhooks/webhook_event'
 require 'pact_broker/webhooks/triggered_webhook'
 require 'pact_broker/webhooks/latest_triggered_webhook'
 require 'pact_broker/webhooks/execution'
@@ -21,6 +22,9 @@ module PactBroker
         webhook.request.headers.each_pair do | name, value |
           db_webhook.add_header PactBroker::Webhooks::WebhookHeader.from_domain(name, value, db_webhook.id)
         end
+        (webhook.events || []).each do | webhook_event |
+          db_webhook.add_event(webhook_event)
+        end
         find_by_uuid db_webhook.uuid
       end
 
@@ -32,9 +36,13 @@ module PactBroker
         existing_webhook = Webhook.find(uuid: uuid)
         existing_webhook.update_from_domain(webhook).save
         existing_webhook.headers.collect(&:delete)
+        existing_webhook.events.collect(&:delete)
         webhook.request.headers.each_pair do | name, value |
           existing_webhook.add_header PactBroker::Webhooks::WebhookHeader.from_domain(name, value, existing_webhook.id)
         end
+        (webhook.events || []).each do | webhook_event |
+          existing_webhook.add_event(webhook_event)
+        end
         find_by_uuid uuid
       end
 
@@ -55,6 +63,15 @@ module PactBroker
         Webhook.where(consumer_id: consumer.id, provider_id: provider.id).collect(&:to_domain)
       end
 
+      def find_by_consumer_and_provider_and_event_name consumer, provider, event_name
+        Webhook
+          .select_all_qualified
+          .where(consumer_id: consumer.id, provider_id: provider.id)
+          .join(:webhook_events, { webhook_id: :id })
+          .where(Sequel[:webhook_events][:name] => event_name)
+          .collect(&:to_domain)
+      end
+
       def find_by_consumer_and_provider_existing_at consumer, provider, date_time
         Webhook.where(consumer_id: consumer.id, provider_id: provider.id)
         .where(Sequel.lit("created_at < ?", date_time))