pact_broker 2.106.0 → 2.107.0

data/lib/rack/pact_broker/invalid_uri_protection.rb

@@ -45,7 +45,7 @@ module Rack
       end
 
       def validate(uri)
-        decoded_path = URI.decode(uri.path)
+        decoded_path = URI.decode_www_form_component(uri.path)
         if decoded_path.include?("\n")
           message("errors.new_line_in_url_path")
         elsif decoded_path.include?("\t")

data/lib/rack/pact_broker/use_when.rb

@@ -15,11 +15,12 @@ module Rack
   module PactBroker
     module UseWhen
       class ConditionallyUseMiddleware
-        def initialize(app, condition_proc, middleware, *args, &block)
+        def initialize(app, condition_proc, middleware, *args, **kwargs, &block)
           @app_without_middleware = app
           @condition_proc = condition_proc
           @middleware = middleware
           @args = args
+          @kwargs = kwargs
           @block = block
         end
 
@@ -33,12 +34,12 @@ module Rack
 
         private
 
-        attr_reader :app_without_middleware, :condition_proc, :middleware, :args, :block
+        attr_reader :app_without_middleware, :condition_proc, :middleware, :args, :kwargs, :block
 
         def app_with_middleware
           @app_with_middleware ||= begin
             rack_builder = ::Rack::Builder.new
-            rack_builder.use middleware, *args, &block
+            rack_builder.use middleware, *args, **kwargs, &block
             rack_builder.run app_without_middleware
             rack_builder.to_app
           end
@@ -46,8 +47,8 @@ module Rack
       end
 
       refine Rack::Builder do
-        def use_when(condition_proc, middleware, *args, &block)
-          use(ConditionallyUseMiddleware, condition_proc, middleware, *args, &block)
+        def use_when(condition_proc, middleware, *args, **kwargs, &block)
+          use(ConditionallyUseMiddleware, condition_proc, middleware, *args, **kwargs, &block)
         end
       end
     end

data/lib/sequel/plugins/age.rb

@@ -0,0 +1,13 @@
+require "moments"
+
+module Sequel
+  module Plugins
+    module Age
+      module InstanceMethods
+        def age
+          @age ||= Moments.difference(Time.now, created_at.to_time)
+        end
+      end
+    end
+  end
+end

data/lib/webmachine/application_monkey_patch.rb

@@ -2,9 +2,14 @@ require "webmachine/application"
 
 class Webmachine::Application
   def application_context= application_context
+    @application_context = application_context
     # naughty, but better than setting each route manually
     routes.each do | route |
       route.instance_variable_get(:@bindings)[:application_context] = application_context
     end
   end
+
+  def application_context
+    @application_context
+  end
 end

data/lib/webmachine/describe_routes.rb

@@ -1,7 +1,9 @@
 require "webmachine/adapters/rack_mapped"
+require "pact_broker/string_refinements"
 
 module Webmachine
   class DescribeRoutes
+    using PactBroker::StringRefinements
 
     Route = Struct.new(
         :path,
@@ -11,6 +13,7 @@ module Webmachine
         :resource_class_location,
         :allowed_methods,
         :policy_class,
+        :schemas,
         keyword_init: true) do
 
       def [](key)
@@ -77,33 +80,57 @@ module Webmachine
           resource_class: webmachine_route.resource,
           resource_name: webmachine_route.instance_variable_get(:@bindings)[:resource_name],
           resource_class_location: resource_path_absolute.relative_path_from(Pathname.pwd).to_s
-        }.merge(info_from_resource_instance(webmachine_route)))
+        }.merge(info_from_resource_instance(webmachine_route, webmachine_application.application_context)))
       end.reject{ | route | route.resource_class == Webmachine::Trace::TraceResource }
     end
 
-    def self.info_from_resource_instance(webmachine_route)
+    def self.info_from_resource_instance(webmachine_route, application_context)
       with_no_logging do
-        path_info = { application_context: OpenStruct.new, pacticipant_name: "foo", pacticipant_version_number: "1", resource_name: "foo" }
+        path_info = { application_context: application_context, pacticipant_name: "foo", pacticipant_version_number: "1", resource_name: "foo" }
         path_info.default = "1"
