hanami-router 2.2.0 → 2.3.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5bba2b56b3f4ddbedc47b2d21189f7e88ce172505dabbdca6c6d6266aa6c7fa2
-  data.tar.gz: d601d610fb2cacbef79ca4770ab1e63869a5469ac46671c823e106086c0e58d0
+  metadata.gz: 5c9e51f6dddcf337224f949ca5f28c79b82702f6743a9aef5fbecdfebd5efcb9
+  data.tar.gz: 3d02dfc438dac3cd1f07a62934c0c81059db209123a1a0f7a639c30885013a63
 SHA512:
-  metadata.gz: 88b44cc6c09c227aaf45352a49344a48530c4095fa1ac2f53ed0bf38e7901876805121c1090d24759420c8ad0029fbc9aba43d383adb93635161ce3cfb8fe321
-  data.tar.gz: 319831eb561257e58afbc2479447e92862b452424a44c1efffc8f534d4bfc40f2549e70d0849ef4e303182f7d8ec620ad8a6d55a25f9e3994a20215c3dd89bf8
+  metadata.gz: 27585ee48b5a0070bf60044676b7c6473093b139c6d92a34bc204df51e87acb643933e9cc92a38ace8ad31da701f58db480dad0da288bf21270376613e192a1f
+  data.tar.gz: 6e170d49fd689cad6fe447cf8bb1e93c76e50254751a108c85bf8b0c07c269673aa617f99a87197a1d7d89b169297ca6b752bea994c118663613b431535ba601

data/CHANGELOG.md

@@ -2,6 +2,21 @@
 
 Rack compatible HTTP router for Ruby
 
