pact_broker 2.9.0 → 2.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d11875536cc6d2a888c0774fa732e34fe2709d0
-  data.tar.gz: ac11e2c9f5c4f8dddccf82e71049e8a5dec41258
+  metadata.gz: c0922b07d5bcc9db298ee95d05ce341ba4ff3030
+  data.tar.gz: a94f37ca9589e003343ad2bd2b7f745740ca4620
 SHA512:
-  metadata.gz: 5ef0c92ce55eb054238d06849b734d5fca37fbdc3350684e87b2034932cb84e9f3ca935d8128f4a1f5ddbad3a15d27e5a43c70b72d33b700d6d2d68f78c66a80
-  data.tar.gz: db1f2c583ca514e0c3673f9be6c65802482ff1f79cf35fdd93d8bd4dbce51b55c4c565c4243ae8e0c5f0e9c6f648619e9af4d460d1720f029bb39d20ac048515
+  metadata.gz: 7a93bced15dab3e293a8198ae278c666b8c15457bd4c30a552d1bc8c3cb4328e8eca20c4808132626cfa050b4a43fbb65e774a660f16c6a764fd6e511aa9d44f
+  data.tar.gz: '0239cfe02ffb216cb6cc7551a7e11dfba098f1e2a520b3f7ef13b321bbc8d49aa433a3986d97c569f9d98c084ddc2a46f8d48013072bf107ee095c5c1ae4af2e'

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+<a name="v2.10.0"></a>
+### v2.10.0 (2017-11-11)
+
+
+#### Features
+
+* **prod pacts in index**
+  * allow all tags to be shown on index	 ([0a1f0ee](/../../commit/0a1f0ee))
+  * allow tags shown in index to be configured via query string	 ([4eca8ee](/../../commit/4eca8ee))
+  * show pacts tagged as the 'prod' or 'production' versions on the index page	 ([b58b7a3](/../../commit/b58b7a3))
+
+* **index page**
+  * truncate git shas in table	 ([94da4c7](/../../commit/94da4c7))
+
+
 <a name="v2.9.0"></a>
 ### v2.9.0 (2017-11-09)
 
@@ -6,7 +21,7 @@
 * **webhook templating**
   * add support for ${pactbroker.pactUrl} in query and body	 ([0eed596](/../../commit/0eed596))
 
-* **matrix**
+* **matrix** _(note that the matrix resource is still in beta, and there may be breaking changes in the future)_
   * allow query to determine if a particular pacticipant version is compatible with the latest tagged versions of all its dependencies	 ([ba4a1cc](/../../commit/ba4a1cc))
 
 <a name="v2.8.0.beta.5"></a>
@@ -86,6 +101,14 @@
 
 * show webhook status as not_run when all triggered webhooks are not_run	 ([2d014b2](/../../commit/2d014b2))
 
+<a name="v2.7.0.beta.1"></a>
+### v2.7.0.beta.1 (2017-10-16)
+
+#### Features
+
+* **prod pacts in index**
+  * show pacts tagged as the 'prod' or 'production' versions on the index page	 ([b58b7a3](/../../commit/b58b7a3))
+
 <a name="v2.6.0"></a>
 ### v2.6.0 (2017-10-06)
 

data/config.ru

@@ -2,14 +2,14 @@ require File.dirname(__FILE__) + '/config/boot'
 require 'db'
 require 'pact_broker/api'
 require 'rack/hal_browser'
-require 'pact_broker/ui/controllers/relationships'
+require 'pact_broker/ui/controllers/index'
 
 
 use Rack::Static, :urls => ["/stylesheets", "/css", "/fonts", "/js", "/javascripts", "/images"], :root => "public"
 use Rack::HalBrowser::Redirect, :exclude => ['/diagnostic', '/trace','/index']
 
 run Rack::URLMap.new(
-  '/ui/relationships' => PactBroker::UI::Controllers::Relationships,
+  '/ui/relationships' => PactBroker::UI::Controllers::Index,
   '/network-graph' => Rack::File.new("#{File.dirname(__FILE__)}/public/Network Graph REA.html"),
   '/' => PactBroker::API,
 )

data/lib/pact_broker/api/decorators/relationships_csv_decorator.rb

@@ -11,17 +11,17 @@ module PactBroker
 
         def initialize pacts
           @pacts = pacts
-          @relationships = pacts.collect{|pact| PactBroker::Domain::Relationship.new(pact.consumer,pact.provider)}
+          @index_items = pacts.collect{|pact| PactBroker::Domain::IndexItem.new(pact.consumer,pact.provider)}
         end
 
         def to_csv
           hash = {}
-          pacticipants = @relationships.collect{|r| r.pacticipants}.flatten.uniq
+          pacticipants = @index_items.collect{|r| r.pacticipants}.flatten.uniq
 
-          @relationships.each do | relationship |
-            hash[relationship.consumer.id] ||= pacticipant_array(relationship.consumer, hash.size + 1)
-            hash[relationship.provider.id] ||= pacticipant_array(relationship.provider, hash.size + 1)
-            hash[relationship.consumer.id] << relationship.provider.id
+          @index_items.each do | index_item |
+            hash[index_item.consumer.id] ||= pacticipant_array(index_item.consumer, hash.size + 1)
+            hash[index_item.provider.id] ||= pacticipant_array(index_item.provider, hash.size + 1)
+            hash[index_item.consumer.id] << index_item.provider.id
           end
 
           max_length = hash.values.collect{|array| array.size}.max

data/lib/pact_broker/domain/group.rb

@@ -2,8 +2,8 @@ module PactBroker
   module Domain
     class Group < Array
 
-      def initialize *relationships
-        self.concat relationships.flatten
+      def initialize *index_items
+        self.concat index_items.flatten
       end
 
       def == other
@@ -11,7 +11,7 @@ module PactBroker
       end
 
       def include_pacticipant? pacticipant
-        any? { | relationship | relationship.include? pacticipant }
+        any? { | index_item | index_item.include? pacticipant }
       end
 
     end

data/lib/pact_broker/domain/{relationship.rb → index_item.rb}

@@ -3,26 +3,30 @@ require 'pact_broker/webhooks/status'
 
 module PactBroker
   module Domain
-    class Relationship
+    class IndexItem
 
       attr_reader :consumer, :provider, :latest_pact, :latest_verification, :webhooks
 
-      def initialize consumer, provider, latest_pact = nil, latest_verification = nil, webhooks = [], triggered_webhooks = []
+      def initialize consumer, provider, latest_pact = nil, latest = true, latest_verification = nil, webhooks = [], triggered_webhooks = [], tags = []
         @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_verification, webhooks = [], triggered_webhooks = []
-        new consumer, provider, latest_pact, latest_verification, webhooks, triggered_webhooks
+      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
       end
 
       def eq? other
-        Relationship === other && other.consumer == consumer && other.provider == provider &&
-          other.latest_pact == latest_pact && other.latest_verification == latest_verification &&
+        IndexItem === other && other.consumer == consumer && other.provider == provider &&
+          other.latest_pact == latest_pact &&
+          other.latest? == latest? &&
+          other.latest_verification == latest_verification &&
           other.webhooks == webhooks
       end
 
@@ -42,6 +46,22 @@ 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
@@ -97,7 +117,7 @@ module PactBroker
       end
 
       def to_s
-        "Relationship between #{consumer_name} and #{provider_name}"
+        "Pact between #{consumer_name} and #{provider_name}"
       end
 
       def to_a

data/lib/pact_broker/groups/service.rb

@@ -16,9 +16,8 @@ module PactBroker
       end
 
       def groups
-        Relationships::Groupify.call pacticipant_service.find_relationships
+        Relationships::Groupify.call index_service.find_index_items
       end
-
     end
   end
-end
+end

data/lib/pact_broker/index/service.rb

@@ -0,0 +1,56 @@
+require 'pact_broker/repositories'
+require 'pact_broker/logging'
+require 'pact_broker/domain/index_item'
+
+module PactBroker
+
+  module Index
+    class Service
+
+      extend PactBroker::Repositories
+      extend PactBroker::Services
+      extend PactBroker::Logging
+
+      def self.find_index_items options = {}
+        pact_repository
+          .find_latest_pacts
+          .collect { | pact| build_index_item_rows(pact, tags_for(pact, options)) }
+          .flatten
+      end
+
+      def self.tags_for(pact, options)
+        if options[:tags] == true
+          tag_service.find_all_tag_names_for_pacticipant(pact.consumer_name)
+        elsif options[:tags].is_a?(Array)
+          options[:tags]
+        else
+          []
+        end
+      end
+
+      def self.build_index_item_rows(pact, tags)
+        index_items = [build_latest_pact_index_item(pact, tags)]
+        tags.each do | tag |
+          index_items << build_index_item_for_tagged_pact(pact, tag)
+        end
+        index_items.compact
+      end
+
+      def self.build_latest_pact_index_item pact, tags
+        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| tags.include?(name) }
+        PactBroker::Domain::IndexItem.create pact.consumer, pact.provider, pact, true, latest_verification, webhooks, triggered_webhooks, tag_names
+      end
+
+      def self.build_index_item_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::IndexItem.create pact.consumer, pact.provider, pact, false, verification, [], [], [tag]
+      end
+    end
+  end
+end

data/lib/pact_broker/pacticipants/service.rb

@@ -1,7 +1,6 @@
 require 'pact_broker/repositories'
 require 'pact_broker/logging'
 require 'pact_broker/messages'
-require 'pact_broker/domain/relationship'
 require 'pact_broker/pacticipants/find_potential_duplicate_pacticipant_names'
 
 module PactBroker
@@ -58,17 +57,6 @@ module PactBroker
         end
       end
 
-      # This needs to move into a new service
-      def self.find_relationships
-        pact_repository.find_latest_pacts
-          .collect do | 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
-            PactBroker::Domain::Relationship.create pact.consumer, pact.provider, pact, latest_verification, webhooks, triggered_webhooks
-          end
-      end
-
       def self.update params
         pacticipant = pacticipant_repository.find_by_name(params.fetch('name'))
         PactBroker::Api::Decorators::PacticipantDecorator.new(pacticipant).from_hash(params)

data/lib/pact_broker/pacts/pact_publication.rb

@@ -22,6 +22,10 @@ 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_without_tags)
+        LatestPactPublications.order(:consumer_name, :provider_name).collect(&:to_domain)
       end
 
       def find_latest_pact(consumer_name, provider_name, tag = nil)

data/lib/pact_broker/relationships/groupify.rb

@@ -1,7 +1,7 @@
 require 'pact_broker/domain/group'
 
 =begin
-  Splits all relationships up into groups of non-connecting relationships.
+  Splits all index_items up into groups of non-connecting index_items.
 =end
 
 module PactBroker
@@ -10,21 +10,21 @@ module PactBroker
 
     class Groupify
 
-      def self.call relationships
-        recurse_groups([], relationships.dup).collect { |group| Domain::Group.new(group) }
+      def self.call index_items
+        recurse_groups([], index_items.dup).collect { |group| Domain::Group.new(group) }
       end
 
-      def self.recurse_groups groups, relationship_pool
-        if relationship_pool.empty?
+      def self.recurse_groups groups, index_item_pool
+        if index_item_pool.empty?
           groups
         else
-          first, *rest = relationship_pool
+          first, *rest = index_item_pool
           group = [first]
           new_connections = true
           while new_connections
             new_connections = false
             group = rest.inject(group) do |connected, candidate|
-              if connected.select { |relationship| relationship.connected?(candidate) }.any?
+              if connected.select { |index_item| index_item.connected?(candidate) }.any?
                 new_connections = true
                 connected + [candidate]
               else
@@ -36,7 +36,7 @@ module PactBroker
             group.uniq
           end
 
-          recurse_groups(groups + [group], relationship_pool - group)
+          recurse_groups(groups + [group], index_item_pool - group)
         end
       end
     end

data/lib/pact_broker/services.rb

@@ -1,6 +1,11 @@
 module PactBroker
   module Services
 
+    def index_service
+      require 'pact_broker/index/service'
+      Index::Service
+    end
+
     def pact_service
       # TODO work out how to fix circular dependency
       require 'pact_broker/pacts/service'

data/lib/pact_broker/tags/repository.rb

@@ -15,7 +15,7 @@ module PactBroker
       def find args
         PactBroker::Domain::Tag
           .select_all_qualified
-          .join(:versions, {id: :version_id})
+          .join(:versions, { id: :version_id })
           .join(:pacticipants, {Sequel.qualify("pacticipants", "id") => Sequel.qualify("versions", "pacticipant_id")})
           .where(name_like(Sequel.qualify("tags", "name"), args.fetch(:tag_name)))
           .where(name_like(Sequel.qualify("versions", "number"), args.fetch(:pacticipant_version_number)))
@@ -26,6 +26,16 @@ module PactBroker
       def delete_by_version_id version_id
         Sequel::Model.db[:tags].where(version_id: version_id).delete
       end
+
+      def find_all_tag_names_for_pacticipant pacticipant_name
+        PactBroker::Domain::Tag
+        .select(Sequel[:tags][:name])
+        .join(:versions, { Sequel[:versions][:id] => Sequel[:tags][:version_id] })
+        .join(:pacticipants, { Sequel[:pacticipants][:id] => Sequel[:versions][:pacticipant_id] })
+        .where(Sequel[:pacticipants][:name] => pacticipant_name)
+        .distinct
+        .collect{ |tag| tag[:name] }.sort
+      end
     end
   end
 end

data/lib/pact_broker/tags/service.rb

@@ -25,7 +25,9 @@ module PactBroker
         connection.run("delete from tags where name = '#{args.fetch(:tag_name)}' and version_id = '#{version.id}'")
       end
 
+      def find_all_tag_names_for_pacticipant pacticipant_name
+        tag_repository.find_all_tag_names_for_pacticipant pacticipant_name
+      end
     end
   end
-
 end

data/lib/pact_broker/ui/app.rb

@@ -1,4 +1,4 @@
-require 'pact_broker/ui/controllers/relationships'
+require 'pact_broker/ui/controllers/index'
 require 'pact_broker/ui/controllers/groups'
 require 'pact_broker/ui/controllers/matrix'
 require 'pact_broker/doc/controllers/app'
@@ -11,7 +11,7 @@ module PactBroker
         @app = ::Rack::Builder.new {
 
           map "/ui/relationships" do
-            run PactBroker::UI::Controllers::Relationships
+            run PactBroker::UI::Controllers::Index
           end
 
           map "/groups" do
@@ -27,7 +27,7 @@ module PactBroker
           end
 
           map "/" do
-            run PactBroker::UI::Controllers::Relationships
+            run PactBroker::UI::Controllers::Index
           end
         }
       end

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

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

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

@@ -1,5 +1,5 @@
 require 'pact_broker/ui/controllers/base_controller'
-require 'pact_broker/ui/view_models/relationships'
+require 'pact_broker/ui/view_models/index_items'
 require 'haml'
 
 module PactBroker