pact_broker 2.18.0 → 2.19.0

data/lib/pact_broker/matrix/service.rb

@@ -57,11 +57,7 @@ module PactBroker
             error_messages << "Please specify the pacticipant name"
           else
             if s.key?(:pacticipant_version_number) && s.key?(:latest)
-              error_messages << "A version and latest flag cannot both be specified for #{s[:pacticipant_name]}"
-            end
-
-            if s.key?(:tag) && !s.key?(:latest)
-              error_messages << "Querying for all versions with a tag is not currently supported. The latest=true flag must be specified when a tag is given."
+              error_messages << "A version number and latest flag cannot both be specified for #{s[:pacticipant_name]}"
             end
           end
         end
@@ -78,7 +74,7 @@ module PactBroker
               version = version_service.find_by_pacticipant_name_and_number(pacticipant_name: s[:pacticipant_name], pacticipant_version_number: s[:pacticipant_version_number])
               error_messages << "No pact or verification found for #{s[:pacticipant_name]} version #{s[:pacticipant_version_number]}" if version.nil?
             elsif s[:tag]
-              version = version_service.find_by_pacticpant_name_and_latest_tag(s[:pacticipant_name], s[:tag])
+              version = version_service.find_by_pacticipant_name_and_latest_tag(s[:pacticipant_name], s[:tag])
               error_messages << "No version of #{s[:pacticipant_name]} found with tag #{s[:tag]}" if version.nil?
             end
           end

data/lib/pact_broker/pacts/diff.rb

@@ -1,6 +1,7 @@
 require 'pact_broker/api/pact_broker_urls'
 require 'pact_broker/date_helper'
 require 'pact_broker/pacts/create_formatted_diff'
+require 'pact_broker/pacts/sort_verifiable_content'
 require 'pact_broker/repositories'
 require 'yaml'
 
@@ -10,13 +11,13 @@ module PactBroker
     class Diff
       include PactBroker::Repositories
 
-      def process(params)
+      def process(params, comparison_pact_params = nil, options = {})
         pact = find_pact(params)
-        previous_distinct_pact = pact_repository.find_previous_distinct_pact(pact)
+        comparison_pact = comparison_pact_params ? find_pact(comparison_pact_params) : pact_repository.find_previous_distinct_pact(pact)
 
-        if previous_distinct_pact
-          next_pact = pact_repository.find_next_pact(previous_distinct_pact)
-          DiffDecorator.new(pact, previous_distinct_pact, next_pact, params[:base_url]).to_text
+        if comparison_pact
+          next_pact = pact_repository.find_next_pact(comparison_pact) || pact
+          DiffDecorator.new(pact, comparison_pact, next_pact, params[:base_url], { raw: options[:raw] }).to_text
         else
           no_previous_version_message pact
         end
@@ -27,7 +28,8 @@ module PactBroker
       def find_pact(params)
         pact_repository.find_pact(params.consumer_name,
                                   params.consumer_version_number,
-                                  params.provider_name)
+                                  params.provider_name,
+                                  params.pact_version_sha)
       end
 
       def no_previous_version_message(pact)
@@ -46,11 +48,12 @@ module PactBroker
       # the latest distinct version content was first created.
 
       class DiffDecorator
-        def initialize(pact, previous_distinct_pact, next_pact, base_url)
+        def initialize(pact, comparison_pact, next_pact, base_url, options)
           @pact = pact
-          @previous_distinct_pact = previous_distinct_pact
+          @comparison_pact = comparison_pact
           @next_pact = next_pact
           @base_url = base_url
+          @options = options
         end
 
         def to_text
@@ -59,7 +62,7 @@ module PactBroker
 
         private
 
-        attr_reader :pact, :previous_distinct_pact, :next_pact, :base_url
+        attr_reader :pact, :comparison_pact, :next_pact, :base_url, :options
 
         def change_date_in_words
           DateHelper.local_date_in_words next_pact.created_at
@@ -70,7 +73,7 @@ module PactBroker
         end
 
         def header
-          title = "# Diff between versions #{previous_distinct_pact.consumer_version_number} and #{pact.consumer_version_number} of the pact between #{pact.consumer.name} and #{pact.provider.name}"
+          title = "# Diff between versions #{comparison_pact.consumer_version_number} and #{pact.consumer_version_number} of the pact between #{pact.consumer.name} and #{pact.provider.name}"
           description = "The following changes were made #{change_date_ago_in_words} ago (#{change_date_in_words})"
 
           title +  "\n\n" + description
@@ -78,7 +81,7 @@ module PactBroker
 
         def links
           self_url = PactBroker::Api::PactBrokerUrls.pact_url(base_url, pact)
-          previous_distinct_url = PactBroker::Api::PactBrokerUrls.pact_url(base_url, previous_distinct_pact)
+          previous_distinct_url = PactBroker::Api::PactBrokerUrls.pact_url(base_url, comparison_pact)
 
           links = {
             "current-pact-version" => {
@@ -88,7 +91,7 @@ module PactBroker
             },
             "previous-distinct-pact-version" => {
               "title" => "Pact",
-              "name" => previous_distinct_pact.name,
+              "name" => comparison_pact.name,
               "href" => previous_distinct_url
             }
           }
@@ -96,12 +99,20 @@ module PactBroker
         end
 
         def diff
-          CreateFormattedDiff.(pact.json_content, previous_distinct_pact.json_content)
+          CreateFormattedDiff.(prepare_content(pact.json_content), prepare_content(comparison_pact.json_content))
         end
 
         def change_date_ago_in_words
           DateHelper.distance_of_time_in_words next_pact.created_at, now
         end
+
+        def prepare_content json_content
+          if options[:raw]
+            json_content
+          else
+            PactBroker::Pacts::SortVerifiableContent.call(json_content)
+          end
+        end
       end
     end
   end

data/lib/pact_broker/pacts/pact_params.rb

@@ -10,6 +10,16 @@ module PactBroker
         merge!(attributes)
       end
 
+      def self.from_path_info path_info
+        new(
+          consumer_name: path_info.fetch(:consumer_name),
+          provider_name: path_info.fetch(:provider_name),
+          consumer_version_number: path_info[:consumer_version_number],
+          revision_number: path_info[:revision_number],
+          pact_version_sha: path_info[:pact_version_sha]
+        )
+      end
+
       def self.from_request request, path_info
         json_content = request.body.to_s
         parsed_content = begin

data/lib/pact_broker/pacts/repository.rb

@@ -70,6 +70,24 @@ module PactBroker
         end
       end
 
+      def find_pact_versions_for_provider provider_name, tag = nil
+        if tag
+          LatestPactPublicationsByConsumerVersion
+            .join(:tags, {version_id: :consumer_version_id})
+            .provider(provider_name)
+            .order_ignore_case(:consumer_name)
+            .order_append(:consumer_version_order)
+            .where(Sequel[:tags][:name] => tag)
+            .collect(&:to_domain)
+        else
+          LatestPactPublicationsByConsumerVersion
+            .provider(provider_name)
+            .order_ignore_case(:consumer_name)
+            .order_append(:consumer_version_order)
+            .collect(&:to_domain)
+        end
+      end
+
       # Returns latest pact version for the consumer_version_number
       def find_by_consumer_version consumer_name, consumer_version_number
         LatestPactPublicationsByConsumerVersion

data/lib/pact_broker/pacts/service.rb

@@ -68,6 +68,10 @@ module PactBroker
         pact_repository.find_latest_pact_versions_for_provider provider_name, options[:tag]
       end
 
+      def find_pact_versions_for_provider provider_name, options = {}
+        pact_repository.find_pact_versions_for_provider provider_name, options[:tag]
+      end
+
       def find_previous_distinct_pact_version params
         pact = find_pact params
         return nil if pact.nil?

data/lib/pact_broker/pacts/sort_verifiable_content.rb

@@ -0,0 +1,41 @@
+require 'pact_broker/json'
+
+module PactBroker
+  module Pacts
+    class SortVerifiableContent
+
+      def self.call json
+        hash = JSON.parse(json, PACT_PARSING_OPTIONS)
+        verifiable_content = if hash['interactions']
+          hash['interactions']
+        elsif hash['messages']
+          hash['messages']
+        end
+        order_verifiable_content(verifiable_content).to_json
+      end
+
+      def self.order_verifiable_content array
+        array_with_ordered_hashes = order_hashes(array)
+        array_with_ordered_hashes.sort{|a, b| a.to_json <=> b.to_json }
+      end
+
+      def self.order_hashes thing
+        case thing
+          when Hash then order_hash(thing)
+          when Array then order_child_array(thing)
+        else thing
+        end
+      end
+
+      def self.order_child_array array
+        array.collect{|thing| order_hashes(thing) }
+      end
+
+      def self.order_hash hash
+        hash.keys.sort.each_with_object({}) do | key, new_hash |
+          new_hash[key] = order_hashes(hash[key])
+        end
+      end
+    end
+  end
+end

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

