pact_broker 2.15.0 → 2.16.0

data/lib/pact_broker/matrix/service.rb

@@ -1,4 +1,5 @@
 require 'pact_broker/repositories'
+require 'pact_broker/matrix/row'
 
 module PactBroker
   module Matrix
@@ -8,6 +9,10 @@ module PactBroker
       extend PactBroker::Repositories
       extend PactBroker::Services
 
+      def refresh params
+        matrix_repository.refresh params
+      end
+
       def find criteria, options = {}
         matrix_repository.find criteria, options
       end

data/lib/pact_broker/tags/tag_with_latest_flag.rb

@@ -0,0 +1,18 @@
+require 'pact_broker/db'
+require 'pact_broker/repositories/helpers'
+
+module PactBroker
+  module Tags
+    # The tag associated with the latest verification for a given tag
+    class TagWithLatestFlag < Sequel::Model(:tags_with_latest_flag)
+
+      dataset_module do
+        include PactBroker::Repositories::Helpers
+      end
+
+      def latest?
+        !values[:latest].nil?
+      end
+    end
+  end
+end

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

@@ -10,9 +10,12 @@ module PactBroker
         include PactBroker::Services
 
         get "/" do
-          tags = params[:tags] == 'true' ? true : [*params[:tags]].compact
+          tags = nil
+          if params[:tags]
+            tags = params[:tags] == 'true' ? true : [*params[:tags]].compact
+          end
           view_model = ViewDomain::IndexItems.new(index_service.find_index_items(tags: tags))
-          page = tags == true || tags.any? ? :'index/show-with-tags' : :'index/show'
+          page = tags ? :'index/show-with-tags' : :'index/show'
           haml page, {locals: {index_items: view_model, title: "Pacts"}, layout: :'layouts/main'}
         end
 

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

@@ -1,5 +1,5 @@
 require 'pact_broker/ui/controllers/base_controller'
-require 'pact_broker/ui/view_models/matrix_line'
+require 'pact_broker/ui/view_models/matrix_lines'
 require 'pact_broker/matrix/parse_query'
 require 'pact_broker/logging'
 require 'haml'
@@ -29,7 +29,7 @@ module PactBroker
               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) }
+                locals[:lines] = PactBroker::UI::ViewDomain::MatrixLines.new(lines)
               else
                 locals[:errors] = errors
               end
@@ -45,7 +45,7 @@ module PactBroker
           selectors = [{ pacticipant_name: params[:consumer_name] }, { pacticipant_name: params[:provider_name] } ]
           options = {latestby: 'cvpv', limit: 100}
           lines = matrix_service.find(selectors, options)
