pact_broker 2.60.0 → 2.60.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dbaaee53f1641458eb110582a96bf0be98d7078ef1fa681ffee934c6e8007347
-  data.tar.gz: 84a2f6e6785acc85cf7053b86a54574746cb06de917bd11a0dff23403046aff5
+  metadata.gz: 2af8e33b43adbd78dff9e58ae2c16ff69668694dc71b203487d789bd754f4e1a
+  data.tar.gz: 1cf9633412dd10faac7179cfd34ee84bf84738961d7c131d5660f1e3938fe21a
 SHA512:
-  metadata.gz: de93223c0a1d52af6563bf31b2ae733c41b6cec65afb4a61be741d78f47cf18484ee2fa292c9660b8db09cb3a1a66c549decb145a0b7a036477a9ac73b70f8c6
-  data.tar.gz: 04d3a59551f4fe9f46af8b65cd6c0dc3326ac86a594298eb22d529e33f6a98e39cdf6f9c682bd69bd9bbb85f4f290fe3e2f706d71cfa766b61def28c0dbd7bfc
+  metadata.gz: c02c5a85ba278137ad2c15022ecf055c74c59ddf9565617c9df8ca65dc83181d9ec444385bbec65f557de42e6686e837f3230825945cde1da6bb1bc5e20a6b01
+  data.tar.gz: '0386fc2e7a2fcb3c3f019bcdbb49e37861259408b1aadfe298368ece37bbbb363260e4a01df6746ca137dea0be0ba220abbf497065300084576bd62d1bcf76f1'

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+<a name="v2.60.1"></a>
+### v2.60.1 (2020-09-10)
+
+#### Bug Fixes
+
+* href for beta:provider-pacts-for-verification	 ([3949fdd1](/../../commit/3949fdd1))
+
 <a name="v2.60.0"></a>
 ### v2.60.0 (2020-09-08)
 

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

@@ -49,11 +49,6 @@ module PactBroker
           :'webhooks::webooks'
         end
 
-        def policy_record
-          # Note: consumer and provider not yet set on new webhook
-          request.post? ? webhook : webhooks
-        end
-
         private
 
         def validation_errors? webhook

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

@@ -25,10 +25,6 @@ module PactBroker
           :'matrix::can_i_deploy'
         end
 
-        def policy_record
-          selectors
-        end
-
         private
 
         attr_reader :query_params, :selectors, :options

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

@@ -202,6 +202,15 @@ module PactBroker
           @pact ||= pact_service.find_pact(pact_params)
         end
 
+        # Not necessarily an existing integration
+        def integration
+          if consumer_specified? && provider_specified?
+            OpenStruct.new(consumer: consumer, provider: provider)
+          else
+            nil
+          end
+        end
+
         def database_connector
           request.env["pactbroker.database_connector"]
         end

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

@@ -4,9 +4,7 @@ require 'pact_broker/error'
 module PactBroker
   module Api
     module Resources
-
       class ErrorTest < BaseResource
-
         def content_types_provided
           [
             ["application/hal+json", :to_json]
@@ -24,6 +22,10 @@ module PactBroker
         def process_post
           raise PactBroker::TestError.new("Don't panic. This is a test API error.")
         end
+
+        def policy_name
+          :'default'
+        end
       end
     end
   end

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

@@ -26,10 +26,6 @@ module PactBroker
           :'groups::group'
         end
 
-        def policy_record
-          pacticipant
-        end
-
         private
 
         def group

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

@@ -128,7 +128,7 @@ module PactBroker
             },
             'beta:provider-pacts-for-verification' => {
               name: 'beta',
-              href: base_url + '/doc/{rel}?context=index',
+              href: base_url + '/pacts/provider/{provider}/for-verification',
               title: 'DEPRECATED - please use pb:provider-pacts-for-verification',
               templated: true
             },

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

@@ -21,10 +21,6 @@ module PactBroker
           :'integrations::integration'
         end
 
-        def policy_resource
-          integration
-        end
-
         def integration
           @integration ||= OpenStruct.new(consumer: consumer, provider: provider)
         end

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

@@ -37,10 +37,6 @@ module PactBroker
         def policy_name
           :'integrations::integrations'
         end
-
-        def policy_resource
-          integrations
-        end
       end
     end
   end

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

@@ -30,18 +30,10 @@ module PactBroker
           !!label
         end
 
-        def resource_object
-          label
-        end
-
         def policy_name
           :'labels::label'
         end
 
-        def policy_record
-          label
-        end
-
         def to_json
           PactBroker::Api::Decorators::LabelDecorator.new(label).to_json(decorator_options)
         end

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

@@ -25,11 +25,7 @@ module PactBroker
         end
 
         def policy_name