@@ -9,7 +9,7 @@ module PactBroker
         include PactBroker::Services
 
         get "/" do
-          raise PactBroker::Error.new("Don't panic. This is a test UI error.")
+          raise PactBroker::TestError.new("Don't panic. This is a test UI error.")
         end
       end
     end

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

@@ -59,12 +59,11 @@ module PactBroker
         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.specify_latest_tag = o.tag && o.latest ? 'checked' : nil
+            o.specify_all_tagged = o.tag && !o.latest ? 'checked' : nil
+            o.specify_latest = o.latest ? 'checked' : nil
+            o.specify_version = o.pacticipant_version_number ? 'checked' : nil
+            o.specify_all_versions = !(o.tag || o.pacticipant_version_number) ? 'checked' : nil
             o
           end
         end

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

@@ -29,29 +29,27 @@
         %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}
+          %select{ name: "ignorethis#{index}", class: 'version-selectorizor' }
+            %option{ value: 'specify-all-versions', selected: selector.specify_all_versions }
+              All versions
+            %option{ value: 'specify-latest', selected: selector.specify_latest }
+              Latest version
+            %option{ value: 'specify-version', selected: selector.specify_version }
+              Version number ...
+            %option{ value: 'specify-latest-tag', selected: selector.specify_latest_tag }
+              Latest version with tag ...
+            %option{ value: 'specify-all-tagged', selected: selector.specify_all_tagged }
+              All versions with tag...
 
-        .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{name: 'q[]version', type: 'text', id: "pacticipant#{index}_version", class: 'version', value: selector.pacticipant_version_number}
+
+          %input{name: 'q[]tag', type: 'text', id: "pacticipant#{index}_tag", class: 'tag', value: selector.tag}
 
-        .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: '', id: 'all_rows', checked: options.all_rows_checked}

data/lib/pact_broker/verifications/repository.rb

@@ -75,15 +75,15 @@ module PactBroker
         query = PactBroker::Verifications::AllVerifications
           .select_all_qualified
           .join(:versions, {Sequel[:provider_versions][:id] => Sequel[view_name][:provider_version_id]}, {table_alias: :provider_versions})
-          .join(:all_pact_publications, { Sequel[view_name][:pact_version_id] => Sequel[:all_pact_publications][:pact_version_id] })
+          .join(:latest_pact_publications_by_consumer_versions, { Sequel[view_name][:pact_version_id] => Sequel[:latest_pact_publications_by_consumer_versions][:pact_version_id] })
           .consumer(consumer_name)
           .provider(provider_name)
           .tag(consumer_version_tag)
           .provider_version_tag(provider_version_tag)
 
         query.reverse_order(
-          Sequel[:all_pact_publications][:consumer_version_order],
-          Sequel[:all_pact_publications][:revision_number],
+          Sequel[:latest_pact_publications_by_consumer_versions][:consumer_version_order],
+          Sequel[:latest_pact_publications_by_consumer_versions][:revision_number],
           Sequel[:provider_versions][:order],
           Sequel[view_name][:execution_date]
         ).limit(1).single_record

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = '2.18.0'
+  VERSION = '2.19.0'
 end

data/lib/pact_broker/versions/repository.rb

@@ -12,7 +12,7 @@ module PactBroker
         PactBroker::Domain::Version.where(number: number, pacticipant_id: pacticipant_id).single_record
       end
 
-      def find_by_pacticpant_name_and_latest_tag pacticipant_name, tag
+      def find_by_pacticipant_name_and_latest_tag pacticipant_name, tag
         PactBroker::Domain::Version
           .select_all_qualified
           .join(:pacticipants, {id: :pacticipant_id}, {implicit_qualifier: :versions})
@@ -23,6 +23,16 @@ module PactBroker
           .first
       end
 
+      def find_by_pacticipant_name_and_tag pacticipant_name, tag
+        PactBroker::Domain::Version
+          .select_all_qualified
+          .join(:pacticipants, {id: :pacticipant_id}, {implicit_qualifier: :versions})
+          .join(:tags, {version_id: :id}, {implicit_qualifier: :versions})
+          .where(name_like(Sequel[:tags][:name], tag))
+          .where(name_like(Sequel[:pacticipants][:name], pacticipant_name))
+          .all
+      end
+
       def find_latest_by_pacticpant_name pacticipant_name
         PactBroker::Domain::Version
           .select_all_qualified