+## v2.3.0.beta2 - 2025-10-17
+
+### Changed
+
+- [Kyle Plump] Improve runtime performance by building mustermann matchers when routes are first built. This corrects a performance regression introduced with the fixes in v2.2.0. (#279)
+- Drop support for Ruby 3.1
+
+## v2.3.0.beta1 - 2025-10-03
+
+### Changed
+
+- [Kyle Plump, Tim Riley] Support Rack 3 in addition to Rack 2 (#277)
+- [Sven Schwyn] Convert -, +, ~, and . to underscore in URL helper names (#280)
+- [inouire] Allow redirects to absolute URLs: `redirect "/redirect", to: "https://hanamirb.org/"` (#282)
+
 ## v2.2.0 - 2024-11-05
 
 ### Changed

data/README.md

@@ -157,6 +157,8 @@ end
 Hanami::Router.new do
   get "/redirect_destination", to: ->(env) { [200, {}, ["Redirect destination!"]] }
   redirect "/legacy",          to: "/redirect_destination"
+  redirect "/learn-more",      to: "https://hanamirb.org/"
+  redirect "/chat",            to: URI("xmpp://myapp.net/")
 end
 ```
 
@@ -349,12 +351,17 @@ __Hanami::Router__ uses [Semantic Versioning 2.0.0](http://semver.org)
 
 ## Contributing
 
-1. Fork it
+1. Fork this repo to your account and clone it locally (`git clone git@github.com:your-pseudo/your-cloned-repo.git`)
 2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+3. Install the dependencies (`bundle install`)
+4. Run tests, they should all pass (`./script/ci`)
+5. Make your changes & check that the tests still pass. Add some test cases if needed.
+6. Commit your changes (`git commit -am 'Add some feature'`)
+7. Push to the branch (`git push origin my-new-feature`)
+8. Create new Pull Request on Github with some context on what you're trying to fix or to improve with this contribution
+
+Thank you for contributing! 
 
 ## Copyright
 
-Copyright © 2014–2024 Hanami Team – Released under MIT License
+Copyright © 2014–2025 Hanami Team – Released under MIT License

data/hanami-router.gemspec

@@ -18,15 +18,16 @@ Gem::Specification.new do |spec|
   spec.executables   = []
   spec.require_paths = ["lib"]
   spec.metadata["rubygems_mfa_required"] = "true"
-  spec.required_ruby_version = ">= 3.1"
+  spec.required_ruby_version = ">= 3.2"
 
-  spec.add_dependency "rack",               "~> 2.0"
+  spec.add_dependency "rack",               ">= 2.0"
   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", "~> 1.0"
+  spec.add_development_dependency "rack-test", "~> 2.0"
   spec.add_development_dependency "rspec",     "~> 3.8"
 
   spec.add_development_dependency "rubocop", "~> 1.0"

data/lib/hanami/middleware/body_parser/class_interface.rb

@@ -100,11 +100,13 @@ module Hanami
 
           begin
             require "hanami/middleware/body_parser/#{parser_name}_parser"
-          rescue LoadError; end
+          rescue LoadError
+          end
 
           begin
             parser = load_parser!("#{classify(parser_name)}Parser")
-          rescue NameError; end
+          rescue NameError
+          end
 
           parser
         ensure

data/lib/hanami/middleware/body_parser/form_parser.rb

@@ -30,6 +30,8 @@ module Hanami
         # @since 2.0.1
         # @api private
         def parse(*, env)
+          # Rewind to ensure successful parsing (required for Rack 3's `.parse_multipart`).
+          env[::Rack::RACK_INPUT].rewind if env[::Rack::RACK_INPUT].respond_to?(:rewind)
           ::Rack::Multipart.parse_multipart(env)
         rescue StandardError => exception
           raise BodyParsingError.new(exception.message)

data/lib/hanami/middleware/body_parser.rb

@@ -39,10 +39,11 @@ module Hanami
       end
 
       def call(env)
-        body = env[RACK_INPUT].read
-        return @app.call(env) if body.empty?
+        body = env[RACK_INPUT]&.read
+        return @app.call(env) if body.nil? || body.empty?
 
-        env[RACK_INPUT].rewind # somebody might try to read this stream
+        # Somebody might try to read this stream
+        Rack::RewindableInput.new(env[RACK_INPUT]).rewind
 
         if (parser = @parsers[media_type(env)])
           env[Router::ROUTER_PARSED_BODY] = parser.parse(body, env)

data/lib/hanami/router/block.rb

@@ -66,6 +66,7 @@ module Hanami
         # @since 2.0.0
         def call
           body = instance_exec(&@blk)
+
           [status, headers, [body]]
         end
       end

data/lib/hanami/router/leaf.rb

@@ -9,15 +9,14 @@ module Hanami
       #
       # @api private
       # @since 2.2.0
-      attr_reader :to, :params
+      attr_reader :to, :params, :matcher
 
       # @api private
       # @since 2.2.0
       def initialize(route, to, constraints)
-        @route = route
         @to = to
-        @constraints = constraints
         @params = nil
+        @matcher = Mustermann.new(route, type: :rails, version: "5.0", capture: constraints)
       end
 
       # @api private
@@ -29,14 +28,6 @@ module Hanami
 
         match
       end
-
-      private
-
-      # @api private
-      # @since 2.2.0
-      def matcher
-        @matcher ||= Mustermann.new(@route, type: :rails, version: "5.0", capture: @constraints)
-      end
     end
   end
 end

data/lib/hanami/router/rack_utils.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Hanami
+  class Router
+    # @since 2.2.0
+    # @api private
+    def self.rack_3?
+      defined?(Rack::Headers)
+    end
+  end
+end

data/lib/hanami/router/trie.rb

@@ -17,6 +17,7 @@ module Hanami
       # @since 2.0.0
       def initialize
         @root = Node.new
+        @segments_map = {}
       end
 
       # @api private
@@ -47,15 +48,18 @@ module Hanami
 
       # @api private
       # @since 2.0.0
-      SEGMENT_SEPARATOR = /\//
+      SEGMENT_SEPARATOR = "/"
       private_constant :SEGMENT_SEPARATOR
 
       # @api private
       # @since 2.2.0
       def segments_from(path)
-        _, *segments = path.split(SEGMENT_SEPARATOR)
-
-        segments
+        if @segments_map[path]
+          @segments_map[path]
+        else
+          _, *segments = path.split(SEGMENT_SEPARATOR)
+          @segments_map[path] = segments
+        end
       end
     end
   end

data/lib/hanami/router/version.rb

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

data/lib/hanami/router.rb

@@ -22,6 +22,7 @@ module Hanami
     require "hanami/router/url_helpers"
     require "hanami/router/globbed_path"
     require "hanami/router/mounted_path"
+    require "hanami/router/rack_utils"
 
     # URL helpers for other Hanami integrations
     #
@@ -106,6 +107,14 @@ module Hanami
         return not_allowed(env) || not_found(env)
       end
 
+      # Rack 3 no longer requires "rack.input" to be rewindable. Force input to be
+      # rewindable to maintain Rack 2 behavior.
+      #
+      # @since 2.2.0
+      if Hanami::Router.rack_3? && env[::Rack::RACK_INPUT]
+        env[::Rack::RACK_INPUT] = Rack::RewindableInput.new(env[::Rack::RACK_INPUT])
+      end
+
       endpoint.call(
         _params(env, params)
       ).to_a
@@ -693,6 +702,10 @@ module Hanami
     # @api private
     PREFIXED_NAME_SEPARATOR = "_"
 
+    # @since x.x.x
+    # @api private
+    UNDERSCORED_NAME_REGEXP = /[-+~.]/
+
     # @since 2.0.0
     # @api private
     ROOT_PATH = "/"
@@ -739,7 +752,11 @@ module Hanami
 
     # @since 2.0.0
     # @api private
-    HTTP_HEADER_LOCATION = "Location"
+    HTTP_HEADER_LOCATION = Hanami::Router.rack_3? ? "location" : "Location"
+
+    # @since 2.2.0
+    # @api private
+    HTTP_HEADER_ALLOW = Hanami::Router.rack_3? ? "allow" : "Allow"
 
     # @since 2.0.0
     # @api private
@@ -762,7 +779,7 @@ module Hanami
         HTTP_STATUS_NOT_ALLOWED,
         {
           ::Rack::CONTENT_LENGTH => HTTP_BODY_NOT_ALLOWED_LENGTH,
-          "Allow" => allowed_http_methods.join(", ")
+          HTTP_HEADER_ALLOW => allowed_http_methods.join(", ")
         },
         [HTTP_BODY_NOT_ALLOWED]
       ]
@@ -774,12 +791,13 @@ module Hanami
     # @since 2.0.0
     NOT_FOUND = ->(*) {
       [HTTP_STATUS_NOT_FOUND, {::Rack::CONTENT_LENGTH => HTTP_BODY_NOT_FOUND_LENGTH}, [HTTP_BODY_NOT_FOUND]]
-    }.freeze
+    }
 
     # @since 2.0.0
     # @api private
     def lookup(env)
       endpoint = fixed(env)
+
       return [endpoint, {}] if endpoint
 
       variable(env) || globbed_or_mounted(env)
@@ -800,7 +818,7 @@ module Hanami
       end
 
       if as
-        as = prefixed_name(as)
+        as = prefixed_underscored_name(as)
         add_named_route(path, as, constraints)
       end
 
@@ -872,10 +890,13 @@ module Hanami
       @path_prefix.join(path).to_s
     end
 
-    # @since 2.0.0
+    # @since x.x.x
     # @api private
-    def prefixed_name(name)
-      @name_prefix.relative_join(name, PREFIXED_NAME_SEPARATOR).to_sym
+    def prefixed_underscored_name(name)
+      @name_prefix
+        .relative_join(name, PREFIXED_NAME_SEPARATOR)
+        .gsub(UNDERSCORED_NAME_REGEXP, "_")
+        .to_sym
     end
 
     # Returns a new instance of Hanami::Router with the modified options.
@@ -907,7 +928,13 @@ module Hanami
         raise UnknownHTTPStatusCodeError.new(code)
       end
 
-      destination = prefixed_path(to)
+      destination = if to.is_a?(URI)
+                      to.to_s
+                    elsif to.start_with?("http://") || to.start_with?("https://")
+                      to
+                    else
+                      prefixed_path(to)
+                    end
       Redirect.new(destination, code, ->(*) { [code, {HTTP_HEADER_LOCATION => destination}, [body]] })
     end
 
@@ -925,6 +952,7 @@ module Hanami
       env[PARAMS].merge!(::Rack::Utils.parse_nested_query(env[::Rack::QUERY_STRING]))
       env[PARAMS].merge!(params)
       env[PARAMS] = Params.deep_symbolize(env[PARAMS])
+
       env
     end
 

metadata

@@ -1,27 +1,26 @@
 --- !ruby/object:Gem::Specification
 name: hanami-router
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0.beta2
 platform: ruby
 authors:
 - Luca Guidi
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-05 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
@@ -52,6 +51,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: csv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -92,14 +105,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -176,6 +189,7 @@ files:
 - lib/hanami/router/node.rb
 - lib/hanami/router/params.rb
 - lib/hanami/router/prefix.rb
+- lib/hanami/router/rack_utils.rb
 - lib/hanami/router/recognized_route.rb
 - lib/hanami/router/redirect.rb
 - lib/hanami/router/route.rb
@@ -188,7 +202,6 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -196,15 +209,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.1'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Rack compatible HTTP router for Ruby and Hanami
 test_files: []