hanami-router 2.1.0.rc3 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e20f7326a54f71efcb3251ae1fd939bf9e7229d005e45a2ce65dc5d10551f7bd
-  data.tar.gz: 1b3568b80c0742543a9706a86ae42600460b297887c9af9276949dbe1afd18c4
+  metadata.gz: bd15cdabe88259102767109851f7eb4253c52fbdd8a77fff7e3e53512953866c
+  data.tar.gz: ca5c14f2abe932cda82da4ebacfe569e8acdfbce915d33e89201dd3af52fd044
 SHA512:
-  metadata.gz: 155276f1b0f2b72d43ab2356e5c3896e78d5fe874e4bc38310fea442ab2987a388197ae2b564a9cf7bad911bb8ae1ceb1235dddf16f804385486eb962840d0f9
-  data.tar.gz: c80a5864b520752a7cfc4c9f4ebebe18f5e865598a618b4f0ef1154642d18f49a711b4748e73a6a067521cc13d9af98e6d2cddc8ddc9f8a0d3871054e401fc65
+  metadata.gz: 1b8dba8cd1f1a178b84a8222b0f0d671a87c0e8e58332022c4480a850a2b3daf3e1d9a0915299d0ee8249d016610a088c8ee7049d0bb93fbefb25e74586d6dbc
+  data.tar.gz: 1eca7bf5c3e7928f9d5400a87fa9d9089f43312f4d89684c5137c082469c31aeea5cd8f910fea9c08cc58a8cc01d2a659feee0a0c62593ccca1ba1854d70d6c8

data/CHANGELOG.md

@@ -2,6 +2,17 @@
 
 Rack compatible HTTP router for Ruby
 
+## v2.1.0 - 2024-02-27
+
+### Fixed
+
+- [Pat Allan] Fix PATH_INFO and SCRIPT_NAME for Rack apps mounted at the root (keep the leading slash in PATH_INFO, and set SCRIPT_NAME to a blank string)
+- [Pat Allan] Process glob routes and mounted apps together, so that the routes can be handled in the user-specified order (previously, a root-mounted app would handle routes even if matching globs were declared earlier)
+
+### Changed
+
+- [Pat Allan] Pass keyword args through to middleware
+
 ## v2.1.0.rc3 - 2024-02-16
 
 ## v2.1.0.rc2 - 2023-11-08

data/lib/hanami/middleware/app.rb

@@ -21,8 +21,8 @@ module Hanami
         mapping.each do |path, stack|
           builder = Rack::Builder.new
 
-          stack.each do |middleware, args, blk|
-            builder.use(middleware, *args, &blk)
+          stack.each do |middleware, args, kwargs, blk|
+            builder.use(middleware, *args, **kwargs, &blk)
           end
 
           builder.run(router)

data/lib/hanami/router/errors.rb

@@ -78,7 +78,7 @@ module Hanami
       # @since 0.5.0
       # @api private
       def initialize(env)
