pact_broker 2.58.0 → 2.58.2

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

@@ -27,7 +27,7 @@ module PactBroker
         end
 
         def self.reportable?(e)
-          !e.is_a?(PactBroker::Error) && !e.is_a?(JSON::GeneratorError)
+          !e.is_a?(PactBroker::Error) && !e.is_a?(JSON::JSONError)
         end
 
         def self.log_as_warning?(e)

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

@@ -2,10 +2,8 @@ require 'pact_broker/api/resources/base_resource'
 require 'pact_broker/api/decorators/relationships_csv_decorator'
 
 module PactBroker
-
   module Api
     module Resources
-
       class Group < BaseResource
 
         def content_types_provided
@@ -26,20 +24,10 @@ module PactBroker
 
         private
 
-        def pacticipant_name
-          identifier_from_path[:pacticipant_name]
-        end
-
-        def pacticipant
-          @pacticipant ||= pacticipant_service.find_pacticipant_by_name(pacticipant_name)
-        end
-
         def group
-          @group ||= group_service.find_group_containing pacticipant
+          @group ||= group_service.find_group_containing(pacticipant)
         end
-
       end
     end
-
   end
 end

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

@@ -5,7 +5,6 @@ module PactBroker
   module Api
     module Resources
       class Label < BaseResource
-
         def content_types_provided
           [["application/hal+json", :to_json]]
         end
@@ -28,11 +27,15 @@ module PactBroker
         end
 
         def resource_exists?
+          !!resource_object
+        end
+
+        def resource_object
           label
         end
 
         def to_json
-          PactBroker::Api::Decorators::LabelDecorator.new(label).to_json(user_options: { base_url: base_url })
+          PactBroker::Api::Decorators::LabelDecorator.new(label).to_json(decorator_options)
         end
 
         def label

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

@@ -21,6 +21,10 @@ module PactBroker
         end
 
         def resource_exists?
+          !!resource_object
+        end
+
+        def resource_object
           pact
         end
 

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

@@ -3,7 +3,6 @@ require 'pact_broker/api/resources/base_resource'
 module PactBroker
   module Api
     module Resources
-
       class LatestPacts < BaseResource
 
         def content_types_provided
@@ -15,15 +14,13 @@ module PactBroker
         end
 
         def to_json
-          PactBroker::Api::Decorators::PactCollectionDecorator.new(pacts).to_json(user_options: { base_url: base_url })
+          PactBroker::Api::Decorators::PactCollectionDecorator.new(pacts).to_json(decorator_options)
         end
 
         def pacts
           pact_service.find_latest_pacts
         end
-
       end
     end
-
   end
 end

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

@@ -18,8 +18,7 @@ module PactBroker
         end
 
         def resource_exists?
-          version_params = {pacticipant_name: identifier_from_path[:consumer_name], pacticipant_version_number: identifier_from_path[:consumer_version_number]}
-          !!version_service.find_by_pacticipant_name_and_number(version_params)
+          !!version
         end
 
         def to_json
@@ -29,6 +28,13 @@ module PactBroker
 
         private
 
+        def version
+          version_service.find_by_pacticipant_name_and_number(
+            pacticipant_name: consumer_name,
+            pacticipant_version_number: consumer_version_number
+          )
+        end
+
         def decorator_for summary
           PactBroker::Api::Decorators::VerificationSummaryDecorator.new(summary)
         end

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

@@ -36,11 +36,11 @@ module PactBroker
         end
 
         def to_json
-          PactBroker::Api::Decorators::MatrixDecorator.new(results).to_json(user_options: { base_url: base_url })
+          PactBroker::Api::Decorators::MatrixDecorator.new(results).to_json(decorator_options)
         end
 
         def to_text
-          PactBroker::Api::Decorators::MatrixTextDecorator.new(results).to_text(user_options: { base_url: base_url })
+          PactBroker::Api::Decorators::MatrixTextDecorator.new(results).to_text(decorator_options)
         end
 
         def results

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

@@ -24,7 +24,7 @@ module PactBroker
         end
 
         def to_json
-          PactBroker::Api::Decorators::MatrixDecorator.new(results).to_json(user_options: { base_url: base_url })
+          PactBroker::Api::Decorators::MatrixDecorator.new(results).to_json(decorator_options)
         end
 
         private

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

