pact_broker 2.7.0.beta.1 → 2.7.0.beta.2

data/lib/pact_broker/domain/relationship.rb

@@ -7,26 +7,22 @@ module PactBroker
 
       attr_reader :consumer, :provider, :latest_pact, :latest_verification, :webhooks
 
-      def initialize consumer, provider, latest_pact = nil, latest = true, latest_verification = nil, webhooks = [], triggered_webhooks = [], tags = []
+      def initialize consumer, provider, latest_pact = nil, latest_verification = nil, webhooks = [], triggered_webhooks = []
         @consumer = consumer
         @provider = provider
         @latest_pact = latest_pact
-        @latest = latest
         @latest_verification = latest_verification
         @webhooks = webhooks
         @triggered_webhooks = triggered_webhooks
-        @tags = tags
       end
 
-      def self.create consumer, provider, latest_pact, latest, latest_verification, webhooks = [], triggered_webhooks = [], tags = []
-        new consumer, provider, latest_pact, latest, latest_verification, webhooks, triggered_webhooks, tags
+      def self.create consumer, provider, latest_pact, latest_verification, webhooks = [], triggered_webhooks = []
+        new consumer, provider, latest_pact, latest_verification, webhooks, triggered_webhooks
       end
 
       def eq? other
         Relationship === other && other.consumer == consumer && other.provider == provider &&
-          other.latest_pact == latest_pact &&
-          other.latest? == latest? &&
-          other.latest_verification == latest_verification &&
+          other.latest_pact == latest_pact && other.latest_verification == latest_verification &&
           other.webhooks == webhooks
       end
 
@@ -46,22 +42,6 @@ module PactBroker
         @latest_pact
       end
 
-      def latest?
-        @latest
-      end
-
-      def consumer_version_number
-        @latest_pact.consumer_version_number
-      end
-
-      def provider_version_number
-        @latest_verification ? @latest_verification.provider_version_number : nil
-      end
-
-      def tag_names
-        @tags
-      end
-
       def any_webhooks?
         @webhooks.any?
       end

data/lib/pact_broker/matrix/parse_query.rb

@@ -0,0 +1,22 @@
+require 'rack/utils'
+
+module PactBroker
+  module Matrix
+    class ParseQuery
+      def self.call query
+        params = Rack::Utils.parse_nested_query(query)
+        selectors = (params['q'] || []).collect{ |i| { pacticipant_name: i['pacticipant'], pacticipant_version_number: i['version'] } }
+        options = {}
+        if params.key?('success') && params['success'].is_a?(Array)
+          options[:success] = params['success'].collect do | value |
+            value == '' ? nil : value == 'true'
+          end
+        end
+        if params.key?('success') && params['success'].is_a?(String)
+          options[:success] = [params['success'] == '' ? nil : params['success'] == 'true']
+        end
+        return selectors, options
+      end
+    end
+  end
+end

data/lib/pact_broker/matrix/repository.rb

@@ -6,46 +6,77 @@ module PactBroker
       include PactBroker::Repositories::Helpers
       include PactBroker::Repositories
 
-      def find pacticipant_1_name, pacticipant_2_name
-        find_for_version_ids([], [pacticipant_1_name, pacticipant_2_name])
-          .sort{|l1, l2| l2[:consumer_version_order] <=> l1[:consumer_version_order]}
-      end
+      # Return the latest matrix row (pact/verification) for each consumer_version_number/provider_version_number
+      def find selectors, options = {}
+        # The group with the nil provider_version_numbers will be the results of the left outer join
+        # that don't have verifications, so we need to include them all.
+        lines = find_all(selectors)
+          .group_by{|line| [line[:consumer_name], line[:consumer_version_number], line[:provider_name], line[:provider_version_number]]}
+          .values
+          .collect{ | lines | lines.first[:provider_version_number].nil? ? lines : lines.last }
+          .flatten
 
-      ##
-      # candidate_versions Hash of pacticipant name => version
-      # Ihe value is nil, it means all versions for that pacticipant are to be included
-      # Returns a list of matrix lines indicating the compatible versions
-      #
-      def find_compatible_pacticipant_versions criteria
-        version_ids = criteria.reject{ |key, value| !value }.collect do | key, value |
-          version_repository.find_by_pacticipant_name_and_number(key, value).id
+        if options.key?(:success)
+          lines = lines.select{ |l| options[:success].include?(l[:success]) }
         end
 
