pact_broker 2.54.0 → 2.55.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9147b88a513fab2205b74006fcba47e6aff79b52205bc04d639f15cdc4078d12
-  data.tar.gz: 784bae2c2977392c3671580ca59f094da810aed6ef842e66eec540d531cd00f5
+  metadata.gz: a7a4ca507c57031ed0e5aa7f988f4a0826bd97c2d8904431da26052fb6884558
+  data.tar.gz: e700fab3146413a638120a9d73655ee5b6ae8393932223654091588e1682798c
 SHA512:
-  metadata.gz: 6e8928e7c7b4d393d618e1ceec3b7e1a72d32db2e52c32f4e87a434ecce2857180a96db4a7103070fbddf8fd2d5661a411d273bc05c77042c22e68e1c5137912
-  data.tar.gz: 551c37f0fc7d63b11076adc2067800b7e2fd70ed52030859f07d287f80236d60520f60f67c91b9f1c3dca2695579a39021fe1b83ef5e5cccd8a05714f756c3a2
+  metadata.gz: e4d48c58ceb23d1b20dfdd3e263d52c69e30355c72bc27e00795c0b11a2a56b5c9bf52034b2f0e8d2dd2d09480ac7e6a5ae474d34457de7653e381fd6518e62c
+  data.tar.gz: e454fa82a641873ae68221190d91c84830aa0def182d6637fca1a34a9a1aecf64a4f165221283d5850deaef1a2d5580610b0ca214b6b2885b6ebe14bdc56250e

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+<a name="v2.55.0"></a>
+### v2.55.0 (2020-05-22)
+
+
+#### Features
+
+* support non root context (#344)	 ([dc480499](/../../commit/dc480499))
+
+
 <a name="v2.54.0"></a>
 ### v2.54.0 (2020-05-13)
 

data/lib/pact_broker/api/contracts/webhook_contract.rb

@@ -14,11 +14,13 @@ module PactBroker
           # I just cannot seem to get the validation to stop on the first error.
           # If one rule fails, they all come back failed, and it's driving me nuts.
           # Why on earth would I want that behaviour?
-          new_errors = Reform::Contract::Errors.new
-          errors.messages.each do | key, value |
-            new_errors.add(key, value.first)
+          # I cannot believe I have to do this shit.
+          @first_errors = errors
+          @first_errors.messages.keys.each do | key |
+            @first_errors.messages[key] = @first_errors.messages[key][0...1]
           end
-          @errors = new_errors
+
+          def self.errors; @first_errors end
           result
         end
 

data/lib/pact_broker/api/pact_broker_urls.rb

@@ -284,8 +284,8 @@ module PactBroker
         "#{base_url}/groups/#{pacticipant_name}"
       end
 
-      def hal_browser_url target_url
-        "/hal-browser/browser.html#" + target_url
+      def hal_browser_url target_url, base_url = ''
+        "#{base_url}/hal-browser/browser.html#" + target_url
       end
 
       def url_encode param

data/lib/pact_broker/api/renderers/html_pact_renderer.rb

@@ -37,18 +37,18 @@ module PactBroker
 
         def head
          "<title>#{title}</title>
-          <link rel='stylesheet' type='text/css' href='/stylesheets/github.css'>
-          <link rel='stylesheet' type='text/css' href='/stylesheets/pact.css'>
-          <link rel='stylesheet' type='text/css' href='/stylesheets/github-json.css'>
-          <link rel='stylesheet' type='text/css' href='/css/bootstrap.min.css'>
-          <link rel='stylesheet' type='text/css' href='/stylesheets/material-menu.css'>
-          <link rel='stylesheet' type='text/css' href='/stylesheets/jquery-confirm.min.css'>
-          <script src='/javascripts/highlight.pack.js'></script>
-          <script src='/javascripts/jquery-3.3.1.min.js'></script>
-          <script src='/js/bootstrap.min.js'></script>
-          <script src='/javascripts/material-menu.js'></script>
-          <script src='/javascripts/pact.js'></script>
-          <script src='/javascripts/jquery-confirm.min.js'></script>
+          <link rel='stylesheet' type='text/css' href='#{base_url}/stylesheets/github.css'>
+          <link rel='stylesheet' type='text/css' href='#{base_url}/stylesheets/pact.css'>
+          <link rel='stylesheet' type='text/css' href='#{base_url}/stylesheets/github-json.css'>
+          <link rel='stylesheet' type='text/css' href='#{base_url}/css/bootstrap.min.css'>
+          <link rel='stylesheet' type='text/css' href='#{base_url}/stylesheets/material-menu.css'>
+          <link rel='stylesheet' type='text/css' href='#{base_url}/stylesheets/jquery-confirm.min.css'>
+          <script src='#{base_url}/javascripts/highlight.pack.js'></script>
+          <script src='#{base_url}/javascripts/jquery-3.3.1.min.js'></script>
+          <script src='#{base_url}/js/bootstrap.min.js'></script>
+          <script src='#{base_url}/javascripts/material-menu.js'></script>
+          <script src='#{base_url}/javascripts/pact.js'></script>
+          <script src='#{base_url}/javascripts/jquery-confirm.min.js'></script>
           <script>hljs.initHighlightingOnLoad();</script>"
         end
 
@@ -72,7 +72,7 @@ module PactBroker
                 <a href=\"#{matrix_url}\">View Matrix</a>
               </li>
               <li>
-                <a href=\"/\">Home</a>
+                <a href=\"#{base_url}\">Home</a>
               </li>
               <li>
                 <span data-consumer-name=\"#{@pact.consumer.name}\"
@@ -129,7 +129,7 @@ module PactBroker
         end
 
         def json_url
-          PactBroker::Api::PactBrokerUrls.hal_browser_url pact_url
+          PactBroker::Api::PactBrokerUrls.hal_browser_url pact_url, base_url
         end
 
         def pact_url

data/lib/pact_broker/api/resources/pact.rb

@@ -100,7 +100,7 @@ module PactBroker
 
         def set_post_deletion_response
           latest_pact = pact_service.find_latest_pact(pact_params)
-          response_body = { "_links" => {} }
+          response_body = { "_links" => { index: { href: base_url } } }
           if latest_pact
             response_body["_links"]["pb:latest-pact-version"] = {
               href: latest_pact_url(base_url, latest_pact),

data/lib/pact_broker/doc/controllers/app.rb

@@ -33,7 +33,7 @@ module PactBroker
         get ":rel_name" do
           rel_name = params[:rel_name]
           context = params[:context]
-          view_params = {:layout_engine => :haml, layout: :'layouts/main'}
+          view_params = {:layout_engine => :haml, layout: :'layouts/main', locals: { base_url: base_url }}
           if resource_exists? rel_name, context
             markdown view_name_for(rel_name, context).to_sym, view_params, {}
           elsif resource_exists? rel_name
@@ -42,6 +42,12 @@ module PactBroker
             markdown :not_found, view_params, {}
           end
         end
+
+        private
+
+        def base_url
+          PactBroker.configuration.base_url || request.base_url
+        end
       end
     end
   end

data/lib/pact_broker/doc/views/layouts/main.haml

@@ -1,5 +1,5 @@
 %html
   %head
-    %link{rel: 'stylesheet', href: '/css/bootstrap.min.css'}
+    %link{rel: 'stylesheet', href: "#{base_url}/css/bootstrap.min.css"}
   %body{style: 'margin:20px'}
     = yield

data/lib/pact_broker/ui/app.rb

@@ -47,6 +47,7 @@ module PactBroker
           end
 
           map "/" do
+            use PathInfoFixer
             run PactBroker::UI::Controllers::Index
           end
         }

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

@@ -18,8 +18,8 @@ module PactBroker
         end
 
         get "/" do
-          view_model = ViewDomain::IndexItems.new(pacticipant_service.find_index_items)
-          haml 'clusters/show', locals: {relationships: view_model}
+          view_model = ViewDomain::IndexItems.new(pacticipant_service.find_index_items, base_url: base_url)
+          haml 'clusters/show', locals: {relationships: view_model, base_url: base_url}
         end
 
       end

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

@@ -13,9 +13,10 @@ module PactBroker
           pacticipant = pacticipant_service.find_pacticipant_by_name(params[:name])
           erb :'groups/show.html', {
               locals: {
-                csv_path: "/groups/#{params[:name]}.csv",
+                csv_path: "#{base_url}/groups/#{params[:name]}.csv",
                 pacticipant_name: params[:name],
-                repository_url: pacticipant&.repository_url
+                repository_url: pacticipant&.repository_url,
+                base_url: base_url
               }
             }, {
               layout: 'layouts/main'

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

@@ -25,7 +25,7 @@ module PactBroker
 
           # TODO remove this code when verified
           options[:optimised] = true unless params[:optimised] == 'false'
-          index_items = ViewDomain::IndexItems.new(index_service.find_index_items(options))
+          index_items = ViewDomain::IndexItems.new(index_service.find_index_items(options), base_url: base_url)
 
           page = tags ? :'index/show-with-tags' : :'index/show'
           locals = {
@@ -34,7 +34,8 @@ module PactBroker
             page_number: page_number,
             page_size: page_size,
             pagination_record_count: index_items.pagination_record_count,
-            current_page_size: index_items.size
+            current_page_size: index_items.size,
+            base_url: base_url
           }
 
           haml page, {locals: locals, layout: :'layouts/main'}

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

@@ -21,7 +21,8 @@ module PactBroker
             lines: [],
             title: "The Matrix",
             selectors: create_selector_objects(selectors),
-            options: create_options_model(options)
+            options: create_options_model(options),
+            base_url: base_url
           }
           begin
             if params[:q]
@@ -48,7 +49,7 @@ module PactBroker
           selectors = [ PactBroker::Matrix::UnresolvedSelector.new(pacticipant_name: params[:consumer_name]), PactBroker::Matrix::UnresolvedSelector.new(pacticipant_name: params[:provider_name]) ]
           options = {latestby: 'cvpv', limit: 100}
           lines = matrix_service.find(selectors, options)
-          lines = PactBroker::UI::ViewDomain::MatrixLines.new(lines)
+          lines = PactBroker::UI::ViewDomain::MatrixLines.new(lines, base_url: base_url)
           locals = {
             lines: lines,
             title: "The Matrix",
@@ -56,7 +57,8 @@ module PactBroker
             provider_name: params[:provider_name],
             selectors: create_selector_objects(selectors),
             options: create_options_model(options),
-            badge_url: nil
+            badge_url: nil,
+            base_url: base_url
           }
           haml :'matrix/show', {locals: locals, layout: :'layouts/main'}
         end

data/lib/pact_broker/ui/helpers/url_helper.rb

@@ -7,12 +7,12 @@ module PactBroker
 
         extend self
 
-        def group_url pacticipant_name
-          "/groups/#{ERB::Util.url_encode(pacticipant_name)}"
+        def group_url pacticipant_name, base_url = ''
+          "#{base_url}/groups/#{ERB::Util.url_encode(pacticipant_name)}"
         end
 
-        def matrix_url consumer_name, provider_name
-          "/matrix/provider/#{ERB::Util.url_encode(provider_name)}/consumer/#{ERB::Util.url_encode(consumer_name)}"
+        def matrix_url consumer_name, provider_name, base_url = ''
+          "#{base_url}/matrix/provider/#{ERB::Util.url_encode(provider_name)}/consumer/#{ERB::Util.url_encode(consumer_name)}"
         end
       end
     end

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

@@ -11,8 +11,9 @@ module PactBroker
 
         include PactBroker::Api::PactBrokerUrls
 
-        def initialize relationship
+        def initialize relationship, options = {}
           @relationship = relationship
+          @options = options
         end
 
         def consumer_name
@@ -48,23 +49,23 @@ module PactBroker
         end
 
         def consumer_group_url
-          Helpers::URLHelper.group_url consumer_name
+          Helpers::URLHelper.group_url(consumer_name, base_url)
         end
 
         def provider_group_url
-          Helpers::URLHelper.group_url provider_name
+          Helpers::URLHelper.group_url(provider_name, base_url)
         end
 
         def latest_pact_url
-          "#{pactigration_base_url('', @relationship)}/latest"
+          "#{pactigration_base_url(base_url, @relationship)}/latest"
         end
 
         def pact_url
-          PactBroker::Api::PactBrokerUrls.pact_url('', @relationship)
+          PactBroker::Api::PactBrokerUrls.pact_url(base_url, @relationship)
         end
 
         def pact_matrix_url
-          Helpers::URLHelper.matrix_url consumer_name, provider_name
+          Helpers::URLHelper.matrix_url(consumer_name, provider_name, base_url)
         end
 
         def any_webhooks?
@@ -72,11 +73,11 @@ module PactBroker
         end
 
         def pact_versions_url
-          PactBroker::Api::PactBrokerUrls.pact_versions_url(consumer_name, provider_name)
+          PactBroker::Api::PactBrokerUrls.pact_versions_url(consumer_name, provider_name, base_url)
         end
 
         def integration_url
-          PactBroker::Api::PactBrokerUrls.integration_url(consumer_name, provider_name)
+          PactBroker::Api::PactBrokerUrls.integration_url(consumer_name, provider_name, base_url)
         end
 
         def webhook_label
@@ -114,11 +115,11 @@ module PactBroker
         def webhook_url
           url = case @relationship.webhook_status
             when :none
-              PactBroker::Api::PactBrokerUrls.webhooks_for_consumer_and_provider_url @relationship.latest_pact.consumer, @relationship.latest_pact.provider
+              PactBroker::Api::PactBrokerUrls.webhooks_for_consumer_and_provider_url @relationship.latest_pact.consumer, @relationship.latest_pact.provider, base_url
             else
-              PactBroker::Api::PactBrokerUrls.webhooks_status_url @relationship.latest_pact.consumer, @relationship.latest_pact.provider
+              PactBroker::Api::PactBrokerUrls.webhooks_status_url @relationship.latest_pact.consumer, @relationship.latest_pact.provider, base_url
           end
-          "/hal-browser/browser.html##{url}"
+          PactBroker::Api::PactBrokerUrls.hal_browser_url(url, base_url)
         end
 
         def last_verified_date
@@ -181,6 +182,10 @@ module PactBroker
             version_number
           end
         end
+
+        def base_url
+          @options[:base_url]
+        end
       end
     end
   end

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

@@ -7,9 +7,9 @@ module PactBroker
 
         attr_reader :pagination_record_count
 
-        def initialize index_items
+        def initialize index_items, options = {}
           # Why are we sorting twice!?
-          @index_items = index_items.collect{ |index_item| IndexItem.new(index_item) }.sort
+          @index_items = index_items.collect{ |index_item| IndexItem.new(index_item, options) }.sort
           # until the feature flag is turned on
           @pagination_record_count = index_items.size
           @pagination_record_count = index_items.pagination_record_count if index_items.respond_to?(:pagination_record_count)

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

@@ -12,8 +12,9 @@ module PactBroker
         include PactBroker::Api::PactBrokerUrls
         include PactBroker::Messages
 
-        def initialize line
+        def initialize line, options = {}
           @line = line
+          @options = options
           @overwritten = false # true if the pact was revised and this revision is no longer the latest
         end
 
@@ -22,7 +23,7 @@ module PactBroker
         end
 
         def provider_name_url
-          hal_browser_url(pacticipant_url_from_params(pacticipant_name: provider_name))
+          hal_browser_url(pacticipant_url_from_params({ pacticipant_name: provider_name }, base_url), base_url)
         end
 
         def consumer_name
@@ -30,7 +31,7 @@ module PactBroker
         end
 
         def consumer_name_url
-          hal_browser_url(pacticipant_url_from_params(pacticipant_name: consumer_name))
+          hal_browser_url(pacticipant_url_from_params({ pacticipant_name: consumer_name }, base_url), base_url)
         end
 
         def pact_version_sha
@@ -68,7 +69,7 @@ module PactBroker
 
         def consumer_version_number_url
           params = { pacticipant_name: consumer_name, version_number: consumer_version_number }
-          hal_browser_url(version_url_from_params(params))
+          hal_browser_url(version_url_from_params(params, base_url), base_url)
         end
 
         def consumer_version_order
@@ -85,7 +86,7 @@ module PactBroker
 
         def provider_version_number_url
           params = { pacticipant_name: provider_name, version_number: provider_version_number }
-          hal_browser_url(version_url_from_params(params))
+          hal_browser_url(version_url_from_params(params, base_url), base_url)
         end
 
         def provider_version_order
@@ -142,7 +143,7 @@ module PactBroker
         end
 
         def verification_status_url
-          hal_browser_url(verification_url(self))
+          hal_browser_url(verification_url(self, base_url), base_url)
         end
 
         def pact_publication_date
@@ -150,7 +151,7 @@ module PactBroker
         end
 
         def pact_publication_date_url
-          pact_url('', @line)
+          pact_url(base_url, @line)
         end
 
         def relative_date date
@@ -182,6 +183,10 @@ module PactBroker
             message("messages.matrix.pre_verified")
           end
         end
+
+        def base_url
+          @options[:base_url]
+        end
       end
     end
   end

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

@@ -5,9 +5,9 @@ module PactBroker
     module ViewDomain
       class MatrixLines < Array
 
-        def initialize rows
+        def initialize rows, options = {}
           lines = rows.collect do | row |
-            PactBroker::UI::ViewDomain::MatrixLine.new(row)
+            PactBroker::UI::ViewDomain::MatrixLine.new(row, options)
           end
           super(lines.sort)
         end

data/lib/pact_broker/ui/views/groups/show.html.erb

@@ -5,11 +5,11 @@
 <head>
 <meta charset="utf-8">
 <title>Network Graph</title>
-<link rel='shortcut icon' href='/favicon.ico' type='image/x-icon'/>
+<link rel='shortcut icon' href='<%= base_url %>/favicon.ico' type='image/x-icon'/>
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 <meta name="description" content="">
 <meta name="author" content="Duncan Alexander">
-<script type="text/javascript" src="/javascripts/d3.v3.js.pagespeed.ce.dFNRrGTALe.js"></script>
+<script type="text/javascript" src="<%= base_url %>/javascripts/d3.v3.js.pagespeed.ce.dFNRrGTALe.js"></script>
 <style>
 body{
     font-family:"Helvetica Neue",Arial,sans-serif;
@@ -105,7 +105,7 @@ var relationshipPath = function(relationship, nodeLocations, pacticipants) {
 
 var latestPactUrl = function (consumerName, providerName) {
     //TODO send this with the relationship data
-    return '/pacts/provider/' + providerName + '/consumer/' + consumerName + '/latest';
+    return '<%= base_url %>/pacts/provider/' + providerName + '/consumer/' + consumerName + '/latest';
 };
 
 var relationshipData = function(pacticipant, relationships) {

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

@@ -1,9 +1,9 @@
-%link{rel: 'stylesheet', href: '/stylesheets/index.css'}
-%link{rel: 'stylesheet', href: '/stylesheets/material-menu.css'}
-%link{rel: 'stylesheet', href: '/stylesheets/material-icon.css'}
-%link{rel: 'stylesheet', href: '/stylesheets/jquery-confirm.min.css'}
-%script{type: 'text/javascript', src:'/javascripts/jquery.tablesorter.min.js'}
-%script{type: 'text/javascript', src:'/javascripts/material-menu.js'}
-%script{type: 'text/javascript', src:'/javascripts/index.js'}
-%script{type: 'text/javascript', src:'/javascripts/clipboard.js'}
-%script{type: 'text/javascript', src:'/javascripts/jquery-confirm.min.js'}
+%link{rel: 'stylesheet', href: "#{base_url}/stylesheets/index.css"}
+%link{rel: 'stylesheet', href: "#{base_url}/stylesheets/material-menu.css"}
+%link{rel: 'stylesheet', href: "#{base_url}/stylesheets/material-icon.css"}
+%link{rel: 'stylesheet', href: "#{base_url}/stylesheets/jquery-confirm.min.css"}
+%script{type: 'text/javascript', src:"#{base_url}/javascripts/jquery.tablesorter.min.js"}
+%script{type: 'text/javascript', src:"#{base_url}/javascripts/material-menu.js"}
+%script{type: 'text/javascript', src:"#{base_url}/javascripts/index.js"}
+%script{type: 'text/javascript', src:"#{base_url}/javascripts/clipboard.js"}
+%script{type: 'text/javascript', src:"#{base_url}/javascripts/jquery-confirm.min.js"}

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

@@ -4,11 +4,11 @@
     %ul.navbar-right#top-left-menu
       %li
         - if tag_toggle
-          %a{href: './?tags=true'}
+          %a{href: "#{base_url}?tags=true"}
             Show latest tags
         - else
-          %a{href: './'}
+          %a{href: "#{base_url}"}
             Hide latest tags
 
-        %a{href: '/hal-browser/browser.html'}
+        %a{href: "#{base_url}/hal-browser/browser.html"}
           API Browser

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

@@ -1,4 +1,4 @@
-%script{type: 'text/javascript', src:'/javascripts/pagination.js'}
+%script{type: 'text/javascript', src:"#{base_url}/javascripts/pagination.js"}
 
 :javascript
   const PAGE_NUMBER = #{page_number};

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

@@ -1,7 +1,7 @@
 %body
   = render :haml, :'index/_css_and_js', :layout => false
   .container
-    = render :haml, :'index/_navbar', :layout => false, locals: {tag_toggle: false}
+    = render :haml, :'index/_navbar', :layout => false, locals: {tag_toggle: false, base_url: base_url}
     - if index_items.empty?
       = render :haml, :'index/_getting-started', :layout => false
     %h1.page-header
@@ -96,8 +96,8 @@
     $(document).ready(function(){
       initializeClipper(".clippable");
 
-      $("span.pact a").load("/images/doc-text.svg");
-      $("span.pact-matrix a").load("/images/doc-matrix.svg");
+      $("span.pact a").load("#{base_url}/images/doc-text.svg");
+      $("span.pact-matrix a").load("#{base_url}/images/doc-matrix.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

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

@@ -1,7 +1,7 @@
 %body
   = render :haml, :'index/_css_and_js', :layout => false
   .container
-    = render :haml, :'index/_navbar', :layout => false, locals: {tag_toggle: true}
+    = render :haml, :'index/_navbar', :layout => false, locals: {tag_toggle: true, base_url: base_url}
     - if index_items.empty?
       = render :haml, :'index/_getting-started', :layout => false
     %h1.page-header
@@ -67,8 +67,8 @@
     });
 
     $(document).ready(function(){
-      $("span.pact a").load("/images/doc-text.svg");
-      $("span.pact-matrix a").load("/images/doc-matrix.svg");
+      $("span.pact a").load("#{base_url}/images/doc-text.svg");
+      $("span.pact-matrix a").load("#{base_url}/images/doc-matrix.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

data/lib/pact_broker/ui/views/layouts/main.haml

@@ -2,8 +2,8 @@
 %html
   %head
     %title= defined?(title) ? title : ""
-    %link{rel: 'shortcut icon', href: '/images/favicon.ico', type:'image/x-icon'}
-    %link{rel: 'stylesheet', href: '/css/bootstrap.min.css'}
-    %script{type: 'text/javascript', src:'/javascripts/jquery-3.3.1.min.js'}
-    %script{type: 'text/javascript', src:'/js/bootstrap.min.js'}
+    %link{rel: 'shortcut icon', href: "#{base_url}/images/favicon.ico", type:'image/x-icon'}
+    %link{rel: 'stylesheet', href: "#{base_url}/css/bootstrap.min.css"}
+    %script{type: 'text/javascript', src:"#{base_url}/javascripts/jquery-3.3.1.min.js"}
+    %script{type: 'text/javascript', src:"#{base_url}/js/bootstrap.min.js"}
   = yield

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

@@ -1,16 +1,16 @@
 %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-3.3.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:'/javascripts/clipboard.js'}
-  %script{type: 'text/javascript', src:'/js/bootstrap.min.js'}
+  %link{rel: 'stylesheet', href: "#{base_url}/css/bootstrap.min.css"}
+  %link{rel: 'stylesheet', href: "#{base_url}/stylesheets/index.css"}
+  %link{rel: 'stylesheet', href: "#{base_url}/stylesheets/matrix.css"}
+  %script{type: 'text/javascript', src: "#{base_url}/javascripts/jquery-3.3.1.min.js"}
+  %script{type: 'text/javascript', src: "#{base_url}/javascripts/jquery.tablesorter.min.js"}
+  %script{type: 'text/javascript', src: "#{base_url}/javascripts/matrix.js"}
+  %script{type: 'text/javascript', src: "#{base_url}/javascripts/clipboard.js"}
+  %script{type: 'text/javascript', src: "#{base_url}/js/bootstrap.min.js"}
 
   .container
     .navbar-right
-      %a{href: '/'}
+      %a{href: base_url}
         Home
     %h1.page-header
       = title
@@ -23,7 +23,7 @@
           = escape_html(error)
 
 
-    %form{action: '/matrix', onsubmit:'return onSubmit()'}
+    %form{action: "#{base_url}/matrix", onsubmit:'return onSubmit()'}
       - selectors.each_with_index do | selector, index |
         .selector
           %label{for: "pacticipant#{index}"}

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = '2.54.0'
+  VERSION = '2.55.0'
 end

data/lib/pact_broker/webhooks/service.rb

@@ -40,12 +40,13 @@ module PactBroker
       def self.errors webhook, uuid = nil
         contract = PactBroker::Api::Contracts::WebhookContract.new(webhook)
         contract.validate(webhook.attributes)
-        errors = contract.errors
+        messages = contract.errors.messages
 
         if uuid && !valid_uuid_format?(uuid)
-          errors.add("uuid", message("errors.validation.invalid_webhook_uuid"))
+          messages["uuid"] = [message("errors.validation.invalid_webhook_uuid")]
         end
-        errors
+
+        OpenStruct.new(messages: messages, empty?: messages.empty?, any?: messages.any?)
       end
 
       def self.create uuid, webhook, consumer, provider

data/pact_broker.gemspec

@@ -46,7 +46,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'httparty', '~> 0.14'
   gem.add_runtime_dependency 'json', '~> 2.3'
   gem.add_runtime_dependency 'roar', '~> 1.1'
-  gem.add_runtime_dependency 'reform', '~> 2.2'
+  gem.add_runtime_dependency 'reform', '~> 2.3','>= 2.3.1'
   gem.add_runtime_dependency 'dry-validation', '~> 0.10.5'
   gem.add_runtime_dependency 'sequel', '~> 5.28'
   gem.add_runtime_dependency 'webmachine', '1.5.0'

data/public/javascripts/pact.js

@@ -74,7 +74,7 @@ function promptToDeleteResource(deletionUrl, confirmationText) {
   confirmDeleteResource(confirmationText, confirmed, cancelled);
 }
 
-function createWhereToNextConfirmationConfiguration(latestPactUrl) {
+function createWhereToNextConfirmationConfiguration(latestPactUrl, indexUrl) {
   return {
     title: "Pact deleted",
     content: "Where to next?",
@@ -89,14 +89,14 @@ function createWhereToNextConfirmationConfiguration(latestPactUrl) {
       home: {
         text: "Home",
         action: function() {
-          window.location.href = "/";
+          window.location.href = indexUrl;
         }
       }
     }
   };
 }
 
-function createAllPactsDeletedConfirmationConfiguration() {
+function createAllPactsDeletedConfirmationConfiguration(indexUrl) {
   return {
     title: "Pact deleted",
     content: "All versions of this pact have now been deleted.",
@@ -104,7 +104,7 @@ function createAllPactsDeletedConfirmationConfiguration() {
       home: {
         text: "Home",
         action: function() {
-          window.location.href = "/";
+          window.location.href = indexUrl;
         }
       }
     }
@@ -115,11 +115,12 @@ function handleDeletionSuccess(responseBody) {
   if (responseBody._links["pb:latest-pact-version"]) {
     $.confirm(
       createWhereToNextConfirmationConfiguration(
-        responseBody._links["pb:latest-pact-version"].href
+        responseBody._links["pb:latest-pact-version"].href,
+        responseBody._links["index"].href
       )
     );
   } else {
-    $.confirm(createAllPactsDeletedConfirmationConfiguration());
+    $.confirm(createAllPactsDeletedConfirmationConfiguration(responseBody._links["index"].href));
   }
 }
 

data/script/seed.rb

@@ -59,7 +59,7 @@ TestDataBuilder.new
     body: webhook_body.to_json)
   .set_now(Date.today - 101)
   .tap{ | it |
-    100.times do | i |
+    2.times do | i |
       it.create_pact_with_verification("Foo", i.to_s, "Bar", i.to_s)
       .create_pact_with_verification("Bar", i.to_s, "Foo", i.to_s)
       .add_day

data/spec/lib/pact_broker/api/renderers/html_pact_renderer_spec.rb

@@ -56,7 +56,7 @@ module PactBroker
             expect(subject).to include("<html>")
             expect(subject).to include("</html>")
             expect(subject).to include("<link rel='stylesheet'")
-            expect(subject).to include("href='/stylesheets/github.css'")
+            expect(subject).to include("href='http://base/stylesheets/github.css'")
             expect(subject).to include('<pre><code')
             expect(subject).to include('&quot;method&quot;:')
             expect(subject).to match /<h\d>.*Some Consumer/

data/vendor/hal-browser/browser.html

@@ -26,7 +26,7 @@
             <ul class="nav">
               <li><a href="#/" id="entryPointLink">Go To Entry Point</a></li>
               <li><a href="https://github.com/mikekelly/hal-browser">About The HAL Browser</a></li>
-              <li><a href="/">Pact Broker Home</a></li> <!-- pact_broker -->
+              <li><a href="/" id="pactBrokerHomeLink">Pact Broker Home</a></li> <!-- pact_broker -->
             </ul>
           </div>
         </div>
@@ -251,10 +251,13 @@ Content-Type: application/json
   <script src="js/hal/views/documentation.js"></script>
 
   <script>
+    var baseUrl = window.location.href.split('/hal-browser/')[0]; //pact_broker
     var browser = new HAL.Browser({
       container: $('#browser'),
-      entryPoint: '/'
+      entryPoint: baseUrl //pact_broker
     });
     Backbone.history.start();
+
+    $('#pactBrokerHomeLink').attr('href', baseUrl); //pact_broker
   </script>
 </body>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 2.54.0
+  version: 2.55.0
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-13 00:00:00.000000000 Z
+date: 2020-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -60,14 +60,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.3.1
 - !ruby/object:Gem::Dependency
   name: dry-validation
   requirement: !ruby/object:Gem::Requirement