data/lib/pact_broker/versions/service.rb

@@ -15,8 +15,8 @@ module PactBroker
         version_repository.find_by_pacticipant_name_and_number params.fetch(:pacticipant_name), params.fetch(:pacticipant_version_number)
       end
 
-      def self.find_by_pacticpant_name_and_latest_tag(pacticipant_name, tag)
-        version_repository.find_by_pacticpant_name_and_latest_tag(pacticipant_name, tag)
+      def self.find_by_pacticipant_name_and_latest_tag(pacticipant_name, tag)
+        version_repository.find_by_pacticipant_name_and_latest_tag(pacticipant_name, tag)
       end
 
       def self.delete version

data/public/javascripts/matrix.js

@@ -1,27 +1,48 @@
-function handleRadioButtonClicked() {
-  selectApplicableTextBox($(this));
-  clearOtherTextBoxes($(this));
-}
 
-function selectApplicableTextBox(selectedRadioButton) {
-  selectedRadioButton.closest('.input-group').find('input[type="text"]').first().focus();
+function setTextboxVisibility(selectBox, cssSelector, visibility) {
+  var textbox = selectBox.closest('.selector').find(cssSelector);
+  textbox.toggle(visibility);
+  if(visibility) {
+    textbox.prop('disabled', '');
+    textbox.focus();
+  } else {
+    textbox.prop('disabled', 'disabled');
+  }
 }
 
-function handleTextBoxClicked() {
-  selectApplicableRadioButton($(this));
-  clearOtherTextBoxes($(this));
+function toggleLatestFlag(selectBox, enabled) {
+  var flagElement = selectBox.closest('.selector').find('.latest-flag');
+  if(enabled) {
+    flagElement.prop('disabled', '');
+  } else {
+    flagElement.prop('disabled', 'disabled');
+  }
 }
 
-function selectApplicableRadioButton(selectedTextBox) {
-  selectedTextBox.closest('.input-group').find('.version-selectorizor').prop('checked', 'checked');
+function showApplicableTextBoxes(selectorizor) {
+  var selectorizorType = selectorizor.val();
+  if( selectorizorType === 'specify-version') {
+    setTextboxVisibility(selectorizor, '.version', true);
+    setTextboxVisibility(selectorizor, '.tag', false);
+  }
+  else if( selectorizorType === 'specify-latest-tag' || selectorizorType === 'specify-all-tagged') {
+    setTextboxVisibility(selectorizor, '.version', false);
+    setTextboxVisibility(selectorizor, '.tag', true);
+  }
+  else if ( selectorizorType === 'specify-all-versions' || selectorizorType === 'specify-latest') {
+    setTextboxVisibility(selectorizor, '.version', false);
+    setTextboxVisibility(selectorizor, '.tag', false);
+  }
+
+  if (selectorizorType === 'specify-latest' || selectorizorType === 'specify-latest-tag') {
+    toggleLatestFlag(selectorizor, true);
+  } else {
+    toggleLatestFlag(selectorizor, false);
+  }
 }
 
-function clearOtherTextBoxes(clickedElement) {
-  clickedElement.closest('.selector').find('input[type="text"]').each(function(){
-    if(!$.contains(clickedElement.closest('.input-group')[0], $(this)[0])) {
-      $(this).prop('value', '');
-    }
-  });
+function handleSelectorizorChanged() {
+  showApplicableTextBoxes($(this));
 }
 
 function onSubmit() {
@@ -30,26 +51,12 @@ function onSubmit() {
 }
 
 function disableFieldsThatShouldNotBeSubmitted() {
-  disableInputsForUncheckedRadioButtons();
-  disableRadioButtons();
-}
-
-function disableInputsForUncheckedRadioButtons() {
-  $('.version-selectorizor').each(function(){
-    if($(this).prop('checked') === false) {
-      $(this).closest('.input-group').find('input').prop('disabled', 'disabled');
-    }
-  });
-}
-
-function disableRadioButtons() {
   $('.version-selectorizor').prop('disabled', 'disabled');
 }
 
 $(document).ready(function(){
-  $('.by-version').click(handleTextBoxClicked);
-  $('.by-latest-tag').click(handleTextBoxClicked);
-  $('.version-selectorizor').click(handleRadioButtonClicked);
+  $('.version-selectorizor').change(handleSelectorizorChanged);
+  $('.version-selectorizor').each(function(){ showApplicableTextBoxes($(this)); });
 
   $("#matrix").tablesorter({
     textExtraction : function(node, table, cellIndex){