hanami-router 2.0.0.alpha2 → 2.0.0.alpha6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '078b6fde8c274fe1d60ae480f8b9aec21e3c765daf8ba58f10b1b30a2d0c2135'
-  data.tar.gz: 941ad1968db99f130f18ef37ba12798e882e80b84aeb9974780edeabd446dcfb
+  metadata.gz: 8d4b765c647ddf0aa30e30b516bc8e449a9734d6de8f8466c5e9ae96051b8b2b
+  data.tar.gz: 6b6728d2cb184ac2924fad9b36e0d61396b9dde66c95894a694c831291e113b5
 SHA512:
-  metadata.gz: 9091771edcea709bf395654175c7a4f8c1f961d85d66f553db6591d7e1c6675cea38cfdc393e5438e219edb75c75965d4a37727e2da69cdbe1d57ce6756523b7
-  data.tar.gz: 130e577dd27732b4b74acc147a9fbaa444b682546092acd6ed849347c94edcbd779193917b66f4444dd4faf1d7f35ae5dc6755eada2b783ba5d62aa0b7d9c004
+  metadata.gz: e2553b5cae230e21181467afce6950bd3df79e17e6351bc8f9b92bf4577ccaf4f7b773d11d67d88e3fe9fa789fcefd5211dd721ea1e723c16414e2d2670594d3
+  data.tar.gz: 247718a876404665267bdeb523944a73b55d9f7e846b11888e022f0fcfac39c8514f2dca60b030e8820ac3958bc666f766229793a04f992bca328cbd0c3e2919

data/CHANGELOG.md

@@ -1,6 +1,30 @@
 # Hanami::Router
 Rack compatible HTTP router for Ruby
 
+## v2.0.0.alpha6 - 2022-02-10
+### Added
+- [Luca Guidi] Official support for MRI 3.1
+- [Luca Guidi] Parse non-GET request body and make it available in Rack env under the `router.params` key. For JSON requests, please use `Hanami:::Middleware::JsonParser`
+
+### Changed
+- [Luca Guidi] Drop support for Ruby: MRI 2.6, and 2.7.
+
+## v2.0.0.alpha5 - 2021-05-04
+### Added
+- [Luca Guidi] Introduced `Hanami::Router#to_inspect` which returns a string blob with all the routes formatted for human readability
+
+## v2.0.0.alpha4 - 2021-01-16
+### Added
+- [Luca Guidi] Official support for MRI 3.0
+- [Luca Guidi] Introduced `Hanami::Middleware::BodyParser::Parser` as superclass for body parsers
+- [Paweł Świątkowski] Added `not_found:` option to `Hanami::Router#initialize` to customize HTTP 404 status
+
+## v2.0.0.alpha3 - 2020-05-20
+### Fixed
+- [Luca Guidi] `Hanami::Router#initialize` do not yield block if not given
+- [Luca Guidi] Ensure to not accidentally cache response headers for HTTP 404 and 405
+- [Luca Guidi] Ensure scoped root to not be added as trailing slash
+
 ## v2.0.0.alpha2 - 2020-02-19
 ### Added
 - [Luca Guidi] Block syntax. Routes definition accept a block which returning value is the body of the Rack response.

data/LICENSE.md

@@ -1,4 +1,4 @@
-Copyright © 2014-2017 Luca Guidi
+Copyright © 2014-2021 Luca Guidi
 
 MIT License
 

data/README.md

@@ -2,12 +2,15 @@
 
 Rack compatible, lightweight and fast HTTP Router for Ruby and [Hanami](http://hanamirb.org).
 
+## Version
+
+**This branch contains the code for `hanami-router` 2.x.**
+
 ## Status
 
 [![Gem Version](https://badge.fury.io/rb/hanami-router.svg)](https://badge.fury.io/rb/hanami-router)
-[![Build Status](https://ci.hanamirb.org/api/badges/hanami/router/status.svg)](https://ci.hanamirb.org/hanami/router)
-[![CircleCI](https://circleci.com/gh/hanami/router/tree/master.svg?style=svg)](https://circleci.com/gh/hanami/router/tree/master)
-[![Test Coverage](https://codecov.io/gh/hanami/router/branch/master/graph/badge.svg)](https://codecov.io/gh/hanami/router)
+[![CI](https://github.com/hanami/router/workflows/ci/badge.svg?branch=main)](https://github.com/hanami/router/actions?query=workflow%3Aci+branch%3Amain)
+[![Test Coverage](https://codecov.io/gh/hanami/router/branch/main/graph/badge.svg)](https://codecov.io/gh/hanami/router)
 [![Depfu](https://badges.depfu.com/badges/5f6b8e8fa3b0d082539f0b0f84d55960/overview.svg)](https://depfu.com/github/hanami/router?project=Bundler)
 [![Inline Docs](http://inch-ci.org/github/hanami/router.svg)](http://inch-ci.org/github/hanami/router)
 
@@ -22,7 +25,7 @@ Rack compatible, lightweight and fast HTTP Router for Ruby and [Hanami](http://h
 
 ## Rubies
 
-__Hanami::Router__ supports Ruby (MRI) 2.5+
+__Hanami::Router__ supports Ruby (MRI) 3.0+
 
 
 ## Installation
@@ -225,6 +228,13 @@ router = Hanami::Router.new
 router.call(Rack::MockRequest.env_for("/unknown")).status # => 404
 ```
 
+### Explicit Not Found:
+
+```ruby
+router = Hanami::Router.new(not_found: ->(_) { [499, {}, []]})
+router.call(Rack::MockRequest.env_for("/unknown")).status # => 499
+```
+
 ### Body Parsers
 
 Rack ignores request bodies unless they come from a form submission.
@@ -355,6 +365,4 @@ __Hanami::Router__ uses [Semantic Versioning 2.0.0](http://semver.org)
 
 ## Copyright
 
-Copyright © 2014-2020 Luca Guidi – Released under MIT License
-
-This project was formerly known as Lotus (`lotus-router`).
+Copyright © 2014-2022 Hanami Team – Released under MIT License

data/hanami-router.gemspec

@@ -14,11 +14,12 @@ Gem::Specification.new do |spec|
   spec.homepage      = "http://hanamirb.org"
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files -- lib/* CHANGELOG.md LICENSE.md README.md hanami-router.gemspec`.split($INPUT_RECORD_SEPARATOR)
+  spec.files         = `git ls-files -- lib/* CHANGELOG.md LICENSE.md README.md hanami-router.gemspec`.split($/)
   spec.executables   = []
   spec.test_files    = spec.files.grep(%r{^(test)/})
   spec.require_paths = ["lib"]
-  spec.required_ruby_version = ">= 2.5.0"
+  spec.metadata["rubygems_mfa_required"] = "true"
+  spec.required_ruby_version = ">= 3.0"
 
   spec.add_dependency "rack",               "~> 2.0"
   spec.add_dependency "mustermann",         "~> 1.0"
@@ -28,4 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake",      "~> 13"
   spec.add_development_dependency "rack-test", "~> 1.0"
   spec.add_development_dependency "rspec",     "~> 3.8"
+
+  spec.add_development_dependency "rubocop", "~> 1.0"
+  spec.add_development_dependency "rubocop-performance", "~> 1.0"
 end

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

@@ -11,7 +11,7 @@ module Hanami
       module ClassInterface
         # @api private
         # @since 1.3.0
-        def for(parser) # rubocop:disable Metrics/MethodLength
+        def for(parser)
           parser =
             case parser
             when String, Symbol

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

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
 require "json"
-require_relative "errors"
+require_relative "parser"
 
 module Hanami
   module Middleware
     class BodyParser
       # @since 1.3.0
       # @api private
-      class JsonParser
+      class JsonParser < Parser
         # @since 1.3.0
         # @api private
         def mime_types

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

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+module Hanami
+  module Middleware
+    class BodyParser
+      # Body parser abstract class
+      #
+      # @since 2.0.0
+      class Parser
+        # Declare supported MIME types
+        #
+        # @return [Array<String>] supported MIME types
+        #
+        # @abstract
+        # @since 2.0.0
+        #
+        # @example
+        #   require "hanami/middleware/body_parser"
+        #
+        #   class XMLParser < Hanami::Middleware::BodyParser::Parser
+        #     def mime_types
+        #       ["application/xml", "text/xml"]
+        #     end
+        #   end
+        def mime_types
+          raise NotImplementedError
+        end
+
+        # Parse raw HTTP request body
+        #
+        # @param body [String] HTTP request body
+        #
+        # @return [Hash] the result of the parsing
+        #
+        # @raise [Hanami::Middleware::BodyParser::BodyParsingError] the error
+        #   that must be raised if the parsing cannot be accomplished
+        #
+        # @abstract
+        # @since 2.0.0
+        #
+        # @example
+        #   require "hanami/middleware/body_parser"
+        #
+        #   class XMLParser < Hanami::Middleware::BodyParser::Parser
+        #     def parse(body)
+        #       # XML parsing
+        #       # ...
+        #     rescue => exception
+        #       raise Hanami::Middleware::BodyParser::BodyParsingError.new(exception.message)
+        #     end
+        #   end
+        def parse(body)
+          raise NotImplementedError
+        end
+      end
+    end
+  end
+end

data/lib/hanami/middleware/body_parser.rb

@@ -2,20 +2,22 @@
 
 require "hanami/router/params"
 require "hanami/middleware/error"
-require_relative "body_parser/class_interface"
 
 module Hanami
   module Middleware
     # @since 1.3.0
     # @api private
     class BodyParser
+      require_relative "body_parser/class_interface"
+      require_relative "body_parser/parser"
+
       # @since 1.3.0
       # @api private
       CONTENT_TYPE = "CONTENT_TYPE"
 
       # @since 1.3.0
       # @api private
-      MEDIA_TYPE_MATCHER = /\s*[;,]\s*/.freeze
+      MEDIA_TYPE_MATCHER = /\s*[;,]\s*/
 
       # @since 1.3.0
       # @api private
@@ -72,7 +74,7 @@ module Hanami
         if body.is_a?(::Hash)
           Router::Params.deep_symbolize(body)
         else
-          { FALLBACK_KEY => body }
+          {FALLBACK_KEY => body}
         end
       end
 

data/lib/hanami/router/inspector.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module Hanami
+  class Router
+    # Routes inspector
+    #
+    # @api private
+    # @since 2.0.0
+    class Inspector
+      # @api private
+      # @since 2.0.0
+      def initialize(routes: [])
+        @routes = routes
+      end
+
+      # @param route [Hash] serialized route
+      #
+      # @api private
+      # @since 2.0.0
+      def add_route(route)
+        @routes.push(route)
+      end
+
+      # @return [String] The inspected routes
+      #
+      # @api private
+      # @since 2.0.0
+      def call(*)
+        @routes.map(&:to_inspect).join(NEW_LINE)
+      end
+
+      # @api private
+      # @since 2.0.0
+      NEW_LINE = $/
+      private_constant :NEW_LINE
+    end
+  end
+end

data/lib/hanami/router/node.rb

@@ -36,8 +36,7 @@ module Hanami
       # @api private
       # @since 2.0.0
       #
-      # rubocop:disable Metrics/MethodLength
-      def get(segment)
+      def get(segment) # rubocop:disable Metrics/PerceivedComplexity
         return unless @variable || @fixed
 
         found = nil
@@ -55,7 +54,6 @@ module Hanami
 
         [found, captured&.named_captures]
       end
-      # rubocop:enable Metrics/MethodLength
 
       # @api private
       # @since 2.0.0

data/lib/hanami/router/params.rb

@@ -15,7 +15,7 @@ module Hanami
       #
       # @api private
       # @since 2.0.0
-      def self.deep_symbolize(params) # rubocop:disable Metrics/MethodLength
+      def self.deep_symbolize(params)
         params.each_with_object({}) do |(key, value), output|
           output[key.to_sym] =
             case value

data/lib/hanami/router/prefix.rb

@@ -25,7 +25,7 @@ module Hanami
       # @api private
       def relative_join(path, separator = DEFAULT_SEPARATOR)
         _join(path.to_s)
-          .gsub(DEFAULT_SEPARATOR_REGEXP, separator)[1..-1]
+          .gsub(DEFAULT_SEPARATOR_REGEXP, separator)[1..]
       end
 
       # @since 2.0.0
@@ -48,15 +48,17 @@ module Hanami
 
       # @since 2.0.0
       # @api private
-      DEFAULT_SEPARATOR_REGEXP = /\//.freeze
+      DEFAULT_SEPARATOR_REGEXP = /\//
 
       # @since 2.0.0
       # @api private
-      DOUBLE_DEFAULT_SEPARATOR_REGEXP = /[\/]{2,}/.freeze
+      DOUBLE_DEFAULT_SEPARATOR_REGEXP = /\/{2,}/
 
       # @since 2.0.0
       # @api private
       def _join(path)
+        return @prefix if path == DEFAULT_SEPARATOR
+
         (@prefix + DEFAULT_SEPARATOR + path)
           .gsub(DOUBLE_DEFAULT_SEPARATOR_REGEXP, DEFAULT_SEPARATOR)
       end

data/lib/hanami/router/recognized_route.rb

@@ -27,7 +27,7 @@ module Hanami
       # @see Hanami::Router::RecognizedRoute#routable?
       # @see Hanami::Router::NotRoutableEndpointError
       def call(env)
-        if routable? # rubocop:disable Style/GuardClause
+        if routable?
           @endpoint.call(env)
         else
           raise NotRoutableEndpointError.new(@env)

data/lib/hanami/router/redirect.rb

@@ -13,8 +13,13 @@ module Hanami
 
       # @since 2.0.0
       # @api private
-      def initialize(destination, endpoint)
+      attr_reader :code
+
+      # @since 2.0.0
+      # @api private
+      def initialize(destination, code, endpoint)
         @destination = destination
+        @code = code
         @endpoint = endpoint
       end
 

data/lib/hanami/router/route.rb

@@ -0,0 +1,130 @@
+# frozen_string_literal: true
+
+require "hanami/router/redirect"
+require "hanami/router/block"
+
+module Hanami
+  class Router
+    class Route
+      # @api private
+      # @since 2.0.0
+      attr_reader :http_method
+
+      # @api private
+      # @since 2.0.0
+      attr_reader :path
+
+      # @api private
+      # @since 2.0.0
+      attr_reader :to
+
+      # @api private
+      # @since 2.0.0
+      attr_reader :as
+
+      # @api private
+      # @since 2.0.0
+      attr_reader :constraints
+
+      # @api private
+      # @since 2.0.0
+      def initialize(http_method:, path:, to:, as: nil, constraints: {}, blk: nil) # rubocop:disable Metrics/ParameterLists
+        @http_method = http_method
+        @path = path
+        @to = to
+        @as = as
+        @constraints = constraints
+        @blk = blk
+        freeze
+      end
+
+      # @api private
+      # @since 2.0.0
+      def to_inspect
+        return EMPTY_ROUTE if head?
+
+        result = http_method.to_s.ljust(SMALL_STRING_JUSTIFY_AMOUNT)
+        result += path.ljust(LARGE_STRING_JUSTIFY_AMOUNT)
+        result += inspect_to(to).ljust(LARGE_STRING_JUSTIFY_AMOUNT)
+        result += "as #{as.inspect}".ljust(MEDIUM_STRING_JUSTIFY_AMOUNT) if as
+
+        if constraints?
+          result += "(#{inspect_constraints(constraints)})".ljust(EXTRA_LARGE_STRING_JUSTIFY_AMOUNT)
+        end
+
+        result
+      end
+
+      private
+
+      # @api private
+      # @since 2.0.0
+      EMPTY_ROUTE = ""
+      private_constant :EMPTY_ROUTE
+
+      # @api private
+      # @since 2.0.0
+      ROUTE_CONSTRAINT_SEPARATOR = ", "
+      private_constant :ROUTE_CONSTRAINT_SEPARATOR
+
+      # @api private
+      # @since 2.0.0
+      SMALL_STRING_JUSTIFY_AMOUNT = 8
+      private_constant :SMALL_STRING_JUSTIFY_AMOUNT
+
+      # @api private
+      # @since 2.0.0
+      MEDIUM_STRING_JUSTIFY_AMOUNT = 20
+      private_constant :MEDIUM_STRING_JUSTIFY_AMOUNT
+
+      # @api private
+      # @since 2.0.0
+      LARGE_STRING_JUSTIFY_AMOUNT = 30
+      private_constant :LARGE_STRING_JUSTIFY_AMOUNT
+
+      # @api private
+      # @since 2.0.0
+      EXTRA_LARGE_STRING_JUSTIFY_AMOUNT = 40
+      private_constant :EXTRA_LARGE_STRING_JUSTIFY_AMOUNT
+
+      # @api private
+      # @since 2.0.0
+      def head?
+        http_method == "HEAD"
+      end
+
+      # @api private
+      # @since 2.0.0
+      def constraints?
+        constraints.any?
+      end
+
+      # @api private
+      # @since 2.0.0
+      def inspect_to(to)
+        case to
+        when String
+          to
+        when Proc
+          "(proc)"
+        when Class
+          to.name || "(class)"
+        when Block
+          "(block)"
+        when Redirect
+          "#{to.destination} (HTTP #{to.code})"
+        else
+          inspect_to(to.class)
+        end
+      end
+
+      # @api private
+      # @since 2.0.0
+      def inspect_constraints(constraints)
+        constraints.map do |key, value|
+          "#{key}: #{value.inspect}"
+        end.join(ROUTE_CONSTRAINT_SEPARATOR)
+      end
+    end
+  end
+end

data/lib/hanami/router/version.rb

@@ -4,6 +4,6 @@ module Hanami
   class Router
     # @since 0.1.0
     # @api public
-    VERSION = "2.0.0.alpha2"
+    VERSION = "2.0.0.alpha6"
   end
 end

data/lib/hanami/router.rb

@@ -1,12 +1,13 @@
 # frozen_string_literal: true
 
+require "rack"
 require "rack/utils"
 
 module Hanami
   # Rack compatible, lightweight and fast HTTP Router.
   #
   # @since 0.1.0
-  class Router # rubocop:disable Metrics/ClassLength
+  class Router
     require "hanami/router/version"
     require "hanami/router/error"
     require "hanami/router/segment"
@@ -15,6 +16,7 @@ module Hanami
     require "hanami/router/params"
     require "hanami/router/trie"
     require "hanami/router/block"
+    require "hanami/router/route"
     require "hanami/router/url_helpers"
 
     # URL helpers for other Hanami integrations
@@ -23,6 +25,12 @@ module Hanami
     # @since 2.0.0
     attr_reader :url_helpers
 
+    # Routes for inspection
+    #
+    # @api private
+    # @since 2.0.0
+    attr_reader :routes
+
     # Returns the given block as it is.
     #
     # @param blk [Proc] a set of route definitions
@@ -48,6 +56,7 @@ module Hanami
     #   is deployed
     # @param resolver [#call(path, to)] a resolver for route entpoints
     # @param block_context [Hanami::Router::Block::Context)
+    # @param not_found [#call(env)] default handler when route is not matched
     # @param blk [Proc] the route definitions
     #
     # @since 0.1.0
@@ -60,18 +69,22 @@ module Hanami
     #   Hanami::Router.new do
     #     get "/", to: ->(*) { [200, {}, ["OK"]] }
     #   end
-    def initialize(base_url: DEFAULT_BASE_URL, prefix: DEFAULT_PREFIX, resolver: DEFAULT_RESOLVER, block_context: nil, &blk)
+    def initialize(base_url: DEFAULT_BASE_URL, prefix: DEFAULT_PREFIX, resolver: DEFAULT_RESOLVER, not_found: NOT_FOUND, block_context: nil, inspector: nil, &blk) # rubocop:disable Layout/LineLength
       # TODO: verify if Prefix can handle both name and path prefix
       @path_prefix = Prefix.new(prefix)
       @name_prefix = Prefix.new("")
       @url_helpers = UrlHelpers.new(base_url)
+      @base_url = base_url
       @resolver = resolver
+      @not_found = not_found
       @block_context = block_context
       @fixed = {}
       @variable = {}
       @globbed = {}
       @mounted = {}
-      instance_eval(&blk)
+      @blk = blk
+      @inspector = inspector
+      instance_eval(&blk) if blk
     end
 
     # Resolve the given Rack env to a registered endpoint and invokes it.
@@ -86,7 +99,7 @@ module Hanami
 
       unless endpoint
         return not_allowed(env) ||
-               not_found
+               not_found(env)
       end
 
       endpoint.call(
@@ -405,7 +418,11 @@ module Hanami
     def mount(app, at:, **constraints)
       path = prefixed_path(at)
       prefix = Segment.fabricate(path, **constraints)
+
       @mounted[prefix] = @resolver.call(path, app)
+      if inspect?
+        @inspector.add_route(Route.new(http_method: "*", path: at, to: app, constraints: constraints))
+      end
     end
 
     # Generate an relative URL for a specified named route.
@@ -586,6 +603,21 @@ module Hanami
       )
     end
 
+    # Returns formatted routes
+    #
+    # @return [String] formatted routes
+    #
+    # @since 2.0.0
+    # @api private
+    def to_inspect
+      require "hanami/router/inspector"
+
+      inspector = Inspector.new
+      with(inspector: inspector)
+
+      inspector.call
+    end
+
     # @since 2.0.0
     # @api private
     def fixed(env)
@@ -631,13 +663,14 @@ module Hanami
     # @since 2.0.0
     # @api private
     def not_allowed(env)
-      (_not_allowed_fixed(env) || _not_allowed_variable(env)) and return NOT_ALLOWED
+      (_not_allowed_fixed(env) ||
+       _not_allowed_variable(env)) and return [405, {"Content-Length" => "11"}, ["Not Allowed"]]
     end
 
     # @since 2.0.0
     # @api private
-    def not_found
-      NOT_FOUND
+    def not_found(env)
+      @not_found.call(env)
     end
 
     protected
@@ -655,7 +688,7 @@ module Hanami
     #
     # @see Hanami::Router#recognize
     # @see http://www.rubydoc.info/github/rack/rack/Rack%2FMockRequest.env_for
-    def env_for(env, params = {}, options = {}) # rubocop:disable Metrics/MethodLength
+    def env_for(env, params = {}, options = {})
       require "rack/mock"
 
       case env
@@ -666,7 +699,7 @@ module Hanami
           url = path(env, params)
           return env_for(url, params, options) # rubocop:disable Style/RedundantReturn
         rescue Hanami::Router::InvalidRouteException
-          EMPTY_RACK_ENV.dup
+          {} # Empty Rack env
         end
       else
         env
@@ -691,31 +724,21 @@ module Hanami
     # @api private
     DEFAULT_REDIRECT_CODE = 301
 
-    # @since 2.0.0
-    # @api private
-    NOT_FOUND = [404, { "Content-Length" => "9" }, ["Not Found"]].freeze
-
-    # @since 2.0.0
-    # @api private
-    NOT_ALLOWED = [405, { "Content-Length" => "11" }, ["Not Allowed"]].freeze
-
     # @since 2.0.0
     # @api private
     PARAMS = "router.params"
 
-    # @since 2.0.0
+    # Default response when no route was matched
+    #
     # @api private
-    EMPTY_PARAMS = {}.freeze
-
     # @since 2.0.0
-    # @api private
-    EMPTY_RACK_ENV = {}.freeze
+    NOT_FOUND = ->(*) { [404, {"Content-Length" => "9"}, ["Not Found"]] }.freeze
 
     # @since 2.0.0
     # @api private
     def lookup(env)
       endpoint = fixed(env)
-      return [endpoint, EMPTY_PARAMS] if endpoint
+      return [endpoint, {}] if endpoint
 
       variable(env) || globbed(env) || mounted(env)
     end
@@ -735,6 +758,12 @@ module Hanami
       end
 
       add_named_route(path, as, constraints) if as
+
+      if inspect?
+        @inspector.add_route(
+          Route.new(http_method: http_method, path: path, to: to, as: as, constraints: constraints, blk: blk)
+        )
+      end
     end
 
     # @since 2.0.0
@@ -785,6 +814,12 @@ module Hanami
       /\*/.match?(path)
     end
 
+    # @since 2.0.0
+    # @api private
+    def inspect?
+      !@inspector.nil?
+    end
+
     # @since 2.0.0
     # @api private
     def prefixed_path(path)
@@ -797,6 +832,27 @@ module Hanami
       @name_prefix.relative_join(name, "_").to_sym
     end
 
+    # Returns a new instance of Hanami::Router with the modified options.
+    #
+    # @return [Hanami::Route] a new instance of Hanami::Router
+    #
+    # @see Hanami::Router#initialize
+    #
+    # @since 2.0.0
+    # @api private
+    def with(**new_options, &blk)
+      options = {
+        base_url: @base_url,
+        prefix: @path_prefix.to_s,
+        resolver: @resolver,
+        not_found: @not_found,
+        block_context: @block_context,
+        inspector: @inspector
+      }
+
+      self.class.new(**options.merge(new_options), &(blk || @blk))
+    end
+
     # @since 2.0.0
     # @api private
     def _redirect(to, code)
@@ -805,7 +861,7 @@ module Hanami
       end
 
       destination = prefixed_path(to)
-      Redirect.new(destination, ->(*) { [code, { "Location" => destination }, [body]] })
+      Redirect.new(destination, code, ->(*) { [code, {"Location" => destination}, [body]] })
     end
 
     # @since 2.0.0
@@ -813,7 +869,13 @@ module Hanami
     def _params(env, params)
       params ||= {}
       env[PARAMS] ||= {}
-      env[PARAMS].merge!(Rack::Utils.parse_nested_query(env["QUERY_STRING"]))
+
+      if (input = env[Rack::RACK_INPUT]) and input.rewind
+        env[PARAMS].merge!(Rack::Utils.parse_nested_query(input.read))
+        input.rewind
+      end
+
+      env[PARAMS].merge!(Rack::Utils.parse_nested_query(env[Rack::QUERY_STRING]))
       env[PARAMS].merge!(params)
       env[PARAMS] = Params.deep_symbolize(env[PARAMS])
       env

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami-router
 version: !ruby/object:Gem::Version
-  version: 2.0.0.alpha2
+  version: 2.0.0.alpha6
 platform: ruby
 authors:
 - Luca Guidi
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-19 00:00:00.000000000 Z
+date: 2022-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -114,6 +114,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.8'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: Rack compatible HTTP router for Ruby
 email:
 - me@lucaguidi.com
@@ -129,15 +157,18 @@ files:
 - lib/hanami/middleware/body_parser/class_interface.rb
 - lib/hanami/middleware/body_parser/errors.rb
 - lib/hanami/middleware/body_parser/json_parser.rb
+- lib/hanami/middleware/body_parser/parser.rb
 - lib/hanami/middleware/error.rb
 - lib/hanami/router.rb
 - lib/hanami/router/block.rb
 - lib/hanami/router/error.rb
+- lib/hanami/router/inspector.rb
 - lib/hanami/router/node.rb
 - lib/hanami/router/params.rb
 - lib/hanami/router/prefix.rb
 - lib/hanami/router/recognized_route.rb
 - lib/hanami/router/redirect.rb
+- lib/hanami/router/route.rb
 - lib/hanami/router/segment.rb
 - lib/hanami/router/trie.rb
 - lib/hanami/router/url_helpers.rb
@@ -145,8 +176,9 @@ files:
 homepage: http://hanamirb.org
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -154,15 +186,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: Rack compatible HTTP router for Ruby and Hanami
 test_files: []