-          :'pacts:pact'
-        end
-
-        def policy_record
-          pact
+          :'pacts::pact'
         end
 
         def to_json

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

@@ -22,11 +22,7 @@ module PactBroker
         end
 
         def policy_name
-          :'pacts:pacts'
-        end
-
-        def policy_record
-          pacts
+          :'pacts::pacts'
         end
       end
     end

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

@@ -30,10 +30,6 @@ module PactBroker
           :'verifications::verifications'
         end
 
-        def policy_record
-          version
-        end
-
         private
 
         def version

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

@@ -43,6 +43,10 @@ module PactBroker
           PactBroker::Api::Decorators::MatrixTextDecorator.new(results).to_text(decorator_options)
         end
 
+        def policy_name
+          :'matrix::matrix'
+        end
+
         def results
           @results ||= matrix_service.find(selectors, options)
         end

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

@@ -27,6 +27,10 @@ module PactBroker
           PactBroker::Api::Decorators::MatrixDecorator.new(results).to_json(decorator_options)
         end
 
+        def policy_name
+          :'matrix::matrix'
+        end
+
         private
 
         attr_reader :options

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

@@ -15,6 +15,10 @@ module PactBroker
         def to_json
           metrics_service.metrics.to_json
         end
+
+        def policy_name
+          :'metrics::metrics'
+        end
       end
     end
   end

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

@@ -53,14 +53,6 @@ module PactBroker
           !!pact
         end
 
-        def resource_object
-          pact
-        end
-
-        def policy_resource
-          pact
-        end
-
         def from_json
           response_code = pact ? 200 : 201
 
@@ -96,6 +88,10 @@ module PactBroker
           true
         end
 
+        def policy_name
+          :'pacts::pact'
+        end
+
         private
 
         def pact

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

@@ -31,6 +31,10 @@ module PactBroker
           @pact_params ||= PactBroker::Pacts::PactParams.from_path_info identifier_from_path
         end
 
