pact_broker 2.9.0 → 2.10.0

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

@@ -0,0 +1,22 @@
+require 'pact_broker/ui/controllers/base_controller'
+require 'pact_broker/ui/view_models/index_items'
+require 'haml'
+
+module PactBroker
+  module UI
+    module Controllers
+      class Index < Base
+
+        include PactBroker::Services
+
+        get "/" do
+          tags = params[:tags] == 'true' ? true : [*params[:tags]].compact
+          view_model = ViewDomain::IndexItems.new(index_service.find_index_items(tags: tags))
+          page = tags == true || tags.any? ? :'index/show-with-tags' : :'index/show'
+          haml page, {locals: {index_items: view_model, title: "Pacts"}, layout: :'layouts/main'}
+        end
+
+      end
+    end
+  end
+end

data/lib/pact_broker/ui/view_models/{relationship.rb → index_item.rb}

@@ -5,7 +5,7 @@ require 'pact_broker/date_helper'
 module PactBroker
   module UI
     module ViewDomain
-      class Relationship
+      class IndexItem
 
         include PactBroker::Api::PactBrokerUrls
 
@@ -21,6 +21,19 @@ module PactBroker
           @relationship.provider_name
         end
 
+        def consumer_version_number
+          short_version_number(@relationship.consumer_version_number)
+        end
+
+        def provider_version_number
+          short_version_number(@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) "
+        end
+
         def consumer_group_url
           Helpers::URLHelper.group_url consumer_name
         end
@@ -29,7 +42,7 @@ module PactBroker
           Helpers::URLHelper.group_url provider_name
         end
 
-        def latest_pact_url
+        def pact_url
           "#{pactigration_base_url('', @relationship)}/latest"
         end
 
@@ -38,6 +51,7 @@ module PactBroker
         end
 
         def webhook_label
+          return "" unless show_webhook_status?
           case @relationship.webhook_status
             when :none then "Create"
             when :success, :failure then webhook_last_execution_date
@@ -47,6 +61,7 @@ module PactBroker
         end
 
         def webhook_status
+          return "" unless show_webhook_status?
           case @relationship.webhook_status
             when :success then "success"
             when :failure then "danger"
@@ -55,6 +70,10 @@ module PactBroker
           end
         end
 
+        def show_webhook_status?
+          @relationship.latest?
+        end
+
         def webhook_last_execution_date
           PactBroker::DateHelper.distance_of_time_in_words(@relationship.last_webhook_execution_date, DateTime.now) + " ago"
         end
@@ -99,11 +118,11 @@ module PactBroker
         def verification_tooltip
           case @relationship.verification_status
           when :success
-            "Successfully verified by #{provider_name} (v#{@relationship.latest_verification_provider_version_number})"
+            "Successfully verified by #{provider_name} (v#{short_version_number(@relationship.latest_verification_provider_version_number)})"
           when :stale
-            "Pact has changed since last successful verification by #{provider_name} (v#{@relationship.latest_verification_provider_version_number})"
+            "Pact has changed since last successful verification by #{provider_name} (v#{short_version_number(@relationship.latest_verification_provider_version_number)})"
           when :failed
-            "Verification by #{provider_name} (v#{@relationship.latest_verification_provider_version_number}) failed"
+            "Verification by #{provider_name} (v#{short_version_number(@relationship.latest_verification_provider_version_number)}) failed"
           else
             nil
           end
@@ -115,6 +134,14 @@ module PactBroker
           provider_name.downcase <=> other.provider_name.downcase
         end
 
+        def short_version_number version_number
+          return "" if version_number.nil?
+          if version_number.size > 12
+            version_number[0..12] + "..."
+          else
+            version_number
+          end
+        end
       end
     end
   end

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

@@ -0,0 +1,30 @@
+require 'pact_broker/ui/view_models/index_item'
+
+module PactBroker
+  module UI
+    module ViewDomain
+      class IndexItems
+
+        def initialize index_items
+          @index_items = index_items.collect{ |index_item| IndexItem.new(index_item) }.sort
+        end
+
+        def each(&block)
+          index_items.each(&block)
+        end
+
+        def size_label
+          case index_items.size
+          when 1 then "1 pact"
+          else
+            "#{index_items.size} pacts"
+          end
+        end
+
+        private
+
+        attr_reader :index_items
+      end
+    end
+  end
+end

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

@@ -0,0 +1,83 @@
+%body
+  %link{rel: 'stylesheet', href: '/css/bootstrap.min.css'}
+  %link{rel: 'stylesheet', href: '/stylesheets/index.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'}
+  %nav.navbase-default.navbar-right{role: "navigation"}
+    .container
+      %ul
+        %li.navbar-right
+          %a{ href: '/hal-browser/browser.html' }
+            API Browser
+  .container
+    %h1.page-header
+      Pacts
+    %table.table.table-bordered.table-striped{ id: 'relationships' }
+      %thead
+        %th.consumer
+          Consumer
+          %span.glyphicon.glyphicon-sort.relationships-sort
+        %th.tag
+          Version
+          %span.glyphicon.glyphicon-sort.relationships-sort
+        %th.pact{ style: 'width: 40px' }
+        %th.provider
+          Provider
+          %span.glyphicon.glyphicon-sort.relationships-sort
+        %th.tag
+          Version
+          %span.glyphicon.glyphicon-sort.relationships-sort
+        %th
+          Published
+        %th
+          Webhook<br>status
+        %th
+          Last<br>verified
+      %tbody
+
+      - index_items.each do | index_item |
+        %tr
+          %td.consumer
+            %a{:href => index_item.consumer_group_url }
+              = index_item.consumer_name
+          %td
+            = index_item.consumer_version_number
+            %span{style: 'color:gray'}
+              = index_item.tag_names
+          %td.pact
+            %a{ href: index_item.pact_url, title: "View pact" }
+              %span.pact
+          %td.provider
+            %a{ href: index_item.provider_group_url }
+              = index_item.provider_name
+          %td
+            = index_item.provider_version_number
+          %td
+            = index_item.publication_date_of_latest_pact.gsub("about ", "")
+          %td{ class: index_item.webhook_status }
+            - if index_item.show_webhook_status?
+              %a{ href: index_item.webhook_url }
+                = index_item.webhook_label
+
+          %td{ class: index_item.verification_status, title: index_item.verification_tooltip, "data-toggle": "tooltip", "data-placement": "left" }
+            %div
+              = index_item.last_verified_date.gsub("about ", "")
+              - if index_item.warning?
+                %span.glyphicon.glyphicon-warning-sign{ 'aria-hidden': true }
+    %div.relationships-size
+      = index_items.size_label
+
+:javascript
+  $(function(){
+    $("#relationships").tablesorter();
+  });
+
+  $(document).ready(function(){
+    $("span.pact").load("/images/doc-text.svg");
+    $('td[data-toggle="tooltip"]').each(function(index, td){
+      //appended tooltip div screws up table if it's appended after a
+      //td, so need to append it to a div
+      $(td).tooltip({container: $(td).first()});
+    });
+  });

data/lib/pact_broker/ui/views/{relationships → index}/show.haml

@@ -1,6 +1,6 @@
 %body
   %link{rel: 'stylesheet', href: '/css/bootstrap.min.css'}
-  %link{rel: 'stylesheet', href: '/stylesheets/relationships.css'}
+  %link{rel: 'stylesheet', href: '/stylesheets/index.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'}
@@ -8,12 +8,12 @@
     .container
       %ul
         %li.navbar-right
-          %a{href: '/hal-browser/browser.html'}
+          %a{ href: '/hal-browser/browser.html' }
             API Browser
   .container
     %h1.page-header
       Pacts
-    %table.table.table-bordered.table-striped{id: 'relationships'}
+    %table.table.table-bordered.table-striped{ id: 'relationships' }
       %thead
         %th
         %th.consumer
@@ -33,32 +33,32 @@
           Last<br>verified
       %tbody
 
-      - relationships.each do | relationship |
+      - index_items.each do | index_item |
         %tr
           %td
           %td.consumer