-        dummy_request = Webmachine::Adapters::Rack::RackRequest.new("GET", "/", Webmachine::Headers["host" => "example.org"], nil, {}, {}, { "REQUEST_METHOD" => "GET" })
-        dummy_request.path_info = path_info
+        dummy_request = dummy_request(http_method: "GET", path_info: path_info)
+
         dummy_resource = webmachine_route.resource.new(dummy_request, Webmachine::Response.new)
         if dummy_resource
           {
             allowed_methods: dummy_resource.allowed_methods,
-          }
+            schemas: dummy_resource.respond_to?(:schema, true) && dummy_resource.send(:schema) ? schemas(dummy_resource.allowed_methods, webmachine_route.resource, path_info) : nil
+          }.compact
         else
           {}
         end
       end
     rescue StandardError => e
-      puts "Could not determine instance info for #{route.resource}. #{e.class} - #{e.message}"
+      puts "Could not determine instance info for #{webmachine_route.resource}. #{e.class} - #{e.message}"
       {}
     end
 
+    # This is not entirely accurate, because some GET requests have schemas too, but we can't tell that statically at the moment
+    def self.schemas(allowed_methods, resource, path_info)
+      (allowed_methods - ["GET", "OPTIONS", "DELETE"]).collect do | http_method |
+        resource.new(dummy_request(http_method: http_method, path_info: path_info), Webmachine::Response.new).send(:schema)
+      end.uniq.collect do | schema_class |
+        {
+          class: schema_class,
+          location: source_location_for(schema_class)
+        }
+      end
+    end
+
+    def self.dummy_request(http_method: "GET", path_info: )
+      dummy_request = Webmachine::Adapters::Rack::RackRequest.new(http_method, "/", Webmachine::Headers["host" => "example.org"], nil, {}, {}, { "REQUEST_METHOD" => http_method })
+      dummy_request.path_info = path_info
+      dummy_request
+    end
+
     def self.source_location_for(clazz)
       first_instance_method_name = (clazz.instance_methods(false) + clazz.private_instance_methods(false)).first
-      clazz.instance_method(first_instance_method_name).source_location.first
+      if first_instance_method_name
+        clazz.instance_method(first_instance_method_name).source_location.first
+      else
+        # have a guess!
+        "lib/" + clazz.name.snakecase.gsub("::", "/") + ".rb"
+      end
     end
 
     # If we don't turn off the logging, we get metrics logging due to the instantiation of the Webmachine::RackRequest class

data/lib/webmachine/render_error_monkey_patch.rb

@@ -29,7 +29,7 @@ module Webmachine
     res.code = code
     unless res.body
       title, message = t(["errors.#{code}.title", "errors.#{code}.message"],
-                         { :method => req.method,
+                         **{ :method => req.method,
                            :error => res.error}.merge(options))
 
       title = options[:title] if options[:title]

data/pact_broker.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |gem|
                         if Dir.exist?(".git")
                           Dir.chdir(File.expand_path(__dir__)) do
                             include_patterns = %w[lib/**/* db/**/* docs/**/*.md public/**/* vendor/**/* LICENSE.txt README.md CHANGELOG.md Gemfile pact_broker.gemspec]
-                            exclude_patterns = %w[db/test/**/*]
+                            exclude_patterns = %w[db/test/**/* lib/**/*/README.md]
                             include_list = include_patterns.flat_map{ | pattern | Dir.glob(pattern) } - exclude_patterns.flat_map{ | pattern | Dir.glob(pattern) }
 
                             `git ls-files -z`.split("\x0") & include_list
@@ -49,23 +49,14 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.license       = "MIT"
 
-  #gem.add_runtime_dependency 'pact'
   gem.add_runtime_dependency "json", "~> 2.3"
+  gem.add_runtime_dependency "psych", "~> 4.0" # TODO identify breaking changes and see if we can use 5
   gem.add_runtime_dependency "roar", "~> 1.1"
-  gem.add_runtime_dependency "reform", "~> 2.3.3"
-  gem.add_runtime_dependency "dry-validation", "~> 0.10.5"
-  # if dry-container is not locked, get this error:
-  # An error occurred while loading spec_helper.
-  # Failure/Error: require "reform/form/dry"
-  # NoMethodError:
-  #   undefined method `call' for nil:NilClass
-  # # /Users/beth.skurrie/.gem/ruby/2.7.5/gems/dry-container-0.10.0/lib/dry/container/mixin.rb:151:in `register'
-  gem.add_runtime_dependency "dry-container", "0.8.0"
-  # /usr/local/bundle/gems/dry-validation-0.10.7/lib/dry/validation/schema/class_interface.rb:7:in `<module:Validation>' [dry-configurable] default value as positional argument to settings is deprecated and will be removed in the next major version
-  # Provide a `default:` keyword argument instead
-  gem.add_runtime_dependency "dry-configurable", "0.12.1"
+  gem.add_runtime_dependency "dry-validation", "~> 1.8"
+  gem.add_runtime_dependency "reform", "~> 2.6"
   gem.add_runtime_dependency "sequel", "~> 5.28"
-  gem.add_runtime_dependency "webmachine", "1.6.0"
+  gem.add_runtime_dependency "webmachine", ">= 2.0.0.beta", "< 3.0"
+  gem.add_runtime_dependency "webrick", "~> 1.8" # webmachine requires webrick, but doesn't declare it as a dependency :shrug:
   gem.add_runtime_dependency "semver2", "~> 3.4.2"
   gem.add_runtime_dependency "rack", ">= 2.2.3", "~> 2.2"
   gem.add_runtime_dependency "redcarpet", ">= 3.5.1", "~>3.5"
@@ -75,12 +66,11 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency "haml", "~>5.0"
   gem.add_runtime_dependency "sucker_punch", "~>2.0"
   gem.add_runtime_dependency "rack-protection", ">= 2.0.8.1", "< 3.0"
-  gem.add_runtime_dependency "dry-types", "~> 0.10.3" # https://travis-ci.org/pact-foundation/pact_broker/jobs/249448621
-  gem.add_runtime_dependency "dry-logic", "0.4.2" # Later version cases ArgumentError: wrong number of arguments
   gem.add_runtime_dependency "table_print", "~> 1.5"
   gem.add_runtime_dependency "semantic_logger", "~> 4.11"
   gem.add_runtime_dependency "sanitize", "~> 6.0"
   gem.add_runtime_dependency "wisper", "~> 2.0"
   gem.add_runtime_dependency "anyway_config", "~> 2.1"
   gem.add_runtime_dependency "request_store", "~> 1.5"
+  gem.add_runtime_dependency "moments", "~> 0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 2.106.0
+  version: 2.107.0
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-03 00:00:00.000000000 Z
+date: 2023-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -27,103 +27,109 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.3'
 - !ruby/object:Gem::Dependency
-  name: roar
+  name: psych
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: reform
+  name: roar
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.3
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.3
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: dry-validation
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.5
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.5
+        version: '1.8'
 - !ruby/object:Gem::Dependency
-  name: dry-container
+  name: reform
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '2.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '2.6'
 - !ruby/object:Gem::Dependency
-  name: dry-configurable
+  name: sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.1
+        version: '5.28'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.1
+        version: '5.28'
 - !ruby/object:Gem::Dependency
-  name: sequel
+  name: webmachine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.28'
+        version: 2.0.0.beta
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.28'
+        version: 2.0.0.beta
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: webmachine
+  name: webrick
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: semver2
   requirement: !ruby/object:Gem::Requirement
@@ -286,34 +292,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: dry-types
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.10.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.10.3
-- !ruby/object:Gem::Dependency
-  name: dry-logic
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.4.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.4.2
 - !ruby/object:Gem::Dependency
   name: table_print
   requirement: !ruby/object:Gem::Requirement
@@ -398,6 +376,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: moments
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 description: A server that stores and returns pact files generated by the pact gem.
   It enables head/prod cross testing of the consumer and provider projects.
 email:
@@ -591,12 +583,13 @@ files:
 - db/migrations/20221208_add_index_to_pact_version_provider_tag_successful_verifications.rb
 - db/migrations/20221215_add_prov_ver_id_ndx_to_latest_verifi_id_for_pact_ver_and_prov_ver.rb
 - db/migrations/20230131_add_cons_ver_id_ndx_to_latest_pp_id_for_cons_ver.rb
+- db/migrations/20230216_add_branch_heads_branch_version_id_index.rb
+- db/migrations/20230428_add_index_for_webhook_executions_pact_publication_id.rb
 - db/migrations/migration_helper.rb
 - docs/CONFIGURATION.md
 - docs/api/PACTICIPANTS.md
 - docs/api/PAGINATION.md
 - docs/api/WEBHOOKS.md
-- lib/pact/doc/README.md
 - lib/pact/doc/doc_file.rb
 - lib/pact/doc/generate.rb
 - lib/pact/doc/generator.rb
@@ -611,23 +604,28 @@ files:
 - lib/pact_broker/api.rb
 - lib/pact_broker/api/authorization/resource_access_policy.rb
 - lib/pact_broker/api/authorization/resource_access_rules.rb
+- lib/pact_broker/api/contracts.rb
 - lib/pact_broker/api/contracts/base_contract.rb
+- lib/pact_broker/api/contracts/can_i_deploy_query_schema.rb
 - lib/pact_broker/api/contracts/configuration.rb
-- lib/pact_broker/api/contracts/dry_validation_predicates.rb
-- lib/pact_broker/api/contracts/dry_validation_workarounds.rb
+- lib/pact_broker/api/contracts/consumer_version_selector_contract.rb
+- lib/pact_broker/api/contracts/dry_validation_errors_formatter.rb
+- lib/pact_broker/api/contracts/dry_validation_macros.rb
+- lib/pact_broker/api/contracts/dry_validation_methods.rb
 - lib/pact_broker/api/contracts/environment_schema.rb
 - lib/pact_broker/api/contracts/pacticipant_create_schema.rb
-- lib/pact_broker/api/contracts/pacticipant_name_contract.rb
-- lib/pact_broker/api/contracts/pacticipant_name_validation.rb
 - lib/pact_broker/api/contracts/pacticipant_schema.rb
 - lib/pact_broker/api/contracts/pacts_for_verification_json_query_schema.rb
 - lib/pact_broker/api/contracts/pacts_for_verification_query_string_schema.rb
+- lib/pact_broker/api/contracts/publish_contracts_contract_contract.rb
 - lib/pact_broker/api/contracts/publish_contracts_schema.rb
 - lib/pact_broker/api/contracts/put_pact_params_contract.rb
-- lib/pact_broker/api/contracts/request_validations.rb
 - lib/pact_broker/api/contracts/utf_8_validation.rb
+- lib/pact_broker/api/contracts/validation_helpers.rb
 - lib/pact_broker/api/contracts/verification_contract.rb
 - lib/pact_broker/api/contracts/webhook_contract.rb
+- lib/pact_broker/api/contracts/webhook_pacticipant_contract.rb
+- lib/pact_broker/api/contracts/webhook_request_contract.rb
 - lib/pact_broker/api/decorators.rb
 - lib/pact_broker/api/decorators/base_decorator.rb
 - lib/pact_broker/api/decorators/basic_pacticipant_decorator.rb
@@ -776,7 +774,6 @@ files:
 - lib/pact_broker/api/resources/webhook.rb
 - lib/pact_broker/api/resources/webhook_execution.rb
 - lib/pact_broker/api/resources/webhook_execution_methods.rb
-- lib/pact_broker/api/resources/webhook_resource_methods.rb
 - lib/pact_broker/app.rb
 - lib/pact_broker/application_context.rb
 - lib/pact_broker/badges/service.rb
@@ -926,7 +923,6 @@ files:
 - lib/pact_broker/locale/en.yml
 - lib/pact_broker/logging.rb
 - lib/pact_broker/logging/default_formatter.rb
-- lib/pact_broker/matrix/can_i_deploy_query_schema.rb
 - lib/pact_broker/matrix/deployment_status_summary.rb
 - lib/pact_broker/matrix/every_row.rb
 - lib/pact_broker/matrix/integration.rb
@@ -1087,6 +1083,7 @@ files:
 - lib/pact_broker/webhooks/webhook_execution_result.rb
 - lib/pact_broker/webhooks/webhook_request_logger.rb
 - lib/pact_broker/webhooks/webhook_request_template.rb
+- lib/pact_broker/webmachine.rb
 - lib/rack/hal_browser.rb
 - lib/rack/hal_browser/redirect.rb
 - lib/rack/pact_broker/add_pact_broker_version_header.rb
@@ -1105,6 +1102,7 @@ files:
 - lib/rack/pact_broker/use_when.rb
 - lib/semantic_logger/formatters/short.rb
 - lib/sequel/extensions/statement_timeout.rb
+- lib/sequel/plugins/age.rb
 - lib/sequel/plugins/insert_ignore.rb
 - lib/sequel/plugins/upsert.rb
 - lib/webmachine/application_monkey_patch.rb
@@ -1239,7 +1237,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.4.12
 signing_key:
 specification_version: 4
 summary: See description

data/lib/pact/doc/README.md

@@ -1,5 +0,0 @@
-# Pact::Doc
-
-The code in pact/doc has been copied from the pact gem to break the runtime dependency between the pact_broker and the pact gem, which requires the pact_mock-service, which requires webrick.
-
-This was required as there is a vulnerability in webrick <= 1.3.1 that we don't want to include in the pact_broker gem, but webrick > 1.3.1 requires ruby 2.3.0, but we need ruby 2.2 for Travelling Ruby, which we use to package the Ruby codebase so it can be shared with implementations in other langauges.

data/lib/pact_broker/api/contracts/dry_validation_predicates.rb

@@ -1,36 +0,0 @@
-require "dry-validation"
-
-module PactBroker
-  module Api
-    module Contracts
-      module DryValidationPredicates
-        include Dry::Logic::Predicates
-
-        predicate(:date?) do |value|
-          DateTime.parse(value) rescue false
-        end
-
-        predicate(:base64?) do |value|
-          Base64.strict_decode64(value) rescue false
-        end
-
-        predicate(:not_blank?) do | value |
-          value && value.is_a?(String) && value.strip.size > 0
-        end
-
-        predicate(:single_line?) do | value |
-          value && value.is_a?(String) && !value.include?("\n")
-        end
-
-        predicate(:no_spaces?) do | value |
-          value && value.is_a?(String) && !value.include?(" ")
-        end
-
-        predicate(:environment_with_name_exists?) do | value |
-          require "pact_broker/deployments/environment_service"
-          !!PactBroker::Deployments::EnvironmentService.find_by_name(value)
-        end
-      end
-    end
-  end
-end

data/lib/pact_broker/api/contracts/dry_validation_workarounds.rb

@@ -1,39 +0,0 @@
-module PactBroker
-  module Api
-    module Contracts
-      module DryValidationWorkarounds
-        extend self
-
-        # I just cannot seem to get the validation to stop on the first error.
-        # If one rule fails, they all come back failed, and it's driving me nuts.
-        # Why on earth would I want that behaviour?
-        def select_first_message(messages)
-          messages.each_with_object({}) do | (key, value), new_messages |
-            new_messages[key] = [value.first]
-          end
-        end
-
-        def flatten_array_of_hashes(array_of_hashes)
-          array_of_hashes.collect do | index, hash_or_array |
-            array = hash_or_array.is_a?(Hash) ?  hash_or_array.values.flatten : hash_or_array
-            array.collect { | text | "#{text} at index #{index}"}
-          end.flatten
-        end
-
-        def flatten_indexed_messages(messages)
-          if messages.values.any?{ | value | is_indexed_structure?(value) }
-            messages.each_with_object({}) do | (key, value), new_messages |
-              new_messages[key] = is_indexed_structure?(value) ? flatten_array_of_hashes(value) : value
-            end
-          else
-            messages
-          end
-        end
-
-        def is_indexed_structure?(thing)
-          thing.is_a?(Hash) && thing.keys.first.is_a?(Integer)
-        end
-      end
-    end
-  end
-end

data/lib/pact_broker/api/contracts/pacticipant_name_contract.rb

@@ -1,24 +0,0 @@
-require "pact_broker/api/contracts/base_contract"
-
-module PactBroker
-  module Api
-    module Contracts
-      class PacticipantNameContract < BaseContract
-        property :name
-        property :name_in_pact
-        property :pacticipant
-        property :message_args
-
-        include PactBroker::Messages
-
-        def blank? string
-          string && string.strip.empty?
-        end
-
-        def empty? string
-          string.nil? || blank?(string)
-        end
-      end
-    end
-  end
-end

data/lib/pact_broker/api/contracts/pacticipant_name_validation.rb

@@ -1,30 +0,0 @@
-module PactBroker
-  module Api
-    module Contracts
-      module PacticipantNameValidation
-
-        include PactBroker::Messages
-
-        def name_in_pact_present
-          unless name_in_pact
-            errors.add(:'name', validation_message("pact_missing_pacticipant_name", pacticipant: pacticipant))
-          end
-        end
-
-        def name_not_blank
-          if blank? name
-            errors.add(:'name', validation_message("blank"))
-          end
-        end
-
-        def blank? string
-          string && string.strip.empty?
-        end
-
-        def empty? string
-          string.nil? || blank?(string)
-        end
-      end
-    end
-  end
-end