@@ -50,7 +50,11 @@ module PactBroker
         end
 
         def resource_exists?
-          !!pact
+          !!resource_object
+        end
+
+        def resource_object
+          pact
         end
 
         def from_json

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

@@ -15,8 +15,7 @@ module PactBroker
         end
 
         def resource_exists?
-          pacticipant_service.find_pacticipant_by_name(consumer_name) &&
-            pacticipant_service.find_pacticipant_by_name(provider_name)
+          consumer && provider
         end
 
         def to_text

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

@@ -18,7 +18,7 @@ module PactBroker
         end
 
         def to_json
-          Decorators::TriggeredWebhooksDecorator.new(triggered_webhooks).to_json(decorator_options)
+          Decorators::TriggeredWebhooksDecorator.new(triggered_webhooks).to_json(decorator_options(resource_title: resource_title))
         end
 
         private
@@ -30,12 +30,6 @@ module PactBroker
         def resource_title
           "Webhooks triggered by the publication of the #{pact.name[0].downcase}#{pact.name[1..-1]}"
         end
-
-        def decorator_options
-          {
-            user_options: decorator_context.merge(resource_title: resource_title)
-          }
-        end
       end
     end
   end

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

@@ -6,7 +6,6 @@ module PactBroker
   module Api
     module Resources
       class PactVersions < BaseResource
-
         def content_types_provided
           [["application/hal+json", :to_json]]
         end
@@ -16,8 +15,7 @@ module PactBroker
         end
 
         def resource_exists?
-          pacticipant_service.find_pacticipant_by_name(consumer_name) &&
-            pacticipant_service.find_pacticipant_by_name(provider_name)
+          consumer && provider
         end
 
         def to_json

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

@@ -4,10 +4,8 @@ require 'pact_broker/api/decorators/webhooks_decorator'
 require 'pact_broker/api/contracts/webhook_contract'
 
 module PactBroker
-
   module Api
     module Resources
-
       class PactWebhooks < BaseResource
 
         def allowed_methods
@@ -23,8 +21,7 @@ module PactBroker
         end
 
         def resource_exists?
-          (identifier_from_path[:consumer_name].nil? || consumer) &&
-            (identifier_from_path[:provider_name].nil? || provider)
+          (!consumer_specified? || consumer) && (!provider_specified? || provider)
         end
 
         def malformed_request?
@@ -55,7 +52,7 @@ module PactBroker
 
         def from_json
           saved_webhook = webhook_service.create next_uuid, webhook, consumer, provider
-          response.body = Decorators::WebhookDecorator.new(saved_webhook).to_json(user_options: { base_url: base_url })
+          response.body = Decorators::WebhookDecorator.new(saved_webhook).to_json(decoractor_options)
         end
 
         def to_json

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

@@ -2,10 +2,8 @@ require 'pact_broker/api/resources/base_resource'
 require 'pact_broker/api/decorators/pact_webhooks_status_decorator'
 
 module PactBroker
-
   module Api
     module Resources
-
       class PactWebhooksStatus < BaseResource
 
         def allowed_methods
@@ -35,21 +33,7 @@ module PactBroker
         end
 
         def webhooks
-          webhook_service.find_by_consumer_and_provider consumer, provider
-        end
-
-        def consumer
-          @consumer ||= find_pacticipant(identifier_from_path[:consumer_name], "consumer")
-        end
-
-        def provider
-          @provider ||= find_pacticipant(identifier_from_path[:provider_name], "provider")
-        end
-
-        def find_pacticipant name, role
-          pacticipant_service.find_pacticipant_by_name(name).tap do | pacticipant |
-            set_json_error_message("No #{role} with name '#{name}' found") if pacticipant.nil?
-          end
+          webhook_service.find_by_consumer_and_provider(consumer, provider)
         end
 
         def decorator_for latest_triggered_webhooks

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

@@ -11,7 +11,6 @@ end
 module PactBroker
   module Api
     module Resources
-
       class Pacticipant < BaseResource
 
         def content_types_provided
@@ -32,7 +31,7 @@ module PactBroker
 
         def from_json
           if pacticipant