-        super %(Cannot find routable endpoint for: #{env[::Rack::REQUEST_METHOD]} #{env[::Rack::PATH_INFO]})
+        super(%(Cannot find routable endpoint for: #{env[::Rack::REQUEST_METHOD]} #{env[::Rack::PATH_INFO]}))
       end
     end
   end

data/lib/hanami/router/globbed_path.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Hanami
+  class Router
+    class GlobbedPath
+      def initialize(http_method, path, to)
+        @http_method = http_method
+        @path = path
+        @to = to
+      end
+
+      def endpoint_and_params(env)
+        return [] unless @http_method == env[::Rack::REQUEST_METHOD]
+
+        if (match = @path.match(env[::Rack::PATH_INFO]))
+          [@to, match.named_captures]
+        else
+          []
+        end
+      end
+    end
+  end
+end

data/lib/hanami/router/mounted_path.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Hanami
+  class Router
+    class MountedPath
+      def initialize(prefix, app)
+        @prefix = prefix
+        @app = app
+      end
+
+      def endpoint_and_params(env)
+        return [] unless (match = @prefix.peek_match(env[::Rack::PATH_INFO]))
+
+        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
+        end
+
+        [@app, match.named_captures]
+      end
+    end
+  end
+end

data/lib/hanami/router/version.rb

@@ -8,6 +8,6 @@ module Hanami
     #
     # @since 0.1.0
     # @api public
-    VERSION = "2.1.0.rc3"
+    VERSION = "2.1.0"
   end
 end

data/lib/hanami/router.rb

@@ -20,6 +20,8 @@ module Hanami
     require "hanami/router/block"
     require "hanami/router/route"
     require "hanami/router/url_helpers"
+    require "hanami/router/globbed_path"
+    require "hanami/router/mounted_path"
 
     # URL helpers for other Hanami integrations
     #
@@ -84,8 +86,7 @@ module Hanami
       @block_context = block_context
       @fixed = {}
       @variable = {}
-      @globbed = {}
-      @mounted = {}
+      @globs_and_mounts = []
       @blk = blk
       @inspector = inspector
       instance_eval(&blk) if blk
@@ -424,7 +425,7 @@ module Hanami
       path = prefixed_path(at)
       prefix = Segment.fabricate(path, **constraints)
 
-      @mounted[prefix] = @resolver.call(path, app)
+      @globs_and_mounts << MountedPath.new(prefix, @resolver.call(path, app))
       if inspect?
         @inspector.add_route(Route.new(http_method: "*", path: at, to: app, constraints: constraints))
       end
@@ -619,31 +620,12 @@ module Hanami
       @variable[env[::Rack::REQUEST_METHOD]]&.find(env[::Rack::PATH_INFO])
     end
 
-    # @since 2.0.0
-    # @api private
-    def globbed(env)
-      @globbed[env[::Rack::REQUEST_METHOD]]&.each do |path, to|
-        if (match = path.match(env[::Rack::PATH_INFO]))
-          return [to, match.named_captures]
-        end
-      end
-
-      nil
-    end
-
-    # @since 2.0.0
+    # @since 2.1.0
     # @api private
-    def mounted(env)
-      @mounted.each do |prefix, app|
-        next unless (match = prefix.peek_match(env[::Rack::PATH_INFO]))
-
-        # TODO: ensure compatibility with existing env[::Rack::SCRIPT_NAME]
-        # TODO: cleanup this code
-        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
-
-        return [app, match.named_captures]
+    def globbed_or_mounted(env)
+      @globs_and_mounts.each do |path|
+        result = path.endpoint_and_params(env)
+        return result unless result.empty?
       end
 
       nil
@@ -800,7 +782,7 @@ module Hanami
       endpoint = fixed(env)
       return [endpoint, {}] if endpoint
 
-      variable(env) || mounted(env) || globbed(env)
+      variable(env) || globbed_or_mounted(env)
     end
 
     # @since 2.0.0
@@ -843,8 +825,7 @@ module Hanami
     # @since 2.0.0
     # @api private
     def add_globbed_route(http_method, path, to, constraints)
-      @globbed[http_method] ||= []
-      @globbed[http_method] << [Segment.fabricate(path, **constraints), to]
+      @globs_and_mounts << GlobbedPath.new(http_method, Segment.fabricate(path, **constraints), to)
     end
 
     # @since 2.0.0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami-router
 version: !ruby/object:Gem::Version
-  version: 2.1.0.rc3
+  version: 2.1.0
 platform: ruby
 authors:
 - Luca Guidi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-16 00:00:00.000000000 Z
+date: 2024-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -169,7 +169,9 @@ files:
 - lib/hanami/router/errors.rb
 - lib/hanami/router/formatter/csv.rb
 - lib/hanami/router/formatter/human_friendly.rb
+- lib/hanami/router/globbed_path.rb
 - lib/hanami/router/inspector.rb
+- lib/hanami/router/mounted_path.rb
 - lib/hanami/router/node.rb
 - lib/hanami/router/params.rb
 - lib/hanami/router/prefix.rb