-          lines = lines.collect{ |line| PactBroker::UI::ViewDomain::MatrixLine.new(line) }.sort
+          lines = PactBroker::UI::ViewDomain::MatrixLines.new(lines)
           locals = {
             lines: lines,
             title: "The Matrix",

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

@@ -1,6 +1,7 @@
 require 'pact_broker/api/pact_broker_urls'
 require 'pact_broker/ui/helpers/url_helper'
 require 'pact_broker/date_helper'
+require 'pact_broker/versions/abbreviate_number'
 
 module PactBroker
   module UI
@@ -22,16 +23,23 @@ module PactBroker
         end
 
         def consumer_version_number
-          @relationship.consumer_version_number
+          PactBroker::Versions::AbbreviateNumber.call(@relationship.consumer_version_number)
         end
 
         def provider_version_number
-          @relationship.provider_version_number
+          PactBroker::Versions::AbbreviateNumber.call(@relationship.provider_version_number)
         end
 
-        def tag_names
-          latest_overall = @relationship.latest? ? "latest & " : ""
-          @relationship.tag_names.any? ? " (#{latest_overall}latest #{@relationship.tag_names.join(', ')}) ": " (latest) "
+        def latest?
+          @relationship.latest?
+        end
+
+        def consumer_version_latest_tag_names
+          @relationship.tag_names
+        end
+
+        def provider_version_latest_tag_names
+          @relationship.latest_verification_latest_tags.collect(&:name)
         end
 
         def consumer_group_url

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

@@ -1,6 +1,8 @@
 require 'pact_broker/api/pact_broker_urls'
 require 'pact_broker/ui/helpers/url_helper'
 require 'pact_broker/date_helper'
+require 'pact_broker/ui/view_models/matrix_tag'
+require 'pact_broker/versions/abbreviate_number'
 
 module PactBroker
   module UI
@@ -11,23 +13,36 @@ module PactBroker
 
         def initialize line
           @line = line
+          @overwritten = false # true if the pact was revised and this revision is no longer the latest
         end
 
         def provider_name
           @line[:provider_name]
         end
 
+        def provider_name_url
+          hal_browser_url(pacticipant_url_from_params(pacticipant_name: provider_name))
+        end
+
         def consumer_name
           @line[:consumer_name]
         end
 
+        def consumer_name_url
+          hal_browser_url(pacticipant_url_from_params(pacticipant_name: consumer_name))
+        end
+
         def pact_version_sha
           @line[:pact_version_sha]
         end
 
-        # verification number
+        # verification number, used in verification_url method
         def number
-          @line[:number]
+          @line[:verification_number]
+        end
+
+        def pact_revision_number
+          @line[:pact_revision_number]
         end
 
         def consumer_name
@@ -38,8 +53,13 @@ module PactBroker
           @line[:consumer_version_number]
         end
 
+        def display_consumer_version_number
+          PactBroker::Versions::AbbreviateNumber.call(consumer_version_number)
+        end
+
         def consumer_version_number_url
-          pact_url_from_params('', @line)
+          params = { pacticipant_name: consumer_name, version_number: consumer_version_number }
+          hal_browser_url(version_url_from_params(params))
         end
 
         def consumer_version_order
@@ -54,24 +74,53 @@ module PactBroker
           @line[:provider_version_number]
         end
 
+        def display_provider_version_number
+          PactBroker::Versions::AbbreviateNumber.call(provider_version_number)
+        end
+
         def provider_version_order
           @line[:provider_version_order]
         end
 
         def provider_version_number_url
-          hal_browser_url(verification_url(self))
+          params = { pacticipant_name: provider_name, version_number: provider_version_number }
+          hal_browser_url(version_url_from_params(params))
         end
 
         def provider_version_order
-          if @line[:execution_date]
-            @line[:execution_date].to_time.to_i
+          if @line[:verification_executed_at]
+            @line[:verification_executed_at].to_time.to_i
           else
             0
           end
         end
 
+        def latest_consumer_version_tags
+          @line[:consumer_version_tags]
+            .select{ | tag | tag[:latest] }
+            .collect{ | tag | MatrixTag.new(tag.to_hash.merge(pacticipant_name: consumer_name, version_number: consumer_version_number)) }
+        end
+
+        def other_consumer_version_tags
+          @line[:consumer_version_tags]
+            .select{ | tag | !tag[:latest] }
+            .collect{ | tag | MatrixTag.new(tag.to_hash.merge(pacticipant_name: consumer_name, version_number: consumer_version_number)) }
+        end
+
+        def latest_provider_version_tags
+          @line[:provider_version_tags]
+            .select{ | tag | tag[:latest] }
+            .collect{ | tag | MatrixTag.new(tag.to_hash.merge(pacticipant_name: provider_name, version_number: provider_version_number)) }
+        end
+
+        def other_provider_version_tags
+          @line[:provider_version_tags]
+            .select{ | tag | !tag[:latest] }
+            .collect{ | tag | MatrixTag.new(tag.to_hash.merge(pacticipant_name: provider_name, version_number: provider_version_number)) }
+        end
+
         def orderable_fields
-          [consumer_name, consumer_version_order, @line[:pact_revision_number], provider_name, @line[:verification_id]]
+          [consumer_name, consumer_version_order, pact_revision_number, provider_name, @line[:verification_id]]
         end
 
         def <=> other
@@ -91,8 +140,20 @@ module PactBroker
           # end
         end
 
+        def verification_status_url
+          hal_browser_url(verification_url(self))
+        end
+
         def pact_publication_date
-          DateHelper.distance_of_time_in_words(@line[:pact_created_at], DateTime.now) + " ago"
+          relative_date(@line[:pact_created_at])
+        end
+
+        def pact_publication_date_url
+          pact_url_from_params('', @line)
+        end
+
+        def relative_date date
+          DateHelper.distance_of_time_in_words(date, DateTime.now) + " ago"
         end
 
         def pact_published_order
@@ -106,6 +167,14 @@ module PactBroker
             else ''
           end
         end
+
+        def overwritten?
+          @overwritten
+        end
+
+        def overwritten= overwritten
+          @overwritten = overwritten
+        end
       end
     end
   end

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

@@ -0,0 +1,17 @@
+require 'pact_broker/ui/view_models/matrix_line'
+
+module PactBroker
+  module UI
+    module ViewDomain
+      class MatrixLines < Array
+
+        def initialize rows
+          lines = rows.collect do | row |
+            PactBroker::UI::ViewDomain::MatrixLine.new(row)
+          end
+          super(lines.sort)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,42 @@
+require 'pact_broker/api/pact_broker_urls'
+require 'pact_broker/ui/helpers/url_helper'
+require 'pact_broker/date_helper'
+
+module PactBroker
+  module UI
+    module ViewDomain
+      class MatrixTag
+
+        include PactBroker::Api::PactBrokerUrls
+
+        def initialize params
+          @params = params
+          @name = params[:name]
+          @version_number = params[:version_number]
+          @created_at = params[:created_at]
+          @latest = !!params[:latest]
+        end
+
+        def name
+          @params[:name]
+        end
+
+        def tooltip
+          if @latest
+            "Version #{@version_number} is the latest version with tag #{@name}. Tag created #{relative_date(@created_at)}."
+          else
+            "Tag created #{relative_date(@created_at)}."
+          end
+        end
+
+        def url
+          hal_browser_url("/pacticipants/#{ERB::Util.url_encode(@params[:pacticipant_name])}/versions/#{@params[:version_number]}/tags/#{@params[:name]}")
+        end
+
+        def relative_date date
+          DateHelper.distance_of_time_in_words(date, DateTime.now) + " ago"
+        end
+      end
+    end
+  end
+end

data/lib/pact_broker/ui/views/index/show-with-tags.haml

@@ -4,15 +4,16 @@
   %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'}
-  %nav.navbase-default.navbar-right{role: "navigation"}
-    .container
-      %ul.navbar-right#top-left-menu
-        %li
-          %a{href: './'}
-            Hide latest tags
-          %a{ href: '/hal-browser/browser.html' }
-            API Browser
   .container
+    %nav.navbase-default{role: "navigation", id: "navigation"}
+      .container-fluid
+        .navbar-header
+        %ul.navbar-right#top-left-menu
+          %li
+            %a{href: './'}
+              Hide latest tags
+            %a{href: '/hal-browser/browser.html'}
+              API Browser
     %h1.page-header
       Pacts
     %table.table.table-bordered.table-striped{ id: 'relationships' }
@@ -21,21 +22,23 @@
           Consumer
           %span.glyphicon.glyphicon-sort.relationships-sort
         %th.consumer-version-number
-          Version
+          Consumer<br>Version
           %span.glyphicon.glyphicon-sort.relationships-sort
         %th.pact{ style: 'width: 40px' }
         %th.provider
           Provider
           %span.glyphicon.glyphicon-sort.relationships-sort
         %th.provider-version-number
-          Version
+          Provider<br>Version
           %span.glyphicon.glyphicon-sort.relationships-sort
         %th
           Published
+          %span.glyphicon.glyphicon-sort.relationships-sort
         %th
           Webhook<br>status
         %th
           Last<br>verified
+          %span.glyphicon.glyphicon-sort.relationships-sort
       %tbody
 
       - index_items.each do | index_item |
@@ -44,9 +47,14 @@
             %a{:href => index_item.consumer_group_url }
               = index_item.consumer_name
           %td.consumer-version-number
-            = index_item.consumer_version_number
-            %span{style: 'color:gray'}
-              = index_item.tag_names
+            %div
+              = index_item.consumer_version_number
+            - if index_item.latest?
+              .tag.label.label-success
+                latest
+            - index_item.consumer_version_latest_tag_names.each do | tag_name |
+              .tag.label.label-primary
+                = tag_name
           %td.pact
             %span.pact
               %a{ href: index_item.pact_url, title: "View pact" }
@@ -56,7 +64,11 @@
             %a{ href: index_item.provider_group_url }
               = index_item.provider_name
           %td.provider-version-number
-            = index_item.provider_version_number
+            %div
+              = index_item.provider_version_number
+            - index_item.provider_version_latest_tag_names.each do | tag_name |
+              .tag.label.label-primary
+                = tag_name
           %td
             = index_item.publication_date_of_latest_pact.gsub("about ", "")
           %td{ class: index_item.webhook_status }

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

@@ -4,15 +4,16 @@
   %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'}
-  %nav.navbase-default.navbar-right{role: "navigation"}
-    .container
-      %ul#top-left-menu
-        %li.navbar-right
-          %a{href: './?tags=true'}
-            Show latest tags
-          %a{ href: '/hal-browser/browser.html' }
-            API Browser
   .container
+    %nav.navbase-default{role: "navigation", id: "navigation"}
+      .container-fluid
+        .navbar-header
+        %ul.navbar-right#top-left-menu
+          %li
+            %a{href: './?tags=true'}
+              Show latest tags
+            %a{href: '/hal-browser/browser.html'}
+              API Browser
     %h1.page-header
       Pacts
     %table.table.table-bordered.table-striped{ id: 'relationships' }

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

@@ -56,17 +56,17 @@
       .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
+          Show latest result 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
+          Show latest result 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
+          Show all results
     %div.top-of-group
       %label{for: "limit"}
         Limit
@@ -75,14 +75,15 @@
       %input{type: 'submit'}
 
 
-
+  %p{style: 'text-align:right'}
+    = "#{lines.size} rows"
   %table.table.table-bordered.table-striped{id: 'matrix'}
     %thead
       %th.consumer
         = "Consumer"
         %span.glyphicon.glyphicon-sort.sort
       %th.consumer-version
-        = "Version"
+        = "Consumer Version"
         %span.glyphicon.glyphicon-sort.sort
       %th.pact-published
         = "Pact Published"
@@ -91,7 +92,7 @@
         = "Provider"
         %span.glyphicon.glyphicon-sort.sort
       %th.provider-version
-        = "Version"
+        = "Provider Version"
         %span.glyphicon.glyphicon-sort.sort
       %th.verification-result
         Pact verified
@@ -100,16 +101,46 @@
     - lines.each do | line |
       %tr
         %td.consumer{'data-sort-value' => line.consumer_name}
-          = line.consumer_name
+          %a{href: line.consumer_name_url}
+            = line.consumer_name
         %td.consumer-version{'data-sort-value' => line.consumer_version_order}
-          %a{href: line.consumer_version_number_url}
-            = line.consumer_version_number
+          %div
+            %a{href: line.consumer_version_number_url}
+              = line.display_consumer_version_number
+          - line.latest_consumer_version_tags.each do | tag |
+            .tag-parent{"title": tag.tooltip, "data-toggle": "tooltip", "data-placement": "right"}
+              %a{href: tag.url}
+                .tag.label.label-primary
+                  = tag.name
+          - line.other_consumer_version_tags.each do | tag |
+            .tag-parent{"title": tag.tooltip, "data-toggle": "tooltip", "data-placement": "right"}
+              %a{href: tag.url}
+                .tag.label.label-default
+                  = tag.name
         %td.pact-published{'data-sort-value' => line.pact_published_order}
-          = line.pact_publication_date
-        %td.provider{'data-sort-value' => line.provider_version_order}
-          = line.provider_name
+          %a{href: line.pact_publication_date_url}
+            - if options.all_rows_checked
+              = "#{line.pact_publication_date} (revision #{line.pact_revision_number})"
+            - else
+              = line.pact_publication_date
+
+        %td.provider{'data-sort-value' => line.provider_name}
+          %a{href: line.provider_name_url}
+            = line.provider_name
         %td.provider-version{'data-sort-value' => line.provider_version_order}
-          %a{href: line.provider_version_number_url}
-            = line.provider_version_number
+          %div
+            %a{href: line.provider_version_number_url}
+              = line.display_provider_version_number
+          - line.latest_provider_version_tags.each do | tag |
+            .tag-parent{"title": tag.tooltip, "data-toggle": "tooltip", "data-placement": "right"}
+              %a{href: tag.url}
+                .tag.label.label-primary
+                  = tag.name
+          - line.other_provider_version_tags.each do | tag |
+            .tag-parent{"title": tag.tooltip, "data-toggle": "tooltip", "data-placement": "right"}
+              %a{href: tag.url}
+                .tag.label.label-default
+                  = tag.name
         %td.verification-result{class: line.verification_status_class}
-          = line.verification_status
+          %a{href: line.verification_status_url}
+            = line.verification_status