-            @pacticipant = pacticipant_service.update params_with_string_keys.merge('name' => pacticipant_name)
+            @pacticipant = pacticipant_service.update params(symbolize_names: false).merge('name' => pacticipant_name)
           else
             @pacticipant = pacticipant_service.create params.merge(:name => pacticipant_name)
             response.headers["Location"] = pacticipant_url(base_url, pacticipant)
@@ -41,26 +40,20 @@ module PactBroker
         end
 
         def resource_exists?
+          !!resource_object
+        end
+
+        def resource_object
           pacticipant
         end
 
         def delete_resource
-          pacticipant_service.delete pacticipant_name
+          pacticipant_service.delete(pacticipant_name)
           true
         end
 
         def to_json
-          PactBroker::Api::Decorators::PacticipantDecorator.new(pacticipant).to_json(user_options: { base_url: base_url })
-        end
-
-        private
-
-        def pacticipant
-          @pacticipant ||= pacticipant_service.find_pacticipant_by_name(pacticipant_name)
-        end
-
-        def pacticipant_name
-          identifier_from_path[:pacticipant_name]
+          PactBroker::Api::Decorators::PacticipantDecorator.new(pacticipant).to_json(decorator_options)
         end
       end
     end

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

@@ -46,7 +46,7 @@ module PactBroker
         end
 
         def generate_json pacticipants
-          PactBroker::Api::Decorators::DeprecatedPacticipantCollectionDecorator.new(pacticipants).to_json(user_options: { base_url: base_url })
+          PactBroker::Api::Decorators::DeprecatedPacticipantCollectionDecorator.new(pacticipants).to_json(decorator_options)
         end
 
         def decorator_for model

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

@@ -19,7 +19,7 @@ module PactBroker
         end
 
         def generate_json pacticipants
-          PactBroker::Api::Decorators::PacticipantCollectionDecorator.new(pacticipants).to_json(user_options: { base_url: base_url })
+          PactBroker::Api::Decorators::PacticipantCollectionDecorator.new(pacticipants).to_json(decorator_options)
         end
       end
     end

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

@@ -18,6 +18,10 @@ module PactBroker
         end
 
         def resource_exists?
+          !!resource_object
+        end
+
+        def resource_object
           pact
         end
 

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

@@ -16,7 +16,11 @@ module PactBroker
         end
 
         def resource_exists?
-          pacticipant_service.find_pacticipant_by_name(provider_name)
+          !!provider
+        end
+
+        def resource_object
+          provider
         end
 
         def to_json

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

@@ -72,7 +72,7 @@ module PactBroker
             if request.get?
               Rack::Utils.parse_nested_query(request.uri.query)
             elsif request.post?
-              params_with_string_keys
+              params(symbolize_names: false, default: {})
             end
           end
         end

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

@@ -27,11 +27,15 @@ module PactBroker
         end
 
         def resource_exists?
+          !!resource_object
+        end
+
+        def resource_object
           tag
         end
 
         def to_json
-          PactBroker::Api::Decorators::TagDecorator.new(tag).to_json(user_options: { base_url: base_url })
+          PactBroker::Api::Decorators::TagDecorator.new(tag).to_json(decorator_options)
         end
 
         def tag

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

@@ -16,8 +16,7 @@ module PactBroker
         end
 
         def resource_exists?
-          pacticipant_service.find_pacticipant_by_name(consumer_name) &&
-            pacticipant_service.find_pacticipant_by_name(provider_name)
+          consumer && provider
         end
 
         def to_json

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

@@ -16,6 +16,10 @@ module PactBroker
         end
 
         def resource_exists?
+          !!resource_object
+        end
+
+        def resource_object
           triggered_webhook
         end
 

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

@@ -28,16 +28,20 @@ module PactBroker
             set_json_error_message("To see all the verifications for a pact, use the Matrix page")
             false
           else
-            !!verification
+            !!resource_object
           end
         end
 
+        def resource_object
+          verification
+        end
+
         def to_json
-          decorator_for(verification).to_json(user_options: { base_url: base_url })
+          decorator_for(verification).to_json(decorator_options)
         end
 
         def to_extended_json
-          extended_decorator_for(verification).to_json(user_options: { base_url: base_url })
+          extended_decorator_for(verification).to_json(decorator_options)
         end
 
         def delete_resource