pact_broker 2.4.2 → 2.5.0

data/tasks/database.rb

@@ -9,7 +9,7 @@ Sequel.extension :migration
 module PactBroker
   module Database
 
-    TABLES = [:labels, :webhook_executions, :config, :pacts, :pact_version_contents, :tags, :verifications, :pact_publications, :pact_versions,  :webhook_headers, :webhooks, :versions, :pacticipants].freeze
+    TABLES = [:labels, :webhook_executions, :triggered_webhooks, :config, :pacts, :pact_version_contents, :tags, :verifications, :pact_publications, :pact_versions,  :webhook_headers, :webhooks, :versions, :pacticipants].freeze
 
     extend self
 
@@ -77,7 +77,12 @@ module PactBroker
     def truncate
       TABLES.each do | table_name |
         if database.table_exists?(table_name)
-          database[table_name].delete
+          begin
+            database[table_name].delete
+          rescue SQLite3::ConstraintException => e
+            puts "Could not delete the following records from #{table_name}: #{database[table_name].select_all}"
+            raise e
+          end
         end
       end
     end

data/tasks/db.rake

@@ -8,6 +8,16 @@ namespace :bundler do
 end
 
 namespace :db do
+
+  task :spec do
+    Bundler.with_clean_env do
+      # todo check for ruby version
+      system('cd db/test/backwards_compatibility && bundle exec rake db:check_backwards_compatibility')
+      success = $?.exitstatus == 0
+      exit(1) unless success
+    end
+  end
+
   task :env => ['bundler:setup'] do
     # Require RACK_ENV to be set for tasks that will be called in production
     raise "Please specify RACK_ENV" unless ENV['RACK_ENV']

data/tasks/rspec.rake

@@ -6,5 +6,5 @@ RSpec::Core::RakeTask.new(:spec) do |task|
 end
 
 RSpec::Core::RakeTask.new('spec:quick') do |task|
-  task.rspec_opts = '--tag ~@no_db_clean'
+  task.rspec_opts = '--tag ~@no_db_clean --tag ~@migration'
 end

data/vendor/hal-browser/browser.html