-        pacticipant_names = criteria.reject{|key, value| value }.keys
+        lines
+      end
 
-        find_for_version_ids(version_ids, pacticipant_names)
-          .group_by{|line| [line[:consumer_version_number], line[:provider_version_number]]}
-          .values
-          .collect(&:last)
-          .select{ |line | line[:success] }
+      def find_for_consumer_and_provider pacticipant_1_name, pacticipant_2_name
+        selectors = [{ pacticipant_name: pacticipant_1_name }, { pacticipant_name: pacticipant_2_name }]
+        find_all(selectors)
+          .sort{|l1, l2| l2[:consumer_version_order] <=> l1[:consumer_version_order]}
+      end
+
+      def find_compatible_pacticipant_versions selectors
+        find(selectors).select{ |line | line[:success] }
       end
 
-      def find_for_version_ids version_ids, pacticipant_names = []
-        PactBroker::Pacts::LatestPactPublicationsByConsumerVersion
+      ##
+      # If the version is nil, it means all versions for that pacticipant are to be included
+      #
+      def find_all selectors
+        query = PactBroker::Pacts::LatestPactPublicationsByConsumerVersion
           .select_append(:consumer_version_number, :provider_name, :consumer_name, :provider_version_id, :provider_version_number, :success)
           .select_append(Sequel[:latest_pact_publications_by_consumer_versions][:created_at].as(:pact_created_at))
           .select_append(Sequel[:all_verifications][:number])
           .select_append(Sequel[:all_verifications][:id].as(:verification_id))
           .select_append(Sequel[:execution_date].as(:verification_executed_at))
           .left_outer_join(:all_verifications, pact_version_id: :pact_version_id)
-          .where(provider_version_id: version_ids)
-            .or(provider_version_id: nil)
-            .or(provider_name: pacticipant_names)
-          .where(consumer_version_id: version_ids)
-            .or(consumer_name: pacticipant_names)
-          .order(:execution_date, :verification_id)
+
+        if selectors.size == 1
+          query = where_consumer_or_provider_is(selectors.first, query)
+        else
+          query = where_consumer_and_provider_within(selectors, query)
+        end
+
+        query.order(:execution_date, :verification_id)
           .collect(&:values)
       end
+
+      def where_consumer_and_provider_within 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

@@ -3,14 +3,17 @@ require 'pact_broker/repositories'
 module PactBroker
   module Matrix
     module Service
-      VERSION_SELECTOR_PATTERN = %r{(^[^/]+)/version/[^/]+$}.freeze
 
       extend self
       extend PactBroker::Repositories
       extend PactBroker::Services
 
-      def find params
-        matrix_repository.find params[:consumer_name], params[:provider_name]
+      def find criteria, options = {}
+        matrix_repository.find criteria, options
+      end
+
+      def find_for_consumer_and_provider params
+        matrix_repository.find_for_consumer_and_provider params[:consumer_name], params[:provider_name]
       end
 
       def find_compatible_pacticipant_versions criteria
@@ -19,30 +22,34 @@ module PactBroker
 
       def validate_selectors selectors
         error_messages = []
-        selectors.each do | version_selector |
-          if !(version_selector =~ VERSION_SELECTOR_PATTERN)
-            error_messages << "Invalid version selector '#{version_selector}'. Format must be <pacticipant_name>/version/<version>"
+
+        selectors.each do | selector |
+          if selector[:pacticipant_name].nil? && selector[:pacticipant_version_number].nil?
+            error_messages << "Please specify the pacticipant name and version"
+          elsif selector[:pacticipant_name].nil?
+            error_messages << "Please specify the pacticipant name"
           end
         end
 
-        selectors.each do | version_selector |
-          if match = version_selector.match(VERSION_SELECTOR_PATTERN)
-            pacticipant_name = match[1]
-            unless pacticipant_service.find_pacticipant_by_name(pacticipant_name)
-              error_messages << "Pacticipant '#{pacticipant_name}' not found"
-            end
+        selectors.collect{ |selector| selector[:pacticipant_name] }.compact.each do | pacticipant_name |
+          unless pacticipant_service.find_pacticipant_by_name(pacticipant_name)
+            error_messages << "Pacticipant '#{pacticipant_name}' not found"
           end
         end
 
         if error_messages.empty?