-            %a{:href => relationship.consumer_group_url}
-              = relationship.consumer_name
+            %a{ href: index_item.consumer_group_url }
+              = index_item.consumer_name
           %td.pact
-            %a{:href => relationship.latest_pact_url, :title => "View pact"}
+            %a{ href: index_item.pact_url, :title => "View pact" }
               %span.pact
           %td.provider
-            %a{:href => relationship.provider_group_url}
-              = relationship.provider_name
+            %a{ href: index_item.provider_group_url }
+              = index_item.provider_name
           %td
           %td
-            = relationship.publication_date_of_latest_pact
-          %td{class: relationship.webhook_status}
-            %a{:href => relationship.webhook_url}
-              = relationship.webhook_label
+            = index_item.publication_date_of_latest_pact
+          %td{class: index_item.webhook_status}
+            %a{ href: index_item.webhook_url }
+              = index_item.webhook_label
 
-          %td{class: relationship.verification_status, title: relationship.verification_tooltip, "data-toggle": "tooltip", "data-placement": "left"}
+          %td{ class: index_item.verification_status, title: index_item.verification_tooltip, "data-toggle": "tooltip", "data-placement": "left" }
             %div
-              = relationship.last_verified_date
-              - if relationship.warning?
-                %span.glyphicon.glyphicon-warning-sign{'aria-hidden':true}
+              = index_item.last_verified_date
+              - if index_item.warning?
+                %span.glyphicon.glyphicon-warning-sign{ 'aria-hidden': true }
     %div.relationships-size