+        def policy_name
+          :'pacts::pact'
+        end
+
         def comparison_pact_params
           if identifier_from_path[:comparison_consumer_version_number] || identifier_from_path[:comparison_pact_version_sha]
             comparison_identifier_from_path = identifier_from_path.merge(

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

@@ -21,10 +21,14 @@ module PactBroker
           Decorators::TriggeredWebhooksDecorator.new(triggered_webhooks).to_json(decorator_options(resource_title: resource_title))
         end
 
+        def policy_name
+          :'webhooks::webhooks'
+        end
+
         private
 
         def triggered_webhooks
-          webhook_service.find_triggered_webhooks_for_pact(pact)
+          @webhooks ||= webhook_service.find_triggered_webhooks_for_pact(pact)
         end
 
         def resource_title

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

@@ -23,13 +23,17 @@ module PactBroker
         end
 
         def pacts
-          pact_service.find_all_pact_versions_between consumer_name, :and => provider_name
+          @pacts ||= pact_service.find_all_pact_versions_between consumer_name, :and => provider_name
         end
 
         def delete_resource
           pact_service.delete_all_pact_publications_between(consumer_name, and: provider_name)
           true
         end
+
+        def policy_name
+          :'pacts::pacts'
+        end
       end
     end
   end

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

@@ -59,10 +59,14 @@ module PactBroker
           Decorators::WebhooksDecorator.new(webhooks).to_json(user_options: decorator_context(resource_title: 'Pact webhooks'))
         end
 
+        def policy_name
+          :'webhooks::webhooks'
+        end
+
         private
 
         def webhooks
-          webhook_service.find_by_consumer_and_provider consumer, provider
+          @webhooks ||= webhook_service.find_by_consumer_and_provider consumer, provider
         end
 
         def webhook

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

@@ -22,6 +22,10 @@ module PactBroker
           decorator_for(latest_triggered_webhooks).to_json(user_options: decorator_context(identifier_from_path))
         end
 
+        def policy_name
+          :'webhooks::webhooks'
+        end
+
         private
 
         def latest_triggered_webhooks
@@ -33,7 +37,7 @@ module PactBroker
         end
 
         def webhooks
-          webhook_service.find_by_consumer_and_provider(consumer, provider)
+          @webhooks ||= webhook_service.find_by_consumer_and_provider(consumer, provider)
         end
 
         def decorator_for latest_triggered_webhooks

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

@@ -40,15 +40,7 @@ module PactBroker
         end
 
         def resource_exists?
-          !!resource_object
-        end
-
-        def resource_object
-          pacticipant
-        end
-
-        def policy_resource
-          pacticipant
+          !!pacticipant
         end
 
         def delete_resource
@@ -59,6 +51,10 @@ module PactBroker
         def to_json
           PactBroker::Api::Decorators::PacticipantDecorator.new(pacticipant).to_json(decorator_options)
         end
+
+        def policy_name
+          :'pacticipants::pacticipant'
+        end
       end
     end
   end

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

@@ -61,10 +61,6 @@ module PactBroker
           :'pacticipants::pacticipants'
         end
 
-        def policy_record
-          request.post? ? nil : pacticipants
-        end
-
         private
 
         def pacticipants

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

@@ -21,6 +21,10 @@ module PactBroker
         def generate_json pacticipants
           PactBroker::Api::Decorators::PacticipantCollectionDecorator.new(pacticipants).to_json(decorator_options)
         end
+
+        def policy_name
+          :'pacticipants::pacticipants'
+        end
       end
     end
   end

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

@@ -17,15 +17,7 @@ module PactBroker
         end
 
         def resource_exists?
-          !!resource_object
-        end
-
-        def resource_object
-          pact
-        end
-
-        def policy_resource
-          pact
+          !!pact
         end
 
         def to_json
@@ -40,6 +32,9 @@ module PactBroker
           @pact_params ||= PactBroker::Pacts::PactParams.from_request request, path_info
         end
 
+        def policy_name
+          :'pacts::pact'
+        end
       end
     end
   end

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

@@ -20,11 +20,7 @@ module PactBroker
         end
 
         def policy_name
-          :'pacts:provider_pacts'
-        end
-
-        def policy_record
-          provider
+          :'pacts::pacts'
         end
 
         def to_json

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

@@ -4,9 +4,7 @@ require 'pact_broker/api/decorators/relationships_csv_decorator'
 module PactBroker
   module Api
     module Resources
-
       class Relationships < BaseResource
-
         def content_types_provided
           [["text/csv", :to_csv]]
         end
@@ -22,6 +20,10 @@ module PactBroker
         def pacts
           pact_service.find_latest_pacts
         end
+
+        def policy_name
+          :'integrations::integrations'
+        end
       end
     end
   end

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

@@ -27,11 +27,7 @@ module PactBroker
         end
 
         def resource_exists?
-          !!resource_object
-        end
-
-        def resource_object
-          tag
+          !!tag
         end
 
         def to_json
@@ -46,6 +42,10 @@ module PactBroker
           tag_service.delete identifier_from_path
           true
         end
+
+        def policy_name
+          :'tags::tag'
+        end
       end
     end
 

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

@@ -6,7 +6,6 @@ module PactBroker
   module Api
     module Resources
       class TaggedPactVersions < BaseResource
-
         def content_types_provided
           [["application/hal+json", :to_json]]
         end
@@ -29,7 +28,11 @@ module PactBroker
         end
 
         def pacts
-          pact_service.find_all_pact_versions_between consumer_name, and: provider_name, tag: identifier_from_path[:tag]
+          @pacts ||= pact_service.find_all_pact_versions_between consumer_name, and: provider_name, tag: identifier_from_path[:tag]
+        end
+
+        def policy_name
+          :'pact::pacts'
         end
       end
     end

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

@@ -16,11 +16,7 @@ module PactBroker
         end
 
         def resource_exists?
-          !!resource_object
-        end
-
-        def resource_object
-          triggered_webhook
+          !!triggered_webhook
         end
 
         def to_text
@@ -28,6 +24,12 @@ module PactBroker
           triggered_webhook.webhook_executions.collect(&:logs).join("\n")
         end
 
+        def policy_name
+          :'webhook::webhook'
+        end
+
+        private
+
         def triggered_webhook
           @triggered_webhook ||= begin
             criteria = { webhook_uuid: identifier_from_path[:uuid], trigger_uuid: identifier_from_path[:trigger_uuid] }

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

@@ -28,14 +28,10 @@ module PactBroker
             set_json_error_message("To see all the verifications for a pact, use the Matrix page")
             false
           else
-            !!resource_object
+            !!verification
           end
         end
 
-        def resource_object
-          verification
-        end
-
         def to_json
           decorator_for(verification).to_json(decorator_options)
         end
@@ -49,6 +45,10 @@ module PactBroker
           true
         end
 
+        def policy_name
+          :'verifications::verification'
+        end
+
         private
 
         def verification

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

@@ -14,33 +14,27 @@ module PactBroker
         end
 
         def resource_exists?
-          !!resource_object
+          !!verification
         end
 
-        def resource_object
-          verification
+        def to_json
+          Decorators::TriggeredWebhooksDecorator.new(triggered_webhooks).to_json(decorator_options(resource_title: resource_title))
         end
 
-        def to_json
-          Decorators::TriggeredWebhooksDecorator.new(triggered_webhooks).to_json(decorator_options)
+        def policy_name
+          :'webhooks::triggered_webhooks'
         end
 
         private
 
         def triggered_webhooks
-          webhook_service.find_triggered_webhooks_for_verification(verification)
+          @triggered_webhooks ||= webhook_service.find_triggered_webhooks_for_verification(verification)
         end
 
         def resource_title
           "Webhooks triggered by the publication of verification result #{verification.number}"
         end
 
-        def decorator_options
-          {
-            user_options: decorator_context.merge(resource_title: resource_title)
-          }
-        end
-
         def verification
           @verification ||= verification_service.find(identifier_from_path)
         end

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

@@ -28,11 +28,7 @@ module PactBroker
         end
 
         def resource_exists?
-          !!resource_object
-        end
-
-        def resource_object
-          pact
+          !!pact
         end
 
         def malformed_request?
@@ -57,6 +53,10 @@ module PactBroker
           true
         end
 
+        def policy_name
+          :'verifications::verifications'
+        end
+
         private
 
         def pact

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

@@ -16,11 +16,7 @@ module PactBroker
         end
 
         def resource_exists?
-          !!resource_object
-        end
-
-        def resource_object
-          version
+          !!version
         end
 
         def to_json
@@ -32,6 +28,10 @@ module PactBroker
           true
         end
 
+        def policy_name
+          :'versions::version'
+        end
+
         private
 
         def version

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

@@ -6,7 +6,6 @@ module PactBroker
   module Api
     module Resources
       class Versions < BaseResource
-
         def content_types_provided
           [["application/hal+json", :to_json]]
         end
@@ -24,7 +23,11 @@ module PactBroker
         end
 
         def versions
-          pacticipant_service.find_all_pacticipant_versions_in_reverse_order pacticipant_name
+          @versions ||= pacticipant_service.find_all_pacticipant_versions_in_reverse_order pacticipant_name
+        end
+
+        def policy_name
+          :'versions::versions'
         end
       end
     end

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

@@ -57,6 +57,10 @@ module PactBroker
           true
         end
 
+        def policy_name
+          :'webhooks::webhook'
+        end
+
         private
 
         def webhook

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

@@ -48,6 +48,10 @@ module PactBroker
           end
         end
 
+        def policy_name
+          :'webhooks::webhook'
+        end
+
         private
 
         def post_response_body webhook_execution_result

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

@@ -50,10 +50,14 @@ module PactBroker
           Decorators::WebhooksDecorator.new(webhooks).to_json(decorator_options(resource_title: 'Pact webhooks'))
         end
 
+        def policy_name
+          :'webhooks::webhooks'
+        end
+
         private
 
         def webhooks
-          webhook_service.find_by_consumer_and_provider consumer, provider
+          webhook_service.find_by_consumer_and_provider(consumer, provider)
         end
 
         def webhook

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = '2.60.0'
+  VERSION = '2.60.1'
 end

data/spec/lib/pact_broker/api/resources/default_base_resource_spec.rb

@@ -133,23 +133,29 @@ module PactBroker
         .select { |klass| klass < DefaultBaseResource }
         .select { |klass| !klass.name.end_with?("BaseResource") }
 
-      ALL_RESOURCES.each do | resource |
-        describe resource do
+      ALL_RESOURCES.each do | resource_class |
+        describe resource_class do
           let(:request) { double('request', uri: URI("http://example.org")).as_null_object }
           let(:response) { double('response') }
+          let(:resource) { resource_class.new(request, response) }
 
           it "includes OPTIONS in the list of allowed_methods" do
-            expect(resource.new(request, response).allowed_methods).to include "OPTIONS"
+            expect(resource.allowed_methods).to include "OPTIONS"
           end
 
           it "calls super in its constructor" do
             expect(PactBroker.configuration.before_resource).to receive(:call)
-            resource.new(request, response)
+            resource
           end
 
           it "calls super in finish_request" do
             expect(PactBroker.configuration.after_resource).to receive(:call)
-            resource.new(request, response).finish_request
+            resource.finish_request
+          end
+
+          it "has a policy_name method" do
+            expect(resource).to respond_to(:policy_name)
+            puts resource.policy_name
           end
         end
       end

data/spec/lib/pact_broker/api/resources/verification_triggered_webhooks_spec.rb

@@ -34,7 +34,6 @@ module PactBroker
           end
 
           context "when the verification exists" do
-
             it "finds the triggered webhooks for the verification" do
               expect(webhook_service).to receive(:find_triggered_webhooks_for_verification)
               subject

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 2.60.0
+  version: 2.60.1
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-08 00:00:00.000000000 Z
+date: 2020-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty