pact_broker 2.113.0 → 2.113.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f58c954e3864629cd056224198acfe87df68d7a38ff2a098bf1c7e78541a8d1
-  data.tar.gz: 6f59e94416775c9beb054cd7ef0ca77e055505e99864a8cc0c0dd4c8a0bf3f9b
+  metadata.gz: aae45f50ce42ed60ea96c782c5cea44a8c3398d28aabdb705e0941e87690f59f
+  data.tar.gz: a27c8cbf72dd52c2d75a7c06319029c115d4b6c284033fa5487b4e6eefe6f565
 SHA512:
-  metadata.gz: d64bab2b42d053d80a63c797e2a3ee84f2731a8eee85368a31bb1d70a102ef38df362feb7ef9151b2890307944123e0a0ec04acb82e1c7d956f88c12d6935116
-  data.tar.gz: 8c46ee348ffad72bad86d132873e1d812c70585b570d8e63c7b71187dfd653afa1eea795f804b8fb2d2ed3fe1f7d372996ff4eb598fcc17a775cd214be5cb236
+  metadata.gz: 76ad626f57a946907f476c41a17ededfdcb27352a85196e640bbe228a49300f3a6efbc74b32576a3d76b778544c2ee8c2f3255182be90985db4a0683bc06fa34
+  data.tar.gz: 21aa4ec4d72413459dc670f896e5a5c2d9dfd7b3ac6635685fce9d91b1d8ee0e41d73ed4a0e46ae75a8a88eb9069267b762f110d5cb5fcd9b7c2c8aa6519b20a

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+<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)
 

data/Gemfile

@@ -7,8 +7,8 @@ gem "rake", "~>13.0"
 gem "sqlite3", ">=2.0.0"
 gem "conventional-changelog", "~>1.3"
 gem "bump", "~> 0.5"
-gem "padrino-core", ">= 0.14.3", "~> 0.14", require: false
-gem "sinatra", "~> 3.0", require: false
+gem "padrino-core", ">= 0.16.0.pre3", require: false
+gem "rackup", "~> 2.2"
 
 group :development do
   gem "pry-byebug"
@@ -29,11 +29,11 @@ group :test do
   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/lib/pact_broker/api/resources/provider_states.rb

@@ -22,7 +22,7 @@ module PactBroker
         end
 
         def policy_name
-          :'pacts::pacts'
+          :'pacts::pact'
         end
 
         private

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/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.113.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/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,14 +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.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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 2.113.0
+  version: 2.113.1
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -9,7 +9,7 @@ authors:
 - Warner Godfrey
 bindir: bin
 cert_chain: []
-date: 2025-02-13 00:00:00.000000000 Z
+date: 2025-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -115,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
@@ -147,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
@@ -237,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
@@ -1107,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
@@ -1238,7 +1225,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.3
+rubygems_version: 3.6.5
 specification_version: 4
 summary: See description
 test_files: []