pact_broker 2.112.0 → 2.113.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7da30c01ac5c3b656df24282a63fe7d18e42d83ed7ffdda14d3919481497f39
-  data.tar.gz: 71c525bd8ac9ed56c8d15f3f2d6c274a32c925be65e75f889d351033d759c400
+  metadata.gz: aae45f50ce42ed60ea96c782c5cea44a8c3398d28aabdb705e0941e87690f59f
+  data.tar.gz: a27c8cbf72dd52c2d75a7c06319029c115d4b6c284033fa5487b4e6eefe6f565
 SHA512:
-  metadata.gz: 95f5eed3bcda08ad27274d0bf858ea78319455ca45f783b0cd21a3709ee1ac3a1956325713466b8f1438cda86f83f51a35cccb875c81f864d2f53b054f7c0807
-  data.tar.gz: e51971781ce0679309cd60a8bb0eb281b2fc9a01872db91a4cd6f3f00b575805e7b5244d2b0f4d68a699140799e8cf50fca9940ddd72c77b207ca749de468fda
+  metadata.gz: 76ad626f57a946907f476c41a17ededfdcb27352a85196e640bbe228a49300f3a6efbc74b32576a3d76b778544c2ee8c2f3255182be90985db4a0683bc06fa34
+  data.tar.gz: 21aa4ec4d72413459dc670f896e5a5c2d9dfd7b3ac6635685fce9d91b1d8ee0e41d73ed4a0e46ae75a8a88eb9069267b762f110d5cb5fcd9b7c2c8aa6519b20a

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+<a name="v2.113.1"></a>
+### v2.113.1 (2025-02-20)
+
+#### Bug Fixes
+
+* Update openapi_first and use it's coverage thing (#783)	 ([b3da850b](/../../commit/b3da850b))
+* incorrect ProviderStates policy name. (#782)	 ([bddfd2d0](/../../commit/bddfd2d0))
+
+<a name="v2.113.0"></a>
+### v2.113.0 (2025-02-13)
+
+#### Features
+
+* aggregated provider state endpoint (#734)	 ([108d11a7](/../../commit/108d11a7))
+* add more logging to data migrations	 ([9482d44d](/../../commit/9482d44d))
+
+#### Bug Fixes
+
+* make sure last_action_date always returns a DateTime object	 ([d60c264e](/../../commit/d60c264e))
+
 <a name="v2.112.0"></a>
 ### v2.112.0 (2024-09-09)
 

data/Gemfile

@@ -3,15 +3,17 @@ source "https://rubygems.org"
 gemspec
 
 
-gem "rake", "~>12.3.3"
+gem "rake", "~>13.0"
 gem "sqlite3", ">=2.0.0"
 gem "conventional-changelog", "~>1.3"
 gem "bump", "~> 0.5"
+gem "padrino-core", ">= 0.16.0.pre3", require: false
+gem "rackup", "~> 2.2"
 
 group :development do
   gem "pry-byebug"
-  gem "rubocop", "~>1.1"
-  gem "rubocop-performance", "~> 1.11"
+  gem "rubocop", "~>1.7"
+  gem "rubocop-performance", "~> 1.23"
   gem "sequel-annotate", "~>1.3"
   gem "yard", "~> 0.9"
 end
@@ -21,18 +23,17 @@ group :test do
   gem "pact", "~>1.14"
   gem "rspec-pact-matchers", "~>0.1"
   gem "bundler-audit", "~>0.4"
-  gem "fakefs", "~>0.4"
   gem "webmock", "~>3.9"
   gem "rspec", "~>3.0"
   gem "rspec-its", "~>1.2"
   gem "database_cleaner", "~>1.8", ">= 1.8.1"
   gem "timecop", "~> 0.9"
   gem "faraday", "~>2.0"
-  gem "docker-api", "~>1.34"
+  gem "docker-api", "~>2.0"
   gem "approvals", ">=0.0.24", "<1.0.0"
   gem "tzinfo", "~>2.0"
   gem "faraday-retry", "~>2.0"
-  gem "openapi_first", "~>0.20"
+  gem "openapi_first", ">= 2.3", "< 3"
 end
 
 group :pg, optional: true do

data/docs/developer/business_domain_models.md

@@ -0,0 +1,9 @@
+# Business Domain Models
+
+Sorry this is so scarce. I'm in a hurry, and this is better than nothing.
+
+![Pact Publication](./images/domain-model-of-pact-publication.png)
+
+![Pact Publication with verification](./images/domain-model-of-pact-publication-with-verification.png)
+
+![Technically more correct but harder to understand diagram](./images/domain-model-of-pact-publication-with-verification-technically-more-correct-but-harder-to-understand.png)

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

@@ -0,0 +1,19 @@
+require "pact_broker/api/decorators/base_decorator"
+
+module PactBroker
+  module Api
+    module Decorators
+      class ProviderStateDecorator < BaseDecorator
+        camelize_property_names
+
+        property :name
+        property :params
+
+      end
+
+      class ProviderStatesDecorator < BaseDecorator
+        collection :providerStates, getter: -> (context) { context[:represented].sort_by(&:name) }, :extend => PactBroker::Api::Decorators::ProviderStateDecorator
+      end
+    end
+  end
+end

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

@@ -0,0 +1,38 @@
+require "pact_broker/api/resources/base_resource"
+require "pact_broker/api/decorators/provider_states_decorator"
+
+module PactBroker
+  module Api
+    module Resources
+      class ProviderStates < BaseResource
+        def content_types_provided
+          [["application/hal+json", :to_json]]
+        end
+
+        def allowed_methods
+          ["GET", "OPTIONS"]
+        end
+
+        def resource_exists?
+          !!provider
+        end
+
+        def to_json
+          decorator_class(:provider_states_decorator).new(provider_states).to_json(decorator_options)
+        end
+
+        def policy_name
+          :'pacts::pact'
+        end
+
+        private
+
+        # attr_reader :provider_states
+
+        def provider_states
+          @provider_states ||= provider_state_service.list_provider_states(provider)
+        end
+      end
+    end
+  end
+end

data/lib/pact_broker/api.rb

@@ -44,6 +44,11 @@ module PactBroker
         add ["pacts", "provider", :provider_name, "consumer", :consumer_name, "version", :consumer_version_number, "diff", "version", :comparison_consumer_version], Api::Resources::PactContentDiff, {resource_name: "pact_version_diff_by_consumer_version"}
         add ["pacts", "provider", :provider_name, "consumer", :consumer_name, "pact-version", :pact_version_sha, "diff", "pact-version", :comparison_pact_version_sha], Api::Resources::PactContentDiff, {resource_name: "pact_version_diff_by_pact_version_sha"}
 
+        # Provider states
+
+        add ["pacts", "provider", :provider_name, "provider-states"], Api::Resources::ProviderStates, { resource_name: "provider_states" }
+
+
         # Verifications
         add ["pacts", "provider", :provider_name, "consumer", :consumer_name, "pact-version", :pact_version_sha, "verification-results"], Api::Resources::Verifications, {resource_name: "verification_results"}
         add ["pacts", "provider", :provider_name, "consumer", :consumer_name, "pact-version", :pact_version_sha, "metadata", :metadata, "verification-results"], Api::Resources::Verifications, {resource_name: "verification_results"}

data/lib/pact_broker/db/data_migrations/set_interactions_counts.rb

@@ -4,6 +4,8 @@ module PactBroker
   module DB
     module DataMigrations
       class SetInteractionsCounts
+        # This was never included in PactBroker::DB::MigrateData::MIGRATIONS
+
         def self.call(connection)
           self_join = {
             Sequel[:pact_publications][:consumer_id] => Sequel[:pp2][:consumer_id],

data/lib/pact_broker/db/migrate_data.rb

@@ -13,23 +13,35 @@ end
 module PactBroker
   module DB
     class MigrateData
+      include PactBroker::Logging
+
+      MIGRATIONS = [
+          DataMigrations::SetPacticipantIdsForVerifications,
+          DataMigrations::SetConsumerIdsForPactPublications,
+          DataMigrations::SetLatestVersionSequenceValue,
+          DataMigrations::SetWebhooksEnabled,
+          DataMigrations::DeleteDeprecatedWebhookExecutions,
+          DataMigrations::SetCreatedAtForLatestPactPublications,
+          DataMigrations::SetCreatedAtForLatestVerifications,
+          DataMigrations::SetExtraColumnsForTags,
+          DataMigrations::SetPacticipantDisplayName,
+          DataMigrations::SetWebhookUuid,
+          DataMigrations::SetConsumerVersionOrderForPactPublications,
+          DataMigrations::CreateBranches,
+          DataMigrations::MigrateIntegrations,
+          DataMigrations::MigratePactVersionProviderTagSuccessfulVerifications,
+          DataMigrations::SetContractDataUpdatedAtForIntegrations
+      ].freeze
+
+      def self.registered_migrations
+        MIGRATIONS
+      end
+
       def self.call database_connection, _options = {}
-        DataMigrations::SetPacticipantIdsForVerifications.call(database_connection)
-        DataMigrations::SetConsumerIdsForPactPublications.call(database_connection)
-        DataMigrations::SetLatestVersionSequenceValue.call(database_connection)
-        DataMigrations::SetWebhooksEnabled.call(database_connection)
-        DataMigrations::DeleteDeprecatedWebhookExecutions.call(database_connection)
-        DataMigrations::SetCreatedAtForLatestPactPublications.call(database_connection)
-        DataMigrations::SetCreatedAtForLatestVerifications.call(database_connection)
-        DataMigrations::SetExtraColumnsForTags.call(database_connection)
-        DataMigrations::SetPacticipantDisplayName.call(database_connection)
-        DataMigrations::SetWebhookUuid.call(database_connection)
-        DataMigrations::SetConsumerVersionOrderForPactPublications.call(database_connection)
-        DataMigrations::SetExtraColumnsForTags.call(database_connection)
-        DataMigrations::CreateBranches.call(database_connection)
-        DataMigrations::MigrateIntegrations.call(database_connection)
-        DataMigrations::MigratePactVersionProviderTagSuccessfulVerifications.call(database_connection)
-        DataMigrations::SetContractDataUpdatedAtForIntegrations.call(database_connection)
+        registered_migrations.each do | migration |
+          logger.debug "Running data migration #{migration.to_s.split("::").last.gsub(/([a-z\d])([A-Z])/, '\1 \2').split.join("-")}"
+          migration.call(database_connection)
+        end
       end
     end
   end

data/lib/pact_broker/diagnostic/app.rb

@@ -1,6 +1,6 @@
 require "pact_broker/diagnostic/resources/heartbeat"
 require "pact_broker/diagnostic/resources/dependencies"
-require "webmachine/adapters/rack_mapped"
+require "webmachine/adapters/rack3_adapter"
 
 module PactBroker
   module Diagnostic
@@ -27,7 +27,7 @@ module PactBroker
         end
 
         app.configure do |config|
-          config.adapter = :RackMapped
+          config.adapter = :Rack3Mapped
         end
 
         app.adapter

data/lib/pact_broker/doc/views/pact/provider-states.markdown

@@ -0,0 +1,28 @@
+# Provider States - Aggregated view by provider
+
+Allowed methods: `GET`
+
+Path: `/pacts/provider/{provider}/provider-states`
+
+This resource returns a aggregated de-duplicated list of all provider states for a given provider.
+
+Provider states are collected from the latest pact on the main branch for any dependant consumers.
+
+Example response
+
+```json
+{
+    "providerStates": [
+        {
+            "name": "an error occurs retrieving an alligator"
+        },
+        {
+            "name": "there is an alligator named Mary"
+        },
+        {
+            "name": "there is not an alligator named Mary"
+        }
+    ]
+}
+```
+

data/lib/pact_broker/matrix/matrix_row_instance_methods.rb

@@ -129,7 +129,13 @@ module PactBroker
       end
 
       def last_action_date
-        return_or_raise_if_not_set(:last_action_date)
+        date = return_or_raise_if_not_set(:last_action_date)
+
+        if date.class == String
+          DateTime.parse(date)
+        else
+          date
+        end
       end
 
       def has_verification?

data/lib/pact_broker/pacticipants/repository.rb

@@ -37,7 +37,10 @@ module PactBroker
       end
 
       def find(options = {}, pagination_options = {}, eager_load_associations = [])
-        query = scope_for(PactBroker::Domain::Pacticipant).select_all_qualified
+        query = scope_for(PactBroker::Domain::Pacticipant)
+        return [] if query.empty?
+
+        query = query.select_all_qualified
         query = query.filter(:name, options[:query_string]) if options[:query_string]
         query = query.label(options[:label_name]) if options[:label_name]
         query.order_ignore_case(Sequel[:pacticipants][:name]).eager(*eager_load_associations).all_with_pagination_options(pagination_options)

data/lib/pact_broker/pacts/content.rb

@@ -5,7 +5,10 @@ require "pact_broker/hash_refinements"
 
 module PactBroker
   module Pacts
+    ProviderState = Struct.new(:name, :params)
     class Content
+
+
       include GenerateInteractionSha
       using PactBroker::HashRefinements
 
@@ -33,9 +36,21 @@ module PactBroker
         Content.from_hash(SortContent.call(pact_hash))
       end
 
+      def provider_states
+        messages_and_or_interactions_or_empty_array.flat_map do | interaction |
+          if interaction["providerState"].is_a?(String)
+            [ProviderState.new(interaction["providerState"])]
+          elsif interaction["providerStates"].is_a?(Array)
+            interaction["providerStates"].collect do | provider_state |
+              ProviderState.new(provider_state["name"], provider_state["params"])
+            end
+          end
+        end.compact
+      end
+
       def interactions_missing_test_results
-        return [] unless messages_or_interactions
-        messages_or_interactions.reject do | interaction |
+        return [] unless messages_and_or_interactions
+        messages_and_or_interactions.reject do | interaction |
           interaction["tests"]&.any?
         end
       end
@@ -90,7 +105,7 @@ module PactBroker
       end
 
       def interaction_ids
-        messages_or_interaction_or_empty_array.collect do | interaction |
+        messages_and_or_interactions_or_empty_array.collect do | interaction |
           interaction["_id"]
         end.compact
       end
@@ -116,12 +131,14 @@ module PactBroker
         pact_hash.is_a?(Hash) && pact_hash["interactions"].is_a?(Array) ? pact_hash["interactions"] : nil
       end
 
-      def messages_or_interactions
-        messages || interactions
+      def messages_and_or_interactions
+        if messages || interactions
+          (messages || []) + (interactions || [])
+        end
       end
 
-      def messages_or_interaction_or_empty_array
-        messages_or_interactions || []
+      def messages_and_or_interactions_or_empty_array
+        messages_and_or_interactions || []
       end
 
       def pact_specification_version

data/lib/pact_broker/pacts/provider_state_service.rb

@@ -0,0 +1,22 @@
+require "pact_broker/services"
+require "pact_broker/pacts/selectors"
+require "pact_broker/pacts/pact_publication"
+require "pact_broker/repositories"
+
+
+module PactBroker
+  module Pacts
+    class ProviderStateService
+      # extend self
+      extend PactBroker::Services
+      extend PactBroker::Repositories::Scopes
+
+      def self.list_provider_states(provider)
+        query = scope_for(PactPublication).eager_for_domain_with_content.for_provider_and_consumer_version_selector(provider, PactBroker::Pacts::Selector.latest_for_main_branch)
+        query.all.flat_map do | pact_publication |
+          pact_publication.to_domain.content_object.provider_states
+        end
+      end
+    end
+  end
+end

data/lib/pact_broker/pacts/selector.rb

@@ -155,6 +155,10 @@ module PactBroker
         new(latest: true, branch: branch)
       end
 
+      def self.latest_for_main_branch
+        new(latest: true, main_branch: true)
+      end
+
       def self.latest_for_tag_with_fallback(tag, fallback_tag)
         new(latest: true, tag: tag, fallback_tag: fallback_tag)
       end

data/lib/pact_broker/pacts/selectors.rb

@@ -27,6 +27,10 @@ module PactBroker
         Selectors.new([Selector.latest_for_branch(branch)])
       end
 
+      def self.create_for_latest_from_main_branch
+        Selectors.new([Selector.latest_for_main_branch])
+      end
+
       def self.create_for_overall_latest
         Selectors.new([Selector.overall_latest])
       end

data/lib/pact_broker/services.rb

@@ -93,6 +93,10 @@ module PactBroker
       get_service(:branch_service)
     end
 
+    def provider_state_service
+      get_service(:provider_state_service)
+    end
+
     # rubocop: disable Metrics/MethodLength
     def register_default_services
       register_service(:index_service) do
@@ -194,6 +198,11 @@ module PactBroker
         require "pact_broker/versions/branch_service"
         PactBroker::Versions::BranchService
       end
+
+      register_service(:provider_state_service) do
+        require "pact_broker/pacts/provider_state_service"
+        PactBroker::Pacts::ProviderStateService
+      end
     end
     # rubocop: enable Metrics/MethodLength
   end

data/lib/pact_broker/ui/controllers/base_controller.rb

@@ -1,3 +1,4 @@
+require "rackup"
 require "padrino-core"
 require "haml"
 require "pact_broker/services"

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = "2.112.0"
+  VERSION = "2.113.1"
 end

data/lib/pact_broker/webhooks/webhook_request_template.rb

@@ -24,7 +24,8 @@ module PactBroker
         attributes.each do | (name, value) |
           instance_variable_set("@#{name}", value) if respond_to?(name)
         end
-        @headers = Rack::Utils::HeaderHash.new(attributes[:headers] || {})
+        @headers = Rack::Headers.new
+        @headers.merge!(attributes[:headers]) if attributes[:headers]
       end
 
       def build(template_params, user_agent: nil, disable_ssl_verification: false, cert_store: nil)
@@ -59,7 +60,7 @@ module PactBroker
       end
 
       def headers= headers
-        @headers = Rack::Utils::HeaderHash.new(headers)
+        @headers.replace(headers)
       end
 
       def uses_parameter?(parameter_name)
@@ -114,7 +115,7 @@ module PactBroker
       end
 
       def build_headers(template_params)
-        headers.each_with_object(Rack::Utils::HeaderHash.new) do | (key, value), new_headers |
+        headers.each_with_object(Rack::Headers.new) do | (key, value), new_headers |
           new_headers[key] = build_string(value, template_params)
         end
       end

data/lib/pact_broker/webmachine.rb

@@ -1,10 +1,9 @@
 require "webmachine"
 require "webmachine/application_monkey_patch"
-require "webmachine/adapters/rack_mapped"
+require "webmachine/adapters/rack3_adapter"
 require "webmachine/application_monkey_patch"
 require "webmachine/render_error_monkey_patch"
 
-
 module Webmachine
   def self.build_rack_api(application_context)
     api = Webmachine::Application.new do |app|
@@ -14,7 +13,7 @@ module Webmachine
     api.application_context = application_context
 
     api.configure do |config|
-      config.adapter = :RackMapped
+      config.adapter = :Rack3Mapped
     end
 
     api.adapter

data/lib/sequel/extensions/pg_advisory_lock.rb

@@ -3,6 +3,7 @@
 # locks to be registered because different threads running the same code
 # should not cause a Sequel::Error to be raised.
 # Also, I wanted it to use Concurrent::Hash for multi-threaded environments.
+# Made minor change in begin ensure block in with_advisory_lock method.
 
 require "sequel"
 require "zlib"
@@ -57,10 +58,9 @@ module Sequel
           synchronize do
             if get(Sequel.function(lock_function, *function_params))
               begin
-                result = yield
+                yield
               ensure
                 get(Sequel.function(UNLOCK_FUNCTION, *function_params))
-                result
               end
             end
           end

data/lib/webmachine/adapters/rack3_adapter.rb

@@ -0,0 +1,178 @@
+# Taken from https://github.com/webmachine/webmachine-ruby/blob/master/lib/webmachine/adapters/rack.rb
+
+require "webmachine/adapter"
+require "rack"
+require "webmachine/constants"
+require "webmachine/headers"
+require "webmachine/request"
+require "webmachine/response"
+require "webmachine/version"
+require "webmachine/chunked_body"
+
+module Webmachine
+  module Adapters
+    class Rack3 < Adapter
+      # Used to override default Rack server options (useful in testing)
+      DEFAULT_OPTIONS = {}
+
+      REQUEST_URI = "REQUEST_URI".freeze
+      RACK_VERSION = ::Rack::RELEASE.match(/^(\d+\.\d+)/)[1]
+      VERSION_STRING = "#{Webmachine::SERVER_STRING} Rack/#{RACK_VERSION}".freeze
+      NEWLINE = "\n".freeze
+
+      # Start the Rack adapter
+      def run
+        options = DEFAULT_OPTIONS.merge({
+                                          app: self,
+                                          Port: application.configuration.port,
+                                          Host: application.configuration.ip
+                                        }).merge(application.configuration.adapter_options)
+
+        @server = ::Rack::Server.new(options)
+        @server.start
+      end
+
+      # Handles a Rack-based request.
+      # @param [Hash] env the Rack environment
+      def call(env)
+        headers = Webmachine::Headers.from_cgi(env)
+
+        rack_req = ::Rack::Request.new env
+        request = build_webmachine_request(rack_req, headers)
+
+        response = Webmachine::Response.new
+        application.dispatcher.dispatch(request, response)
+
+        response.headers[SERVER] = VERSION_STRING
+
+        rack_body =
+        case response.body
+          when String # Strings are enumerable in ruby 1.8
+            [response.body]
+          else
+            if (io_body = IO.try_convert(response.body))
+              io_body
+            elsif response.body.respond_to?(:call)
+              response.body
+            elsif response.body.respond_to?(:each)
+              response.body
+            else
+              [response.body.to_s]
+            end
+        end
+
+        rack_res = ::Rack::Response.new(rack_body, response.code, response.headers)
+        rack_res.finish
+      end
+
+      protected
+
+      def routing_tokens(_rack_req)
+        nil # no-op for default, un-mapped rack adapter
+      end
+
+      def base_uri(_rack_req)
+        nil # no-op for default, un-mapped rack adapter
+      end
+
+      private
+
+      def build_webmachine_request(rack_req, headers)
+        RackRequest.new(rack_req.request_method,
+                        rack_req.url,
+                        headers,
+                        RequestBody.new(rack_req),
+                        routing_tokens(rack_req),
+                        base_uri(rack_req),
+                        rack_req.env)
+      end
+
+      class RackRequest < Webmachine::Request
+        attr_reader :env
+
+        # Yeah, Rubocop, piss off!
+        # rubocop:disable ParameterLists
+        def initialize(method, uri, headers, body, routing_tokens, base_uri, env)
+          super(method, uri, headers, body, routing_tokens, base_uri)
+          @env = env
+        end
+      end
+
+      # Wraps the Rack input so it can be treated like a String or
+      # Enumerable.
+      # @api private
+      class RequestBody
+        # @param [Rack::Request] request the Rack request
+        def initialize(request)
+          @request = request
+        end
+
+        # Rack Servers differ in the way you can access their request bodys.
+        # While some allow you to directly get a Ruby IO object others don't.
+        # You have to check the methods they expose, like #gets, #read, #each, #rewind and maybe others.
+        # See: https://github.com/rack/rack/blob/rack-1.5/lib/rack/lint.rb#L296
+        # @return [IO] the request body
+        def to_io
+          @request.body
+        end
+
+        # Converts the body to a String so you can work with the entire
+        # thing.
+        # @return [String] the request body as a string
+        def to_s
+          if @value
+            @value.join
+          elsif @request.body.respond_to?(:to_ary)
+            @request.body.to_ary.join
+          elsif @request.body.respond_to?(:read)
+            @request.body.rewind if @request.body.respond_to?(:rewind)
+            @request.body.read
+          else
+            @request.body&.to_s || ""
+          end
+        end
+
+        # Iterates over the body in chunks. If the body has previously
+        # been read, this method can be called again and get the same
+        # sequence of chunks.
+        # @yield [chunk]
+        # @yieldparam [String] chunk a chunk of the request body
+        def each
+          if @value
+            @value.each { |chunk| yield chunk }
+          elsif @request.body.respond_to?(:each)
+            @value = []
+            @request.body.each { |chunk|
+              @value << chunk
+              yield chunk
+            }
+          elsif @request.body.respond_to?(:to_ary)
+            @value = @request.body.to_ary
+            @value.each { |chunk| yield chunk }
+          else
+            yield @request.body
+          end
+        end
+      end # class RequestBody
+    end # class Rack
+
+    class Rack3Mapped < Rack3
+      protected
+
+      def routing_tokens(rack_req)
+        routing_match = rack_req.path_info.match(Webmachine::Request::ROUTING_PATH_MATCH)
+        routing_path = routing_match ? routing_match[1] : ""
+        routing_path.split(SLASH)
+      end
+
+      def base_uri(rack_req)
+        # rack SCRIPT_NAME env var doesn't end with "/". This causes weird
+        # behavour when URI.join concatenates URI components in
+        # Webmachine::Decision::Flow#n11
+        script_name = rack_req.script_name + SLASH
+        URI.join(rack_req.base_url, script_name)
+      end
+    end # class RackMapped
+
+  end # module Adapters
+end # module Webmachine

data/lib/webmachine/describe_routes.rb

@@ -1,4 +1,4 @@
-require "webmachine/adapters/rack_mapped"
+require "webmachine/adapters/rack3_adapter"
 require "pact_broker/string_refinements"
 
 # Code to describe the routes in a Webmachine API, including
@@ -44,11 +44,11 @@ module Webmachine
         }.merge(path_params)
 
         rack_req = ::Rack::Request.new({ "REQUEST_METHOD" => "GET", "rack.input" => StringIO.new("") }.merge(env) )
-        request = Webmachine::Adapters::Rack::RackRequest.new(
+        request = Webmachine::Adapters::Rack3::RackRequest.new(
           rack_req.env["REQUEST_METHOD"],
           path,
           Webmachine::Headers.from_cgi({"HTTP_HOST" => "example.org"}.merge(env)),
-          Webmachine::Adapters::Rack::RequestBody.new(rack_req),
+          Webmachine::Adapters::Rack3::RequestBody.new(rack_req),
           {},
           {},
           rack_req.env
@@ -134,7 +134,7 @@ module Webmachine
     end
 
     def self.build_request(http_method: "GET", path_info: )
-      request = Webmachine::Adapters::Rack::RackRequest.new(http_method, "/", Webmachine::Headers["host" => "example.org"], nil, {}, {}, { "REQUEST_METHOD" => http_method })
+      request = Webmachine::Adapters::Rack3::RackRequest.new(http_method, "/", Webmachine::Headers["host" => "example.org"], nil, {}, {}, { "REQUEST_METHOD" => http_method })
       request.path_info = path_info
       request
     end

data/pact_broker.gemspec

@@ -56,16 +56,13 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency "reform", "~> 2.6"
   gem.add_runtime_dependency "sequel", "~> 5.28"
   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" # TODO update to 3
+  gem.add_runtime_dependency "rack", "~> 3.1", ">= 3.1.10"
   gem.add_runtime_dependency "redcarpet", ">= 3.5.1", "~>3.5"
-  gem.add_runtime_dependency "pact-support" , "~> 1.16", ">= 1.16.4"
-  gem.add_runtime_dependency "padrino-core", ">= 0.14.3", "~> 0.14"
-  gem.add_runtime_dependency "sinatra", "~> 3.0"
+  gem.add_runtime_dependency "pact-support" , ">= 1.21.2", "~> 1.21"
   gem.add_runtime_dependency "haml", "~>5.0"
   gem.add_runtime_dependency "sucker_punch", "~>3.0"
-  gem.add_runtime_dependency "rack-protection", "~> 3.0"
+  gem.add_runtime_dependency "rack-protection", "~> 4.1"
   gem.add_runtime_dependency "table_print", "~> 1.5"
   gem.add_runtime_dependency "semantic_logger", "~> 4.11"
   gem.add_runtime_dependency "sanitize", "~> 6.0"

metadata

@@ -1,16 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 2.112.0
+  version: 2.113.1
 platform: ruby
 authors:
 - Bethany Skurrie
 - Sergei Matheson
 - Warner Godfrey
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-17 00:00:00.000000000 Z
+date: 2025-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -116,20 +115,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: webrick
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.8'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: semver2
   requirement: !ruby/object:Gem::Requirement
@@ -148,22 +133,22 @@ dependencies:
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.2.3
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '3.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.2.3
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '3.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.10
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -188,56 +173,22 @@ dependencies:
   name: pact-support
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.16'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.16.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+        version: 1.21.2
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.16.4
-- !ruby/object:Gem::Dependency
-  name: padrino-core
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.14.3
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '1.21'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.3
+        version: 1.21.2
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
-- !ruby/object:Gem::Dependency
-  name: sinatra
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1.21'
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
@@ -272,14 +223,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: table_print
   requirement: !ruby/object:Gem::Requirement
@@ -582,6 +533,7 @@ files:
 - docs/api/PACTICIPANTS.md
 - docs/api/PAGINATION.md
 - docs/api/WEBHOOKS.md
+- docs/developer/business_domain_models.md
 - docs/developer/design_pattern_for_eager_loading_collections.md
 - docs/developer/matrix.md
 - docs/developer/rack.md
@@ -672,6 +624,7 @@ files:
 - lib/pact_broker/api/decorators/pacts_for_verification_query_decorator.rb
 - lib/pact_broker/api/decorators/pagination_links.rb
 - lib/pact_broker/api/decorators/provider_pacts_decorator.rb
+- lib/pact_broker/api/decorators/provider_states_decorator.rb
 - lib/pact_broker/api/decorators/publish_contract_decorator.rb
 - lib/pact_broker/api/decorators/publish_contracts_decorator.rb
 - lib/pact_broker/api/decorators/publish_contracts_results_decorator.rb
@@ -774,6 +727,7 @@ files:
 - lib/pact_broker/api/resources/previous_distinct_pact_version.rb
 - lib/pact_broker/api/resources/provider_pacts.rb
 - lib/pact_broker/api/resources/provider_pacts_for_verification.rb
+- lib/pact_broker/api/resources/provider_states.rb
 - lib/pact_broker/api/resources/publish_contracts.rb
 - lib/pact_broker/api/resources/relationships.rb
 - lib/pact_broker/api/resources/released_version.rb
@@ -899,6 +853,7 @@ files:
 - lib/pact_broker/doc/views/pact/latest-pact-version.markdown
 - lib/pact_broker/doc/views/pact/matrix-for-consumer-version.markdown
 - lib/pact_broker/doc/views/pact/pact-webhooks.markdown
+- lib/pact_broker/doc/views/pact/provider-states.markdown
 - lib/pact_broker/doc/views/pact/publish-verification-results.markdown
 - lib/pact_broker/doc/views/pact/tag-prod-version.markdown
 - lib/pact_broker/doc/views/pact/tag-version.markdown
@@ -1000,6 +955,7 @@ files:
 - lib/pact_broker/pacts/pacts_for_verification_repository.rb
 - lib/pact_broker/pacts/parse.rb
 - lib/pact_broker/pacts/placeholder_pact.rb
+- lib/pact_broker/pacts/provider_state_service.rb
 - lib/pact_broker/pacts/repository.rb
 - lib/pact_broker/pacts/selected_pact.rb
 - lib/pact_broker/pacts/selector.rb
@@ -1137,6 +1093,7 @@ files:
 - lib/sequel/plugins/age.rb
 - lib/sequel/plugins/insert_ignore.rb
 - lib/sequel/plugins/upsert.rb
+- lib/webmachine/adapters/rack3_adapter.rb
 - lib/webmachine/application_monkey_patch.rb
 - lib/webmachine/describe_routes.rb
 - lib/webmachine/render_error_monkey_patch.rb
@@ -1254,7 +1211,6 @@ homepage: https://github.com/pact-foundation/pact_broker
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -1269,8 +1225,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.18
-signing_key:
+rubygems_version: 3.6.5
 specification_version: 4
 summary: See description
 test_files: []