-          selected_versions = version_service.find_versions_by_selector(selectors)
-          if selected_versions.any?(&:nil?)
-            selected_versions.each_with_index do | selected_version, i |
-              error_messages << "No pact or verification found for #{selectors[i]}" if selected_version.nil?
+          selectors.each do | selector |
+            if selector[:pacticipant_version_number]
+              version = version_service.find_by_pacticipant_name_and_number(pacticipant_name: selector[:pacticipant_name], pacticipant_version_number: selector[:pacticipant_version_number])
+              error_messages << "No pact or verification found for #{selector[:pacticipant_name]} version #{selector[:pacticipant_version_number]}" if version.nil?
             end
           end
         end
 
+        if selectors.size == 0
+          error_messages << "Please provide 1 or more version selectors."
+        end
+
         error_messages
       end
     end

data/lib/pact_broker/pacticipants/service.rb

@@ -62,27 +62,11 @@ module PactBroker
       def self.find_relationships
         pact_repository.find_latest_pacts
           .collect do | pact|
-            latest_relationship = build_latest_pact_relationship(pact)
-            prod_relationship = build_relationship_for_tagged_pact(pact, 'prod')
-            production_relationship = build_relationship_for_tagged_pact(pact, 'production')
-            [latest_relationship, prod_relationship, production_relationship].compact
-          end.flatten
-      end
-
-      def self.build_latest_pact_relationship pact
-        latest_verification = verification_service.find_latest_verification_for(pact.consumer, pact.provider)
-        webhooks = webhook_service.find_by_consumer_and_provider pact.consumer, pact.provider
-        triggered_webhooks = webhook_service.find_latest_triggered_webhooks pact.consumer, pact.provider
-        tag_names = pact.consumer_version_tag_names.select{ |name| name == 'prod' || name == 'production' }
-        PactBroker::Domain::Relationship.create pact.consumer, pact.provider, pact, true, latest_verification, webhooks, triggered_webhooks, tag_names
-      end
-
-      def self.build_relationship_for_tagged_pact latest_pact, tag
-        pact = pact_service.find_latest_pact consumer_name: latest_pact.consumer_name, provider_name: latest_pact.provider_name, tag: tag
-        return nil unless pact
-        return nil if pact.id == latest_pact.id
-        verification = verification_repository.find_latest_verification_for pact.consumer_name, pact.provider_name, tag
-        PactBroker::Domain::Relationship.create pact.consumer, pact.provider, pact, false, verification, [], [], [tag]
+            latest_verification = verification_service.find_latest_verification_for(pact.consumer, pact.provider)
+            webhooks = webhook_service.find_by_consumer_and_provider pact.consumer, pact.provider
+            triggered_webhooks = webhook_service.find_latest_triggered_webhooks pact.consumer, pact.provider
+            PactBroker::Domain::Relationship.create pact.consumer, pact.provider, pact, latest_verification, webhooks, triggered_webhooks
+          end
       end
 
       def self.update params

data/lib/pact_broker/pacts/pact_publication.rb

@@ -22,10 +22,6 @@ module PactBroker
         self.revision_number ||= 1
       end
 
