From 9dca4d3efe0b28bfdfaa4788bd86d2674866c948 Mon Sep 17 00:00:00 2001 From: Samuel Williams Date: Mon, 26 Dec 2022 03:40:48 -0800 Subject: [PATCH 1/3] Update tests to work on latest Rubies. (#1999) * Don't update to latest rubygems. * Test on Ruby v3.2. --- .github/workflows/test.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index d36cf445d..697b3cd27 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -19,6 +19,7 @@ jobs: - '2.7' - '3.0' - '3.1' + - '3.2' - jruby - truffleruby-head include: From d26971128c30b82f7372c8c33d083716e0b2f902 Mon Sep 17 00:00:00 2001 From: Wei Zhe Date: Mon, 26 Dec 2022 19:48:01 +0800 Subject: [PATCH 2/3] Fix Regexp deprecated third argument with Regexp::NOENCODING (#1998) --- lib/rack/urlmap.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/rack/urlmap.rb b/lib/rack/urlmap.rb index afb97eea4..99c4d8236 100644 --- a/lib/rack/urlmap.rb +++ b/lib/rack/urlmap.rb @@ -37,7 +37,7 @@ def remap(map) end location = location.chomp('/') - match = Regexp.new("^#{Regexp.quote(location).gsub('/', '/+')}(.*)", nil, 'n') + match = Regexp.new("^#{Regexp.quote(location).gsub('/', '/+')}(.*)", Regexp::NOENCODING) [host, location, match, app] }.sort_by do |(host, location, _, _)| From 081ae02a1e3fbd925c1dc85d6c4d91d09ca29514 Mon Sep 17 00:00:00 2001 From: Samuel Williams Date: Tue, 27 Dec 2022 08:59:10 +1300 Subject: [PATCH 3/3] Bump patch version. --- CHANGELOG.md | 8 +++++++- lib/rack/version.rb | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e9f26dbf3..469e4104a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,13 @@ All notable changes to this project will be documented in this file. For info on how to format all future additions to this file please reference [Keep A Changelog](https://keepachangelog.com/en/1.0.0/). -## [3.0.2] -2022-12-05 +## [3.0.3] - 2022-12-27 + +### Fixed + +- `Rack::URLMap` uses non-deprecated form of `Regexp.new`. ([#1998](https://github.com/rack/rack/pull/1998), [@weizheheng](https://github.com/weizheheng)) + +## [3.0.2] - 2022-12-05 ### Fixed diff --git a/lib/rack/version.rb b/lib/rack/version.rb index 97bd47eb2..27691d821 100644 --- a/lib/rack/version.rb +++ b/lib/rack/version.rb @@ -25,7 +25,7 @@ def self.version VERSION end - RELEASE = "3.0.2" + RELEASE = "3.0.3" # Return the Rack release as a dotted string. def self.release