pact_broker 2.17.1 → 2.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a869eaa0a554166e06aee39ab94e7ee77fa48d0f
-  data.tar.gz: a1f4f9e64f229185ec16354b6e28c2984d180eb4
+  metadata.gz: be2a40680787302de6ff629cc8522bed68b57c86
+  data.tar.gz: e5fe341fb89a53b5a5b93ba801bfaad429fa34d6
 SHA512:
-  metadata.gz: 259b1a5d60d2372ee9cec9e477d35e2d5033d95aab058766b32be05509dd6c208542415bf8d19b5279ca96e8b826169d4ef3b8afc88271fe8a2a81abc25f60ac
-  data.tar.gz: d18d5d92867f0dcabfc47256451e78a801877a0d09fe7ac1540be3b32da4db33acebb4b5dc635dd8047af7635c195b1cf0ac4f0927dd9018f49a093b157e0ced
+  metadata.gz: 40bbfae215d62a2bbed81cdcae2e76236f1c952d5a7b274cb9811052b1a03e29b81e4feb344be5f7e62827c009d913ed057e6a3b0a8006b3a769774b2062c495
+  data.tar.gz: e7867be0091b5ca6e2748f032c0964f1a2409ecdb1f7d578f8dbdf071f6f35c7d4706f82a8333dc37133566027cb951436c3e18752388cb8d7bb3b40475d761f

data/CHANGELOG.md

@@ -1,3 +1,21 @@
+<a name="v2.18.0"></a>
+### v2.18.0 (2018-04-05)
+
+
+#### Features
+
+* add link to matrix from HTML pact page	 ([f9e3c23](/../../commit/f9e3c23))
+* sort tags in dashboard API response	 ([d2fd090](/../../commit/d2fd090))
+* add rake task to clean unused data to improve performance	 ([fc705a2](/../../commit/fc705a2))
+
+
+#### Bug Fixes
+
+* show JSON view when *any* error occurs creating the HTML view for a pact.	 ([e4342f0](/../../commit/e4342f0))
+* only show verification matrix number when verification is present	 ([766f7c0](/../../commit/766f7c0))
+* correctly display interaction with nil description in HTML view	 ([56528d3](/../../commit/56528d3))
+
+
 <a name="v2.17.1"></a>
 ### v2.17.1 (2018-03-30)
 

data/lib/pact/doc/sort_interactions.rb

@@ -8,7 +8,7 @@ module Pact
       private
 
       def self.sortable_id interaction
-        "#{interaction.description.downcase} #{interaction.response.status} #{(interaction.provider_state || '').downcase}"
+        "#{(interaction.description || '').downcase} #{interaction.response.status} #{(interaction.provider_state || '').downcase}"
       end
     end
   end

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

@@ -112,7 +112,7 @@ module PactBroker
         end
 
         def pact_tags(index_item, base_url)
-          index_item.tag_names.collect do | tag_name |
+          index_item.tag_names.sort.collect do | tag_name |
             fake_tag = OpenStruct.new(name: tag_name, version: index_item.consumer_version)
             {
               name: tag_name,
@@ -127,7 +127,7 @@ module PactBroker
         end
 
         def verification_tags(index_item, base_url)
-          index_item.latest_verification_latest_tags.collect do | tag |
+          index_item.latest_verification_latest_tags.sort{ |t1, t2| t1.name <=> t2.name }.collect do | tag |
             fake_tag = OpenStruct.new(name: tag.name, version: index_item.provider_version)
             {
               name: tag.name,

data/lib/pact_broker/api/pact_broker_urls.rb

@@ -160,10 +160,14 @@ module PactBroker
         "#{base_url}/webhooks/#{triggered_webhook.webhook_uuid}/trigger/#{triggered_webhook.trigger_uuid}/logs"
       end
 
-     def badge_url_for_latest_pact pact, base_url = ''
+      def badge_url_for_latest_pact pact, base_url = ''
         "#{latest_pact_url(base_url, pact)}/badge.svg"
       end
 
+      def matrix_url_from_params params, base_url = ''
+        "#{base_url}/matrix/provider/#{url_encode(params.fetch(:provider_name))}/consumer/#{url_encode(params.fetch(:consumer_name))}"
+      end
+
       def hal_browser_url target_url
         "/hal-browser/browser.html#" + target_url
       end

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

@@ -63,6 +63,9 @@ module PactBroker
               <li>
                 <a href=\"#{json_url}\">View in API Browser</a>
               </li>
+              <li>
+                <a href=\"#{matrix_url}\">View Matrix</a>
+              </li>
               <li>
                 <a href=\"/\">Home</a>
               </li>
@@ -120,6 +123,10 @@ module PactBroker
           PactBroker::Api::PactBrokerUrls.pact_url '', @pact
         end
 
+        def matrix_url
+          PactBroker::Api::PactBrokerUrls.matrix_url_from_params consumer_name: @pact.consumer.name, provider_name: @pact.provider.name
+        end
+
         def badge_target_url
           base_url
         end
@@ -138,9 +145,9 @@ module PactBroker
 
         def markdown
           Pact::Doc::Markdown::ConsumerContractRenderer.call consumer_contract
-        rescue NotAPactError
+        rescue StandardError
           heading = "### A contract between #{@pact.consumer.name} and #{@pact.provider.name}"
-          warning = "_Note: this contract could not be parsed to a Pact, showing raw content instead._"
+          warning = "_Note: this contract could not be parsed to a v1 or v2 Pact, showing raw content instead._"
           pretty_json = JSON.pretty_generate(@pact.content_hash)
           "#{heading}\n#{warning}\n```json\n#{pretty_json}\n```\n"
         end

data/lib/pact_broker/db/clean.rb

@@ -0,0 +1,49 @@
+require 'sequel'
+require 'pact_broker/project_root'
+
+module PactBroker
+  module DB
+    class Clean
+      def self.call database_connection, options = {}
+        new(database_connection, options).call
+      end
+
+      def initialize database_connection, options = {}
+        @db = database_connection
+        @options = options
+      end
+
+      def call
+        db[:verifications].where(id: db[:materialized_head_matrix].select(:verification_id)).invert.delete
+        pp_ids = db[:materialized_head_matrix].select(:pact_publication_id)
+
+        triggered_webhook_ids = db[:triggered_webhooks].where(pact_publication_id: pp_ids).invert.select(:id)
+        db[:webhook_executions].where(triggered_webhook_id: triggered_webhook_ids).delete
+        db[:triggered_webhooks].where(id: triggered_webhook_ids).delete
+        db[:webhook_executions].where(pact_publication_id: pp_ids).invert.delete
+
+        db[:pact_publications].where(id: pp_ids).invert.delete
+
+        referenced_pact_version_ids = db[:pact_publications].select(:pact_version_id).collect{ | h| h[:pact_version_id] } +
+          db[:verifications].select(:pact_version_id).collect{ | h| h[:pact_version_id] }
+        db[:pact_versions].where(id: referenced_pact_version_ids).invert.delete
+
+        referenced_version_ids = db[:pact_publications].select(:consumer_version_id).collect{ | h| h[:consumer_version_id] } +
+          db[:verifications].select(:provider_version_id).collect{ | h| h[:provider_version_id] }
+
+        db[:tags].where(version_id: referenced_version_ids).invert.delete
+        db[:versions].where(id: referenced_version_ids).invert.delete
+
+        db[:materialized_matrix].delete
+        db[:materialized_matrix].insert(db[:matrix].select_all)
+        db[:materialized_head_matrix].delete
+        db[:materialized_head_matrix].insert(db[:head_matrix].select_all)
+      end
+
+      private
+
+      attr_reader :db
+
+    end
+  end
+end

data/lib/pact_broker/tasks.rb

@@ -1,2 +1,3 @@
 require 'pact_broker/tasks/migration_task'
 require 'pact_broker/tasks/version_task'
+require 'pact_broker/tasks/clean_task'

data/lib/pact_broker/tasks/clean_task.rb

@@ -0,0 +1,25 @@
+module PactBroker
+  module DB
+    class CleanTask < ::Rake::TaskLib
+
+      attr_accessor :database_connection
+
+      def initialize &block
+        rake_task &block
+      end
+
+      def rake_task &block
+        namespace :pact_broker do
+          namespace :db do
+            desc "Clean unused pacts and verifications from database"
+            task :clean do | t, args |
+              require 'pact_broker/db/clean'
+              instance_eval(&block)
+              PactBroker::DB::Clean.call(database_connection)
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -144,7 +144,7 @@
                   = tag.name
         %td.verification-result{class: line.verification_status_class, "title": line.inherited_verification_message, "data-toggle": "tooltip"}
           %a{href: line.verification_status_url}
-            - if options.all_rows_checked
+            - if options.all_rows_checked && line.number
               = "#{line.verification_status} (number #{line.number})"
             - else
               = line.verification_status

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = '2.17.1'
+  VERSION = '2.18.0'
 end

data/spec/lib/pact_broker/db/clean_spec.rb

@@ -0,0 +1,65 @@
+require 'pact_broker/db/clean'
+
+IS_MYSQL = !!DB.mysql?
+
+module PactBroker
+  module DB
+    describe Clean do
+      # Inner queries don't work on MySQL. Seriously, MySQL???
+      describe ".call", pending: IS_MYSQL do
+        let(:td) { TestDataBuilder.new }
+        let(:db) { PactBroker::DB.connection }
+
+        before do
+          td.create_pact_with_hierarchy("Foo", "0", "Bar")
+            .create_consumer_version_tag("prod")
+            .create_consumer_version("1")
+            .create_pact
+            .create_consumer_version_tag("prod")
+            .comment("keep")
+            .create_verification(provider_version: "20")
+            .create_consumer_version("2")
+            .create_pact
+            .comment("don't keep")
+            .create_webhook
+            .create_triggered_webhook
+            .create_webhook_execution
+            .create_deprecated_webhook_execution
+            .create_verification(provider_version: "30")
+            .create_consumer_version("3")
+            .create_pact
+            .comment("keep")
+            .create_verification(provider_version: "40")
+            .create_verification(provider_version: "50", number: 2)
+        end
+
+        subject { Clean.call(PactBroker::DB.connection) }
+
+        it "does not delete any rows in the head matrix" do
+          head_matrix_before = db[:head_matrix].select_all
+          subject
+          head_matrix_after = db[:head_matrix].select_all
+          expect(head_matrix_before).to eq head_matrix_after
+        end
+
+        it "deletes rows that aren't the latest or latest tagged" do
+          subject
+          expect(db[:materialized_matrix].where(consumer_version_number: "2").count).to eq 0
+        end
+
+        it "deletes orphan pact_versions" do
+          subject
+          expect(db[:pact_versions].count).to eq 2
+        end
+
+        it "deletes orphan versions" do
+          subject
+          expect(db[:versions].where(number: "20").count).to be 1
+          expect(db[:versions].where(number: "30").count).to be 0
+          expect(db[:versions].where(number: "40").count).to be 0
+          expect(db[:versions].where(number: "50").count).to be 1
+        end
+      end
+    end
+  end
+end

data/tasks/test_db.rake

@@ -1,11 +1,19 @@
 require 'pact_broker/tasks'
 
 PactBroker::DB::MigrationTask.new do | task |
+  ENV['RACK_ENV'] ||= 'test'
   require 'db'
   task.database_connection = DB::PACT_BROKER_DB
 end
 
 PactBroker::DB::VersionTask.new do | task |
+  ENV['RACK_ENV'] ||= 'test'
+  require 'db'
+  task.database_connection = DB::PACT_BROKER_DB
+end
+
+PactBroker::DB::CleanTask.new do | task |
+  ENV['RACK_ENV'] ||= 'test'
   require 'db'
   task.database_connection = DB::PACT_BROKER_DB
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 2.17.1
+  version: 2.18.0
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-30 00:00:00.000000000 Z
+date: 2018-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -765,6 +765,7 @@ files:
 - lib/pact_broker/dashboard/service.rb
 - lib/pact_broker/date_helper.rb
 - lib/pact_broker/db.rb
+- lib/pact_broker/db/clean.rb
 - lib/pact_broker/db/migrate.rb
 - lib/pact_broker/db/validate_encoding.rb
 - lib/pact_broker/db/version.rb
@@ -841,6 +842,7 @@ files:
 - lib/pact_broker/tags/service.rb
 - lib/pact_broker/tags/tag_with_latest_flag.rb
 - lib/pact_broker/tasks.rb
+- lib/pact_broker/tasks/clean_task.rb
 - lib/pact_broker/tasks/migration_task.rb
 - lib/pact_broker/tasks/version_task.rb
 - lib/pact_broker/ui.rb
@@ -1069,6 +1071,7 @@ files:
 - spec/lib/pact_broker/config/save_and_load_spec.rb
 - spec/lib/pact_broker/config/save_spec.rb
 - spec/lib/pact_broker/configuration_spec.rb
+- spec/lib/pact_broker/db/clean_spec.rb
 - spec/lib/pact_broker/db/validate_encoding_spec.rb
 - spec/lib/pact_broker/diagnostic/resources/dependencies_spec.rb
 - spec/lib/pact_broker/diagnostic/resources/heartbeat_spec.rb
@@ -1346,6 +1349,7 @@ test_files:
 - spec/lib/pact_broker/config/save_and_load_spec.rb
 - spec/lib/pact_broker/config/save_spec.rb
 - spec/lib/pact_broker/configuration_spec.rb
+- spec/lib/pact_broker/db/clean_spec.rb
 - spec/lib/pact_broker/db/validate_encoding_spec.rb
 - spec/lib/pact_broker/diagnostic/resources/dependencies_spec.rb
 - spec/lib/pact_broker/diagnostic/resources/heartbeat_spec.rb