-      def latest_tag_names
-        LatestTaggedPactPublications.where(id: id).select(:tag_name).collect{|t| t[:tag_name]}
-      end
-
       def to_domain
         PactBroker::Domain::Pact.new(
           id: id,

data/lib/pact_broker/pacts/repository.rb

@@ -86,7 +86,7 @@ module PactBroker
       end
 
       def find_latest_pacts
-        LatestPactPublications.order(:consumer_name, :provider_name).collect(&:to_domain)
+        LatestPactPublications.order(:consumer_name, :provider_name).collect(&:to_domain_without_tags)
       end
 
       def find_latest_pact(consumer_name, provider_name, tag = nil)

data/lib/pact_broker/tags/service.rb

@@ -27,4 +27,5 @@ module PactBroker
 
     end
   end
+
 end

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

@@ -10,8 +10,9 @@ module PactBroker
         include PactBroker::Services
 
         get "/provider/:provider_name/consumer/:consumer_name" do
-          lines = matrix_service.find consumer_name: params[:consumer_name], provider_name: params[:provider_name]
-          lines = lines.collect{|line| PactBroker::UI::ViewDomain::MatrixLine.new(line)}
+          selectors = [{ pacticipant_name: params[:consumer_name] }, { pacticipant_name: params[:provider_name] } ]
+          lines = matrix_service.find(selectors)
+          lines = lines.collect{|line| PactBroker::UI::ViewDomain::MatrixLine.new(line) }.sort
           locals = {
             lines: lines,
             title: "The Matrix",

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

@@ -11,8 +11,8 @@ module PactBroker
 
         get "/" do
           view_model = ViewDomain::Relationships.new(pacticipant_service.find_relationships)
-          page = params[:showProdPacts] == 'true' ? :'relationships/show-prod-tags' : :'relationships/show'
-          haml page, {locals: {relationships: view_model, title: "Pacts"}, layout: :'layouts/main'}
+
+          haml :'relationships/show', {locals: {relationships: view_model, title: "Pacts"}, layout: :'layouts/main'}
         end
 
       end

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

@@ -30,6 +30,10 @@ module PactBroker
           @line[:number]
         end
 
+        def consumer_name
+          @line[:consumer_name]
+        end
+
         def consumer_version_number
           @line[:consumer_version_number]
         end
@@ -42,8 +46,16 @@ module PactBroker
           @line[:consumer_version_order]
         end
 
+        def provider_name
+          @line[:provider_name]
+        end
+
         def provider_version_number
-          @line[:provider_version]
+          @line[:provider_version_number]
+        end
+
+        def provider_version_order
+          @line[:provider_version_order]
         end
 
         def provider_version_number_url
@@ -58,12 +70,33 @@ module PactBroker
           end
         end
 
+        def orderable_fields
+          [consumer_name, provider_name, consumer_version_order, provider_version_order]
+        end
+
+        def <=> other
+          self.orderable_fields <=> other.orderable_fields
+        end
+
         def verification_status
-          case @line[:success]
-            when true then "Verified"
-            when false then "Failed"
-            else ''
+          if @line[:verification_executed_at]
+            DateHelper.distance_of_time_in_words(@line[:verification_executed_at], DateTime.now) + " ago"
+          else
+            ''
           end
+          # case @line[:success]
+          #   when true then "Verified"
+          #   when false then "Failed"
+          #   else ''
+          # end
+        end
+
+        def pact_publication_date
+          DateHelper.distance_of_time_in_words(@line[:pact_created_at], DateTime.now) + " ago"
+        end
+
+        def pact_published_order
+          @line[:pact_created_at].to_time.to_i
         end
 
         def verification_status_class

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

@@ -21,18 +21,6 @@ module PactBroker
           @relationship.provider_name
         end
 
-        def consumer_version_number
-          @relationship.consumer_version_number
-        end
-
-        def provider_version_number
-          @relationship.provider_version_number
-        end
-
-        def tag_names
-          @relationship.tag_names.any? ? " (#{@relationship.tag_names.join(', ')}) ": ""
-        end
-
         def consumer_group_url
           Helpers::URLHelper.group_url consumer_name
         end
@@ -41,7 +29,7 @@ module PactBroker
           Helpers::URLHelper.group_url provider_name
         end
 
-        def pact_url
+        def latest_pact_url
           "#{pactigration_base_url('', @relationship)}/latest"
         end
 
@@ -50,7 +38,6 @@ 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
@@ -60,7 +47,6 @@ module PactBroker
         end
 
         def webhook_status
-          return "" unless show_webhook_status?
           case @relationship.webhook_status
             when :success then "success"
             when :failure then "danger"
@@ -69,10 +55,6 @@ 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

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

@@ -11,21 +11,36 @@
   %table.table.table-bordered.table-striped{id: 'matrix'}
     %thead
       %th.consumer
-        = "#{consumer_name} version"
+        = "Consumer"
+        %span.glyphicon.glyphicon-sort.sort
+      %th.consumer-version
+        = "Version"
+        %span.glyphicon.glyphicon-sort.sort
+      %th.pact-published
+        = "Pact Published"
         %span.glyphicon.glyphicon-sort.sort
       %th.provider
-        = "#{provider_name} version"
+        = "Provider"
+        %span.glyphicon.glyphicon-sort.sort
+      %th.provider-version
+        = "Version"
         %span.glyphicon.glyphicon-sort.sort
       %th.verification-result
-        Verification
+        Pact verified
         %span.glyphicon.glyphicon-sort.sort
     %tbody
     - lines.each do | line |
       %tr
+        %td.consumer{'data-sort-value' => line.consumer_name}
+          = line.consumer_name
         %td.consumer-version{'data-sort-value' => line.consumer_version_order}
           %a{href: line.consumer_version_number_url}
             = line.consumer_version_number
+        %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
+        %td.provider-version{'data-sort-value' => line.provider_version_order}
           %a{href: line.provider_version_number_url}
             = line.provider_version_number
         %td.verification-result{class: line.verification_status_class}

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

@@ -9,7 +9,7 @@
       %ul
         %li.navbar-right
           %a{href: '/hal-browser/browser.html'}
-            HAL Browser
+            API Browser
   .container
     %h1.page-header
       Pacts
@@ -40,7 +40,7 @@
             %a{:href => relationship.consumer_group_url}
               = relationship.consumer_name
           %td.pact
-            %a{:href => relationship.pact_url, :title => "View pact"}
+            %a{:href => relationship.latest_pact_url, :title => "View pact"}
               %span.pact
           %td.provider
             %a{:href => relationship.provider_group_url}

data/lib/pact_broker/verifications/repository.rb

@@ -43,9 +43,6 @@ 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.7.0.beta.1'
+  VERSION = '2.7.0.beta.2'
 end

data/lib/rack/hal_browser/redirect.rb

@@ -9,6 +9,7 @@ module Rack
       def initialize(app, options = {}, &block)
         @app = app
         @excluded_paths = Array(options[:exclude]) << '/hal-browser'
+        @hal_browser = Rack::Static.new(@app, :urls => ['/hal-browser'], :root => ::File.expand_path('../../../../vendor', __FILE__))
       end
 
       def call(env)
@@ -16,7 +17,7 @@ module Rack
         if match?(request)
           return [303, {'Location' => hal_browser_url_from_request(request)}, []]
         end
-        Rack::Static.new(@app, :urls => ['/hal-browser'], :root => ::File.expand_path('../../../../vendor', __FILE__)).call(env)
+        @hal_browser.call(env)
       end
 
       private
@@ -39,7 +40,6 @@ module Rack
         url.fragment = request.path_info
         url.to_s
       end
-
     end
   end
 end

data/lib/rack/pact_broker/configurable_make_it_later.rb

@@ -0,0 +1,24 @@
+
+# Allows a default Rack middlware implementation to be set,
+# and then be optionally changed out for a different implementation
+# after the app has been built.
+# Used for allowing the authorization code to set after the
+# `app = PactBroker::App.new` has been called
+
+module Rack
+  module PactBroker
+    class ConfigurableMakeItLater
+      def initialize default_clazz
+        @clazz = default_clazz
+      end
+
+      def make_it_later clazz
+        @clazz = clazz
+      end
+
+      def new *args, &block
+        @clazz.new(*args, &block)
+      end
+    end
+  end
+end

data/lib/rack/pact_broker/no_auth.rb

@@ -0,0 +1,13 @@
+module Rack
+  module PactBroker
+    class NoAuth
+      def initialize app, *args, &block
+        @app = app
+      end
+
+      def call(env)
+        @app.call(env)
+      end
+    end
+  end
+end

data/pact_broker.gemspec

@@ -37,6 +37,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'sucker_punch', '~>2.0'
   gem.add_runtime_dependency 'rack-protection', '~>2.0'
   gem.add_runtime_dependency 'dry-types', '~> 0.10.3' # https://travis-ci.org/pact-foundation/pact_broker/jobs/249448621
+  gem.add_runtime_dependency 'table_print', '~> 1.5'
 
   gem.add_development_dependency 'bundler-audit', '~>0.4'
   gem.add_development_dependency 'sqlite3', '~>1.3'