@@ -63,7 +63,8 @@
         <% if ($.isArray(obj)) { %>
           <% _.each(obj, function(link, i) { %>
             <tr>
-              <td><strong><%= HAL.truncateIfUrl(rel) %></strong></td>
+              <% tdStyle = i > 0 ? "border-top:none" : "" %>
+              <td style="<%= tdStyle %>"><strong><%= i === 0 ? HAL.truncateIfUrl(rel) : '' %></strong></td>
               <td><%= link.title || '' %></td>
               <td><%= link.name ? 'name: ' + link.name : 'index: ' + i %></a></td>
               <td>
@@ -192,7 +193,7 @@ Content-Type: application/json
 
   <script id="embedded-resource-template" type="text/template">
     <div class="accordion-heading">
-      <a class="accordion-toggle" href="#"><%= resource.identifier %><% if (resource.title || resource.name) { %>: <span class="embedded-resource-title"><%- resource.title || resource.name %></span><% } %>
+      <a class="accordion-toggle" href="#"><%= resource.identifier %><% if (resource.name || resource.title) { %>: <span class="embedded-resource-title"><%- resource.name || resource.title %></span><% } %>
       <% if (HAL.isUrl(resource.embed_rel)) { %>
         <span class="dox pull-right" data-href="<%= HAL.buildUrl(resource.embed_rel) %>">
           <i class="icon-book"></i>

data/vendor/hal-browser/js/hal/resource.js

@@ -2,8 +2,8 @@ HAL.Models.Resource = Backbone.Model.extend({
   initialize: function(representation) {
     representation = representation || {};
     this.links = representation._links;
-    this.title = representation.title;
-    this.name = representation.name;
+    this.title = this.buildTitle(representation);
+    this.name = this.buildName(representation);
     if(representation._embedded !== undefined) {
       this.embeddedResources = this.buildEmbeddedResources(representation._embedded);
     }
@@ -12,6 +12,20 @@ HAL.Models.Resource = Backbone.Model.extend({
     this.unset('_links', { silent: true });
   },
 
+  buildName: function(representation) {
+    return representation.name ||
+      (representation._links
+        && representation._links.self
+        && representation._links.self.name);
+  },
+
+  buildTitle: function(representation) {
+    return representation.title ||
+      (representation._links
+        && representation._links.self
+        && representation._links.self.title);
+  },
+
   buildEmbeddedResources: function(embeddedResources) {
     var result = {};
     _.each(embeddedResources, function(obj, rel) {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 2.4.2
+  version: 2.5.0
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-07 00:00:00.000000000 Z
+date: 2017-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -108,14 +108,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: semver2
   requirement: !ruby/object:Gem::Requirement
@@ -266,16 +266,16 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -392,16 +392,16 @@ dependencies:
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.21'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.21'
 - !ruby/object:Gem::Dependency
   name: conventional-changelog
   requirement: !ruby/object:Gem::Requirement
@@ -443,6 +443,7 @@ files:
 - README.md
 - RELEASING.md
 - Rakefile
+- UPGRADING.md
 - bethtest.rb
 - config.ru
 - config/boot.rb
@@ -485,8 +486,36 @@ files:
 - db/migrations/35_create_index_on_names.rb
 - db/migrations/36_create_webhook_execution.rb
 - db/migrations/37_create_labels_table.rb
+- db/migrations/38_create_triggered_webhooks_table.rb
+- db/migrations/39_add_triggered_webhooks_fk_to_execution.rb
+- db/migrations/40_create_latest_triggered_webhooks_view.rb
+- db/migrations/41_migrate_execution_data.rb
 - db/migrations/migration_helper.rb
 - db/pact_broker_database.sqlite3
+- db/test/backwards_compatibility/.rspec
+- db/test/backwards_compatibility/Appraisals
+- db/test/backwards_compatibility/Gemfile
+- db/test/backwards_compatibility/Rakefile
+- db/test/backwards_compatibility/config.ru
+- db/test/backwards_compatibility/gemfiles/1.18.0.gemfile
+- db/test/backwards_compatibility/gemfiles/1.18.0.gemfile.lock
+- db/test/backwards_compatibility/gemfiles/2.0.0.gemfile
+- db/test/backwards_compatibility/gemfiles/2.0.0.gemfile.lock
+- db/test/backwards_compatibility/gemfiles/2.1.0.gemfile
+- db/test/backwards_compatibility/gemfiles/2.1.0.gemfile.lock
+- db/test/backwards_compatibility/gemfiles/2.2.0.gemfile
+- db/test/backwards_compatibility/gemfiles/2.2.0.gemfile.lock
+- db/test/backwards_compatibility/gemfiles/2.3.0.gemfile
+- db/test/backwards_compatibility/gemfiles/2.3.0.gemfile.lock
+- db/test/backwards_compatibility/gemfiles/2.4.2.gemfile
+- db/test/backwards_compatibility/gemfiles/2.4.2.gemfile.lock
+- db/test/backwards_compatibility/gemfiles/head.gemfile
+- db/test/backwards_compatibility/gemfiles/head.gemfile.lock
+- db/test/backwards_compatibility/spec/fixtures/foo-bar.json
+- db/test/backwards_compatibility/spec/publish_pact_spec.rb
+- db/test/backwards_compatibility/spec/spec_helper.rb
+- db/test/backwards_compatibility/spec/support/fixture_helpers.rb
+- db/test/backwards_compatibility/spec/support/request_helpers.rb
 - example/Gemfile
 - example/basic_auth/Gemfile
 - example/basic_auth/Procfile
@@ -518,6 +547,7 @@ files:
 - lib/pact_broker/api/decorators/pact_pacticipant_decorator.rb
 - lib/pact_broker/api/decorators/pact_version_decorator.rb
 - lib/pact_broker/api/decorators/pact_versions_decorator.rb
+- lib/pact_broker/api/decorators/pact_webhooks_status_decorator.rb
 - lib/pact_broker/api/decorators/pacticipant_collection_decorator.rb
 - lib/pact_broker/api/decorators/pacticipant_decorator.rb
 - lib/pact_broker/api/decorators/provider_pacts_decorator.rb
@@ -550,6 +580,7 @@ files:
 - lib/pact_broker/api/resources/pact_content_diff.rb
 - lib/pact_broker/api/resources/pact_versions.rb
 - lib/pact_broker/api/resources/pact_webhooks.rb
+- lib/pact_broker/api/resources/pact_webhooks_status.rb
 - lib/pact_broker/api/resources/pacticipant.rb
 - lib/pact_broker/api/resources/pacticipant_resource_methods.rb
 - lib/pact_broker/api/resources/pacticipants.rb
@@ -557,6 +588,7 @@ files:
 - lib/pact_broker/api/resources/previous_distinct_pact_version.rb
 - lib/pact_broker/api/resources/relationships.rb
 - lib/pact_broker/api/resources/tag.rb
+- lib/pact_broker/api/resources/triggered_webhook_logs.rb
 - lib/pact_broker/api/resources/verification.rb
 - lib/pact_broker/api/resources/verifications.rb
 - lib/pact_broker/api/resources/version.rb
@@ -671,8 +703,12 @@ files:
 - lib/pact_broker/versions/service.rb
 - lib/pact_broker/webhooks/execution.rb
 - lib/pact_broker/webhooks/job.rb
+- lib/pact_broker/webhooks/latest_triggered_webhook.rb
+- lib/pact_broker/webhooks/redact_logs.rb
 - lib/pact_broker/webhooks/repository.rb
 - lib/pact_broker/webhooks/service.rb
+- lib/pact_broker/webhooks/status.rb
+- lib/pact_broker/webhooks/triggered_webhook.rb
 - lib/pact_broker/webhooks/webhook.rb
 - lib/rack/hal_browser.rb
 - lib/rack/hal_browser/redirect.rb
@@ -708,18 +744,19 @@ files:
 - public/javascripts/jquery-2.1.1.min.js
 - public/javascripts/jquery.tablesorter.js
 - public/javascripts/jquery.tablesorter.min.js
+- public/javascripts/pact.js
 - public/js/bootstrap.js
 - public/js/bootstrap.min.js
 - public/stylesheets/github-json.css
 - public/stylesheets/github.css
 - public/stylesheets/pact.css
 - public/stylesheets/relationships.css
+- script/db-spec.sh
 - script/foo-bar.json
 - script/publish-2.sh
 - script/publish-new.sh
 - script/publish-not-a-pact.sh
 - script/publish.sh
-- script/record_verification.sh
 - script/recreate-pg-db.sh
 - script/seed.rb
 - script/update-hal-browser
@@ -729,6 +766,8 @@ files:
 - spec/features/delete_pact_spec.rb
 - spec/features/delete_version_spec.rb
 - spec/features/delete_webhook_spec.rb
+- spec/features/edit_webhook_spec.rb
+- spec/features/execute_webhook_spec.rb
 - spec/features/get_diff_spec.rb
 - spec/features/get_label_spec.rb
 - spec/features/get_latest_pact_badge_spec.rb
@@ -775,6 +814,7 @@ files:
 - spec/lib/pact_broker/api/decorators/pact_collection_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/pact_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/pact_version_decorator_spec.rb
+- spec/lib/pact_broker/api/decorators/pact_webhooks_status_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/pacticipant_collection_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/pacticipant_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/relationships_csv_decorator_spec.rb
@@ -790,6 +830,7 @@ files:
 - spec/lib/pact_broker/api/decorators/webhooks_decorator_spec.rb
 - spec/lib/pact_broker/api/renderers/html_pact_renderer_spec.rb
 - spec/lib/pact_broker/api/resources/badge_spec.rb
+- spec/lib/pact_broker/api/resources/base_resource_spec.rb
 - spec/lib/pact_broker/api/resources/group_spec.rb
 - spec/lib/pact_broker/api/resources/latest_pact_spec.rb
 - spec/lib/pact_broker/api/resources/latest_verifications_for_consumer_version_spec.rb
@@ -798,6 +839,7 @@ files:
 - spec/lib/pact_broker/api/resources/pacticipant_spec.rb
 - spec/lib/pact_broker/api/resources/pacticipants_spec.rb
 - spec/lib/pact_broker/api/resources/tag_spec.rb
+- spec/lib/pact_broker/api/resources/triggered_webhook_logs_spec.rb
 - spec/lib/pact_broker/api/resources/verifications_spec.rb
 - spec/lib/pact_broker/api/resources/webhook_execution_spec.rb
 - spec/lib/pact_broker/api/resources/webhook_spec.rb
@@ -815,6 +857,7 @@ files:
 - spec/lib/pact_broker/domain/group_spec.rb
 - spec/lib/pact_broker/domain/order_versions_spec.rb
 - spec/lib/pact_broker/domain/pacticipant_spec.rb
+- spec/lib/pact_broker/domain/relationship_spec.rb
 - spec/lib/pact_broker/domain/verification_spec.rb
 - spec/lib/pact_broker/domain/version_spec.rb
 - spec/lib/pact_broker/domain/webhook_request_spec.rb
@@ -848,8 +891,11 @@ files:
 - spec/lib/pact_broker/versions/repository_spec.rb
 - spec/lib/pact_broker/versions/service_spec.rb
 - spec/lib/pact_broker/webhooks/job_spec.rb
+- spec/lib/pact_broker/webhooks/redact_logs_spec.rb
 - spec/lib/pact_broker/webhooks/repository_spec.rb
 - spec/lib/pact_broker/webhooks/service_spec.rb
+- spec/lib/pact_broker/webhooks/status_spec.rb
+- spec/lib/pact_broker/webhooks/triggered_webhook_spec.rb
 - spec/lib/rack/hal_browser/redirect_spec.rb
 - spec/lib/rack/pact_broker/add_pact_broker_version_header_spec.rb
 - spec/lib/rack/pact_broker/database_transaction_spec.rb
@@ -858,11 +904,13 @@ files:
 - spec/migrations/24_populate_pact_contents_spec.rb
 - spec/migrations/34_latest_tagged_pacts_spec.rb
 - spec/migrations/34_pact_revisions_spec.rb
+- spec/migrations/41_migrate_execution_data_spec.rb
 - spec/service_consumers/pact_helper.rb
 - spec/service_consumers/provider_states_for_pact_broker_client.rb
 - spec/spec_helper.rb
 - spec/support/database_cleaner.rb
 - spec/support/fixture_helpers.rb
+- spec/support/migration_helpers.rb
 - spec/support/rspec_match_hash.rb
 - spec/support/rspec_matchers.rb
 - spec/support/shared_examples_for_responses.rb
@@ -941,6 +989,8 @@ test_files:
 - spec/features/delete_pact_spec.rb
 - spec/features/delete_version_spec.rb
 - spec/features/delete_webhook_spec.rb
+- spec/features/edit_webhook_spec.rb
+- spec/features/execute_webhook_spec.rb
 - spec/features/get_diff_spec.rb
 - spec/features/get_label_spec.rb
 - spec/features/get_latest_pact_badge_spec.rb
@@ -987,6 +1037,7 @@ test_files:
 - spec/lib/pact_broker/api/decorators/pact_collection_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/pact_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/pact_version_decorator_spec.rb
+- spec/lib/pact_broker/api/decorators/pact_webhooks_status_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/pacticipant_collection_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/pacticipant_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/relationships_csv_decorator_spec.rb
@@ -1002,6 +1053,7 @@ test_files:
 - spec/lib/pact_broker/api/decorators/webhooks_decorator_spec.rb
 - spec/lib/pact_broker/api/renderers/html_pact_renderer_spec.rb
 - spec/lib/pact_broker/api/resources/badge_spec.rb
+- spec/lib/pact_broker/api/resources/base_resource_spec.rb
 - spec/lib/pact_broker/api/resources/group_spec.rb
 - spec/lib/pact_broker/api/resources/latest_pact_spec.rb
 - spec/lib/pact_broker/api/resources/latest_verifications_for_consumer_version_spec.rb
@@ -1010,6 +1062,7 @@ test_files:
 - spec/lib/pact_broker/api/resources/pacticipant_spec.rb
 - spec/lib/pact_broker/api/resources/pacticipants_spec.rb
 - spec/lib/pact_broker/api/resources/tag_spec.rb
+- spec/lib/pact_broker/api/resources/triggered_webhook_logs_spec.rb
 - spec/lib/pact_broker/api/resources/verifications_spec.rb
 - spec/lib/pact_broker/api/resources/webhook_execution_spec.rb
 - spec/lib/pact_broker/api/resources/webhook_spec.rb
@@ -1027,6 +1080,7 @@ test_files:
 - spec/lib/pact_broker/domain/group_spec.rb
 - spec/lib/pact_broker/domain/order_versions_spec.rb
 - spec/lib/pact_broker/domain/pacticipant_spec.rb
+- spec/lib/pact_broker/domain/relationship_spec.rb
 - spec/lib/pact_broker/domain/verification_spec.rb
 - spec/lib/pact_broker/domain/version_spec.rb
 - spec/lib/pact_broker/domain/webhook_request_spec.rb
@@ -1060,8 +1114,11 @@ test_files:
 - spec/lib/pact_broker/versions/repository_spec.rb
 - spec/lib/pact_broker/versions/service_spec.rb
 - spec/lib/pact_broker/webhooks/job_spec.rb
+- spec/lib/pact_broker/webhooks/redact_logs_spec.rb
 - spec/lib/pact_broker/webhooks/repository_spec.rb
 - spec/lib/pact_broker/webhooks/service_spec.rb
+- spec/lib/pact_broker/webhooks/status_spec.rb
+- spec/lib/pact_broker/webhooks/triggered_webhook_spec.rb
 - spec/lib/rack/hal_browser/redirect_spec.rb
 - spec/lib/rack/pact_broker/add_pact_broker_version_header_spec.rb
 - spec/lib/rack/pact_broker/database_transaction_spec.rb
@@ -1070,11 +1127,13 @@ test_files:
 - spec/migrations/24_populate_pact_contents_spec.rb
 - spec/migrations/34_latest_tagged_pacts_spec.rb
 - spec/migrations/34_pact_revisions_spec.rb
+- spec/migrations/41_migrate_execution_data_spec.rb
 - spec/service_consumers/pact_helper.rb
 - spec/service_consumers/provider_states_for_pact_broker_client.rb
 - spec/spec_helper.rb
 - spec/support/database_cleaner.rb
 - spec/support/fixture_helpers.rb
+- spec/support/migration_helpers.rb
 - spec/support/rspec_match_hash.rb
 - spec/support/rspec_matchers.rb
 - spec/support/shared_examples_for_responses.rb

data/script/record_verification.sh

@@ -1,4 +0,0 @@
-curl -v -XPOST \-H "Content-Type: application/json" \
--d@spec/fixtures/record_verification.json \
-http://127.0.0.1:9292/pacts/provider/Animal%20Service/consumer/Zoo%20App/version/1.0.2/verifications
-echo ""