hanami-router 2.2.0.rc1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6dbd5cec52e1e7a0d2ac82066294bf3846b58b4c8bacd3555d6f0f1a3e6cb873
-  data.tar.gz: e96f0ff6c694e0964325d012f18c055a892af912e5f6dd3ba35f0bec13173fa0
+  metadata.gz: 5bba2b56b3f4ddbedc47b2d21189f7e88ce172505dabbdca6c6d6266aa6c7fa2
+  data.tar.gz: d601d610fb2cacbef79ca4770ab1e63869a5469ac46671c823e106086c0e58d0
 SHA512:
-  metadata.gz: 8dc08ace41fd84808b9706c2a4d07de0c45f3c206eb858020e8fa7970005e6eeefb721a8654bd86379d8389c71d813b9406ffb4c47eecde4c97558baf6eff3e2
-  data.tar.gz: e28b53acd76af8d279ca365cfa8c9901ce5fc5d789736eef5cd7925e9ecb89845e58caaa9548ebefe2050b792a7704880c84bb2b27adf27c0c6df288b5bd3969
+  metadata.gz: 88b44cc6c09c227aaf45352a49344a48530c4095fa1ac2f53ed0bf38e7901876805121c1090d24759420c8ad0029fbc9aba43d383adb93635161ce3cfb8fe321
+  data.tar.gz: 319831eb561257e58afbc2479447e92862b452424a44c1efffc8f534d4bfc40f2549e70d0849ef4e303182f7d8ec620ad8a6d55a25f9e3994a20215c3dd89bf8

data/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 Rack compatible HTTP router for Ruby
 
+## v2.2.0 - 2024-11-05
+
+### Changed
+
+- [Damian C. Rossney, Kyle Plump] Scopes with a dynamic segment (e.g. `scope ":locale" do`) and containing a `root` route will no longer match the root route for requests with a trailing slash. This makes the behavior consistent with scopes using static strings. (#273)
+
+### Fixed
+
+- [Damian C. Rossney, Kyle Plump] Support paths with different variable names in same path location (#273)
+
 ## v2.2.0.rc1 - 2024-10-29
 
 ## v2.2.0.beta2 - 2024-09-25

data/lib/hanami/router/formatter/csv.rb

@@ -37,7 +37,7 @@ module Hanami
         # @api private
         # @since 2.0.0
         def call(routes, **csv_opts)
-          ::CSV.generate(**DEFAULT_OPTIONS.merge(csv_opts)) do |csv|
+          ::CSV.generate(**DEFAULT_OPTIONS, **csv_opts) do |csv|
             csv << HEADERS if csv.write_headers?
             routes.reduce(csv) do |acc, route|
               route.head? ? acc : acc << row(route)

data/lib/hanami/router/leaf.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require "mustermann/rails"
+
+module Hanami
+  class Router
+    class Leaf
+      # Trie Leaf
+      #
+      # @api private
+      # @since 2.2.0
+      attr_reader :to, :params
+
+      # @api private
+      # @since 2.2.0
+      def initialize(route, to, constraints)
+        @route = route
+        @to = to
+        @constraints = constraints
+        @params = nil
+      end
+
+      # @api private
+      # @since 2.2.0
+      def match(path)
+        match = matcher.match(path)
+
+        @params = match.named_captures if match
+
+        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/node.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "hanami/router/segment"
+require "hanami/router/leaf"
 
 module Hanami
   class Router
@@ -18,15 +18,14 @@ module Hanami
       def initialize
         @variable = nil
         @fixed = nil
-        @to = nil
+        @leaves = nil
       end
 
       # @api private
       # @since 2.0.0
-      def put(segment, constraints)
+      def put(segment)
         if variable?(segment)
-          @variable ||= {}
-          @variable[segment_for(segment, constraints)] ||= self.class.new
+          @variable ||= self.class.new
         else
           @fixed ||= {}
           @fixed[segment] ||= self.class.new
@@ -35,36 +34,21 @@ module Hanami
 
       # @api private
       # @since 2.0.0
-      #
-      def get(segment) # rubocop:disable Metrics/PerceivedComplexity
-        return unless @variable || @fixed
-
-        found = nil
-        captured = nil
-
-        found = @fixed&.fetch(segment, nil)
-        return [found, nil] if found
-
-        @variable&.each do |matcher, node|
-          break if found
-
-          captured = matcher.match(segment)
-          found = node if captured
-        end
-
-        [found, captured&.named_captures]
+      def get(segment)
+        @fixed&.fetch(segment, nil) || @variable
       end
 
       # @api private
       # @since 2.0.0
-      def leaf?
-        @to
+      def leaf!(route, to, constraints)
+        @leaves ||= []
+        @leaves << Leaf.new(route, to, constraints)
       end
 
       # @api private
-      # @since 2.0.0
-      def leaf!(to)
-        @to = to
+      # @since 2.2.0
+      def match(path)
+        @leaves&.find { |leaf| leaf.match(path) }
       end
 
       private
@@ -74,18 +58,6 @@ module Hanami
       def variable?(segment)
         Router::ROUTE_VARIABLE_MATCHER.match?(segment)
       end
-
-      # @api private
-      # @since 2.0.0
-      def segment_for(segment, constraints)
-        Segment.fabricate(segment, **constraints)
-      end
-
-      # @api private
-      # @since 2.0.0
-      def fixed?(matcher)
-        matcher.names.empty?
-      end
     end
   end
 end

data/lib/hanami/router/trie.rb

@@ -21,33 +21,26 @@ module Hanami
 
       # @api private
       # @since 2.0.0
-      def add(path, to, constraints)
+      def add(route, to, constraints)
+        segments = segments_from(route)
         node = @root
-        for_each_segment(path) do |segment|
-          node = node.put(segment, constraints)
+
+        segments.each do |segment|
+          node = node.put(segment)
         end
 
-        node.leaf!(to)
+        node.leaf!(route, to, constraints)
       end
 
       # @api private
       # @since 2.0.0
       def find(path)
+        segments = segments_from(path)
         node = @root
-        params = {}
-
-        for_each_segment(path) do |segment|
-          break unless node
 
-          child, captures = node.get(segment)
-          params.merge!(captures) if captures
-
-          node = child
-        end
+        return unless segments.all? { |segment| node = node.get(segment) }
 
-        return [node.to, params] if node&.leaf?
-
-        nil
+        node.match(path)&.then { |found| [found.to, found.params] }
       end
 
       private
@@ -58,10 +51,11 @@ module Hanami
       private_constant :SEGMENT_SEPARATOR
 
       # @api private
-      # @since 2.0.0
-      def for_each_segment(path, &blk)
+      # @since 2.2.0
+      def segments_from(path)
         _, *segments = path.split(SEGMENT_SEPARATOR)
-        segments.each(&blk)
+
+        segments
       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.rc1"
+    VERSION = "2.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami-router
 version: !ruby/object:Gem::Version
-  version: 2.2.0.rc1
+  version: 2.2.0
 platform: ruby
 authors:
 - Luca Guidi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-29 00:00:00.000000000 Z
+date: 2024-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -171,6 +171,7 @@ files:
 - lib/hanami/router/formatter/human_friendly.rb
 - lib/hanami/router/globbed_path.rb
 - lib/hanami/router/inspector.rb
+- lib/hanami/router/leaf.rb
 - lib/hanami/router/mounted_path.rb
 - lib/hanami/router/node.rb
 - lib/hanami/router/params.rb