-      = relationships.size_label
+      = index_items.size_label
 
 :javascript
   $(function(){

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

@@ -1,6 +1,6 @@
 %body
   %link{rel: 'stylesheet', href: '/css/bootstrap.min.css'}
-  %link{rel: 'stylesheet', href: '/stylesheets/relationships.css'}
+  %link{rel: 'stylesheet', href: '/stylesheets/index.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'}

data/lib/pact_broker/verifications/repository.rb

@@ -43,6 +43,9 @@ module PactBroker
           .all
       end
 
+      # The most recent verification for the latest revision of the pact
+      # belonging to the version with the largest consumer_version_order.
+
       def find_latest_verification_for consumer_name, provider_name, tag = nil
         query = LatestVerificationsByConsumerVersion
           .select_all_qualified

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = '2.9.0'
+  VERSION = '2.10.0'
 end

data/script/seed.rb

@@ -48,43 +48,59 @@ end
 #   .create_pact
 
 
+# TestDataBuilder.new
+#   .create_consumer("Foo")
+#   .create_label("microservice")
+#   .create_provider("Bar")
+#   .create_label("microservice")
+#   .create_webhook(method: 'GET', url: 'http://localhost:9393?url=${pactbroker.pactUrl}', body: '${pactbroker.pactUrl}')
+#   .create_consumer_version("1.2.100")
+#   .publish_pact
+#   .create_verification(provider_version: "1.4.234", success: true, execution_date: DateTime.now - 15)
+#   .revise_pact
+#   .create_consumer_version("1.2.101")
+#   .create_consumer_version_tag('prod')
+#   .publish_pact
+#   .create_verification(provider_version: "9.9.10", success: false, execution_date: DateTime.now - 15)
+#   .create_consumer_version("1.2.102")
+#   .publish_pact(created_at: (Date.today - 7).to_datetime)
+#   .create_verification(provider_version: "9.9.9", success: true, execution_date: DateTime.now - 14)
+#   .create_provider("Animals")
+#   .create_webhook(method: 'GET', url: 'http://localhost:9393/')
+#   .publish_pact(created_at: (Time.now - 140).to_datetime)
+#   .create_verification(provider_version: "2.0.366", execution_date: Date.today - 2) #changed
+#   .create_provider("Wiffles")
+#   .publish_pact
+#   .create_verification(provider_version: "3.6.100", success: false, execution_date: Date.today - 7)
+#   .create_provider("Hello World App")
+#   .create_consumer_version("1.2.107")
+#   .publish_pact(created_at: (Date.today - 1).to_datetime)
+#   .create_consumer("The Android App")
+#   .create_provider("The back end")
+#   .create_webhook(method: 'GET', url: 'http://localhost:9393/')
+#   .create_consumer_version("1.2.106")
+#   .create_consumer_version_tag("production")
+#   .create_consumer_version_tag("feat-x")
+#   .publish_pact
+#   .create_consumer("Some other app")
+#   .create_provider("A service")
+#   .create_webhook(method: 'GET', url: 'http://localhost:9393/')
+#   .create_triggered_webhook(status: 'success')
+#   .create_webhook_execution
+#   .create_webhook(method: 'POST', url: 'http://foo:9393/')
+#   .create_triggered_webhook(status: 'failure')
+#   .create_webhook_execution
+#   .create_consumer_version("1.2.106")
+#   .publish_pact(created_at: (Date.today - 26).to_datetime)
+#   .create_verification(provider_version: "4.8.152", execution_date: DateTime.now)
+
 TestDataBuilder.new
-  .create_consumer("Foo")
-  .create_label("microservice")
-  .create_provider("Bar")
-  .create_label("microservice")
-  .create_webhook(method: 'GET', url: 'http://localhost:9393?url=${pactbroker.pactUrl}', body: '${pactbroker.pactUrl}')
-  .create_consumer_version("1.2.100")
-  .publish_pact
-  .create_verification(provider_version: "1.4.234", success: true, execution_date: DateTime.now - 15)
-  .revise_pact
-  .create_consumer_version("1.2.101")
-  .publish_pact
-  .create_consumer_version("1.2.102")
-  .publish_pact(created_at: (Date.today - 7).to_datetime)
-  .create_provider("Animals")
-  .create_webhook(method: 'GET', url: 'http://localhost:9393/')
-  .publish_pact(created_at: (Time.now - 140).to_datetime)
-  .create_verification(provider_version: "2.0.366", execution_date: Date.today - 2) #changed
-  .create_provider("Wiffles")
-  .publish_pact
-  .create_verification(provider_version: "3.6.100", success: false, execution_date: Date.today - 7)
-  .create_provider("Hello World App")
-  .create_consumer_version("1.2.107")
-  .publish_pact(created_at: (Date.today - 1).to_datetime)
-  .create_consumer("The Android App")
-  .create_provider("The back end")
-  .create_webhook(method: 'GET', url: 'http://localhost:9393/')
-  .create_consumer_version("1.2.106")
-  .publish_pact
-  .create_consumer("Some other app")
-  .create_provider("A service")
-  .create_webhook(method: 'GET', url: 'http://localhost:9393/')
-  .create_triggered_webhook(status: 'success')
-  .create_webhook_execution
-  .create_webhook(method: 'POST', url: 'http://foo:9393/')
-  .create_triggered_webhook(status: 'failure')
-  .create_webhook_execution
-  .create_consumer_version("1.2.106")
-  .publish_pact(created_at: (Date.today - 26).to_datetime)
-  .create_verification(provider_version: "4.8.152", execution_date: DateTime.now)
+  .create_pact_with_hierarchy("A", "1", "B")
+  .create_consumer_version_tag("master")
+  .create_consumer_version_tag("prod")
+  .create_verification(provider_version: "1")
+  .create_consumer_version("2")
+  .create_consumer_version_tag("master")
+  .create_pact
+  .create_verification(provider_version: "2")
+

data/spec/integration/app_spec.rb

@@ -31,7 +31,7 @@ module PactBroker
     context "when Accept includes text/html" do
       let(:env) { {'HTTP_ACCEPT' => 'text/html'} }
 
-      subject { get path, '', env; last_response }
+      subject { get path, '', env; last_response.tap { |it| File.open("bethtest.html", "w") { |file| file << it.body } } }
 
       describe "a request for root" do
 

data/spec/integration/endpoints/{group.rb → group_spec.rb}

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe "/groups/{pacticipant-name}" do
 
   let(:app) { PactBroker::API }
@@ -18,5 +16,4 @@ describe "/groups/{pacticipant-name}" do
       expect(last_response.body).to_not be_nil
     end
   end
-
 end