hanami-router 2.3.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5bc038728052f6719d7a3c7ecfbfbb02a5b5d730ab95bafdb1a8415602faa861
-  data.tar.gz: 961ad5a29c273a42526261c5305d41dc21530c16baf20ed01c106ab7c8b635ff
+  metadata.gz: c9a6b9498cdc6f09a3792b52accbe0fda997f5de907fb0e523408a0a8437465c
+  data.tar.gz: 40fc3193dcd6e471f1464852844456748f1ef8deb53ad630290e1343abdfbbbd
 SHA512:
-  metadata.gz: 723502c7e0e4dd4beba5de8a1c3e77dd8e912103f833dc709f7c8f001702a54b93128222768721b4391ce4ee3e1a7d951046bdcb67132b406d6582159394bdd6
-  data.tar.gz: 646f78f7b642bffc4ff8be39e6c7fff011ade92ee8154651d66aafe1b803de0e4901151a01a962af6832c3ace23d4f27167186cdac26de1a29cc3453f02b2ca2
+  metadata.gz: b514e367ea3eb3b3be40f89d19b5a00388365b1a39fd0dc5bc98c1f971ff2831a4fcc80c3c463079d4a61773e0375504cfd9afa198aae7d1c42d762fb2e56def
+  data.tar.gz: ef993a463b78db8deba2a6b6304aeb408961ee6ae89e92e62f8b79e52f662a6c0d7155921aee78c1ddce67055fa218294b09afefb19674d27aa1edb32622c0e8

data/CHANGELOG.md

@@ -1,6 +1,47 @@
 # Hanami::Router
 
-Rack compatible HTTP router for Ruby
+Rack compatible HTTP router for Ruby.
+
+## [Unreleased]
+
+### Added
+
+### Changed
+
+### Deprecated
+
+### Removed
+
+### Fixed
+
+### Security
+
+[Unreleased]: http://github.com/hanami/hanami-router/compare/v2.3.1...main
+
+## [2.3.1] - 2025-12-17
+
+### Changed
+
+- Require Rack version 2.2.16 or higher, which is the earliest version of Rack 2.x that will run on Ruby 4.0 as well as our currently supported Ruby versions (3.2, 3.3, 3.4). (@cllns in 2b15582)
+
+### Fixed
+
+- Set correct Rack `"SCRIPT_NAME"` value for mounts under dynamic prefixes. (@timriley in #294).
+
+    For example, given a mount under `scope '/stations/:station_id'`, the "SCRIPT_NAME" will be e.g. `"/stations/42"` rather than `"/stations/:station_id"`.
+- For a mount with a prefix, allow the Rack `"PATH_INFO"` value to remain an empty string when a request is made for that exact prefix only. (@timriley in #295)
+
+    Given the following:
+    
+    ```ruby
+    mount ->(env) { [200, {}, [env["PATH_INFO"]] }, at: "/settings"
+    ```
+    
+    When a request is made to `"/settings"`, the `"SCRIPT_NAME"` will be `"/settings"` and `"PATH_INFO"` will be `""`. This ensures that the Rack environment can be used to reconstruct the same path as used for the original request.
+    
+    To ensure a mounted router instance can still route to its root, treat `""` the same as `"/"` for the purposes of matching routes.
+
+[2.3.1]: http://github.com/hanami/hanami-router/compare/v2.3.0...v2.3.1
 
 ## v2.3.0 - 2025-11-12
 

data/hanami-router.gemspec

@@ -20,15 +20,15 @@ Gem::Specification.new do |spec|
   spec.metadata["rubygems_mfa_required"] = "true"
   spec.required_ruby_version = ">= 3.2"
 
-  spec.add_dependency "rack",               ">= 2.0"
+  spec.add_dependency "rack",               ">= 2.2.16"
   spec.add_dependency "mustermann",         "~> 3.0"
   spec.add_dependency "mustermann-contrib", "~> 3.0"
   spec.add_dependency "csv",                "~> 3.3"
 
-  spec.add_development_dependency "bundler",   ">= 1.6", "< 3"
   spec.add_development_dependency "rake",      "~> 13"
   spec.add_development_dependency "rack-test", "~> 2.0"
   spec.add_development_dependency "rspec",     "~> 3.8"
+  spec.add_development_dependency "ostruct" # Remove once we drop support for Rack 2
 
   spec.add_development_dependency "rubocop", "~> 1.0"
   spec.add_development_dependency "rubocop-performance", "~> 1.0"

data/lib/hanami/router/mounted_path.rb

@@ -14,9 +14,12 @@ module Hanami
         if @prefix.to_s == "/"
           env[::Rack::SCRIPT_NAME] = EMPTY_STRING
         else
-          env[::Rack::SCRIPT_NAME] = env[::Rack::SCRIPT_NAME].to_s + @prefix.to_s
-          env[::Rack::PATH_INFO] = env[::Rack::PATH_INFO].sub(@prefix.to_s, EMPTY_STRING)
-          env[::Rack::PATH_INFO] = DEFAULT_PREFIX if env[::Rack::PATH_INFO] == EMPTY_STRING
+          # To set SCRIPT_NAME, use the actual matched portion of the path, not the prefix string
+          # itself. This is important for prefixes with dynamic segments like "/stations/:id". In
+          # this case, we want e.g. "/stations/42" as SCRIPT_NAME, not "/stations/:id".
+          matched_path = match.to_s
+          env[::Rack::SCRIPT_NAME] = env[::Rack::SCRIPT_NAME].to_s + matched_path
+          env[::Rack::PATH_INFO] = env[::Rack::PATH_INFO].sub(matched_path, EMPTY_STRING)
         end
 
         [@app, match.named_captures]

data/lib/hanami/router/version.rb

@@ -8,6 +8,6 @@ module Hanami
     #
     # @since 0.1.0
     # @api public
-    VERSION = "2.3.0"
+    VERSION = "2.3.1"
   end
 end

data/lib/hanami/router.rb

@@ -642,7 +642,12 @@ module Hanami
     # @since 2.0.0
     # @api private
     def fixed(env)
-      @fixed.dig(env[::Rack::REQUEST_METHOD], env[::Rack::PATH_INFO])
+      path_info = env[::Rack::PATH_INFO]
+      # Treat empty PATH_INFO as "/" for route matching. This allows root routes (defined as "/") to
+      # match the empty PATH_INFO that is set for requests to a mount without a trailing slash.
+      path_info = DEFAULT_PREFIX if path_info == EMPTY_STRING
+
+      @fixed.dig(env[::Rack::REQUEST_METHOD], path_info)
     end
 
     # @since 2.0.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hanami-router
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Hanakai team
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.2.16
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.2.16
 - !ruby/object:Gem::Dependency
   name: mustermann
   requirement: !ruby/object:Gem::Requirement
@@ -65,26 +65,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.3'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.6'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.6'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -127,6 +107,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.8'
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement