hanami-router 2.0.0.rc1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc0a68636ae47869944fc0c76f262c420356d3fbf10bd12b270692f48d3ea7bb
-  data.tar.gz: cb653be9037e33f02a05bcbf2048109d64e561afafaa03c8ed353b4b3183d672
+  metadata.gz: d1d74dfb9252f6462cb018bd567261aad94f83ea6837bb78f3d597dd9b62d0c5
+  data.tar.gz: 30c7f9425d0ad82d0c3059ed8a2d8fcc5e1a1a11092caf5f725338748451fddc
 SHA512:
-  metadata.gz: 4e50ba3c0279d9c26a1ef882127ef7d02ca39cb5ebab25589799ab7190e4562a40e57d0dcbcfe285b1e9dc7ab312dedc0ebf2553d4da3afc921821a8d23cc233
-  data.tar.gz: b6f390eb1750d6e596bb1064573467fbd8d5ceccb3bbf0e34a8ab021dd1162d4fc88a8edee4d36a221d053a8ee3d656114004ac6ebbb9b87fc43636bd8715004
+  metadata.gz: 1f351789e9d4f24ef65cfdb6e19868e56c612b2f222dfd2f250f15bddfdcf00fb9d7146a5b4bd978fa2cf5b067b2dc1a96f9cf0430f028240a4c6543075cd0a1
+  data.tar.gz: 7019f2ef7c57177041495e7614992b117548d5d0eeace16d4784a9dc07b678d1d49e0987a6f750fd51b342cd5b86136fe393cef2d1fa126250a07ff8887bc1fe

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 Rack compatible HTTP router for Ruby
 
+## v2.0.0 - 2022-11-22
+
+### Fixed
+
+- [Luca Guidi] Don't parse request body when Body Parser already parsed it
+
 ## v2.0.0.rc1 - 2022-11-08
 
 ### Fixed

data/lib/hanami/middleware/body_parser.rb

@@ -2,6 +2,7 @@
 
 require "hanami/router/params"
 require "hanami/middleware/error"
+require_relative "../router/constants"
 
 module Hanami
   module Middleware
@@ -27,9 +28,6 @@ module Hanami
       # @api private
       ROUTER_PARAMS = "router.params"
 
-      # @api private
-      ROUTER_PARSED_BODY = "router.parsed_body"
-
       # @api private
       FALLBACK_KEY = "_"
 
@@ -47,8 +45,8 @@ module Hanami
         env[RACK_INPUT].rewind # somebody might try to read this stream
 
         if (parser = @parsers[media_type(env)])
-          env[ROUTER_PARSED_BODY] = parser.parse(body)
-          env[ROUTER_PARAMS] = _symbolize(env[ROUTER_PARSED_BODY])
+          env[Router::ROUTER_PARSED_BODY] = parser.parse(body)
+          env[ROUTER_PARAMS] = _symbolize(env[Router::ROUTER_PARSED_BODY])
         end
 
         @app.call(env)

data/lib/hanami/router/constants.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Hanami
+  class Router
+    # @api private
+    # @since 2.0.0
+    ROUTER_PARSED_BODY = "router.parsed_body"
+  end
+end

data/lib/hanami/router/version.rb

@@ -7,6 +7,6 @@ module Hanami
     # @return [String]
     #
     # @api public
-    VERSION = "2.0.0.rc1"
+    VERSION = "2.0.0"
   end
 end

data/lib/hanami/router.rb

@@ -10,6 +10,7 @@ module Hanami
   # @since 0.1.0
   class Router
     require "hanami/router/version"
+    require "hanami/router/constants"
     require "hanami/router/errors"
     require "hanami/router/segment"
     require "hanami/router/redirect"
@@ -919,7 +920,7 @@ module Hanami
       params ||= {}
       env[PARAMS] ||= {}
 
-      if (input = env[::Rack::RACK_INPUT]) and input.rewind
+      if !env.key?(ROUTER_PARSED_BODY) && (input = env[::Rack::RACK_INPUT]) and input.rewind
         env[PARAMS].merge!(::Rack::Utils.parse_nested_query(input.read))
         input.rewind
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami-router
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc1
+  version: 2.0.0
 platform: ruby
 authors:
 - Luca Guidi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-08 00:00:00.000000000 Z
+date: 2022-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -164,6 +164,7 @@ files:
 - lib/hanami/middleware/trie.rb
 - lib/hanami/router.rb
 - lib/hanami/router/block.rb
+- lib/hanami/router/constants.rb
 - lib/hanami/router/errors.rb
 - lib/hanami/router/formatter/csv.rb
 - lib/hanami/router/formatter/human_friendly.rb
@@ -194,11 +195,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Rack compatible HTTP router for Ruby and Hanami