typelizer 0.13.0 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9a7d9dfc60b5b5b8432575016f4f63697b6c6e356d74044abf6646b7d8e10a6
-  data.tar.gz: 374654bfb99f5bb3363b7a21174bb4c4a52718d2b852d4597e80aa155ce6fa34
+  metadata.gz: 90a122983cb647f8c395b12c44b59217994cba0d61db2fb71b942d5bbeb21de7
+  data.tar.gz: 444b8aec0943fec8e53d041013ce5d1d5c0c51215184fe5a515a5cdd53de9714
 SHA512:
-  metadata.gz: 3886301d0db29ef0ed101f5edf76e6228501672f5750c0109a854e142f880c1cd24a71fea9ca352caa888697f801302283b679e36ac61ea19c87e8c9b73ecfb4
-  data.tar.gz: bf5b5cdc3748500355aa1bac6d2f0dc035a4776080e06bee523c369cf33177ed24f1e92702e42366e5a7b1e72994696ff32dc52f55295f66bbf48f7961c5e2a5
+  metadata.gz: 1320f55fab8636e726a56494c4add8e746af0e06970a2e6ede1ae0b7e09daa3f7bb4a406533dd666d7bedbbe0aab90a2d70409b07af44e5260e10dc068217a05
+  data.tar.gz: 1db53aabce4064e857efb3385f370d07253617556c6859c12883354a1ff55066e2115edca9be535d3c8409e74a8e8ee16b6cd807f42f23bcc2eba6bfb2c75330

data/CHANGELOG.md

@@ -7,6 +7,20 @@ and this project adheres to [Semantic Versioning].
 
 ## [Unreleased]
 
+## [0.13.1] - 2026-05-18
+
+### Added
+
+- `routes.include` and `routes.exclude` now accept a `Proc` (or any callable responding to `#call`) in addition to `Regexp`. Predicates receive the route-info hash (`:path`, `:name`, `:controller`, `:action`, `:verb`, `:required_parts`, `:optional_parts`) and must return truthy to match. Heterogeneous arrays are supported. Useful when the URL path alone can't disambiguate routes — e.g. multiple feature areas mounted under different subdomain constraints that share paths, or filtering by HTTP verb / helper name. ([@pastpatryk])
+
+  ```ruby
+  config.routes.include = ->(r) { r[:controller].to_s.start_with?("admin/") }
+  ```
+
+### Fixed
+
+- Unnamed alias routes sharing `controller#action` with a named route (e.g. ActiveStorage representations) no longer inherit the named route's name. Name lookup now matches by `[controller, path]` instead of `[controller, action]`, so distinct paths produce distinct entries. ([@skryukov])
+
 ## [0.13.0] - 2026-05-01
 
 ### Added
@@ -495,6 +509,7 @@ and this project adheres to [Semantic Versioning].
 [@nkriege]: https://github.com/nkriege
 [@NOX73]: https://github.com/NOX73
 [@okuramasafumi]: https://github.com/okuramasafumi
+[@pastpatryk]: https://github.com/pastpatryk
 [@patvice]: https://github.com/patvice
 [@pgiblock]: https://github.com/pgiblock
 [@PedroAugustoRamalhoDuarte]: https://github.com/PedroAugustoRamalhoDuarte
@@ -503,7 +518,8 @@ and this project adheres to [Semantic Versioning].
 [@skryukov]: https://github.com/skryukov
 [@ventsislaf]: https://github.com/ventsislaf
 
-[Unreleased]: https://github.com/skryukov/typelizer/compare/v0.13.0...HEAD
+[Unreleased]: https://github.com/skryukov/typelizer/compare/v0.13.1...HEAD
+[0.13.1]: https://github.com/skryukov/typelizer/compare/v0.13.0...v0.13.1
 [0.13.0]: https://github.com/skryukov/typelizer/compare/v0.12.0...v0.13.0
 [0.12.0]: https://github.com/skryukov/typelizer/compare/v0.11.0...v0.12.0
 [0.11.0]: https://github.com/skryukov/typelizer/compare/v0.10.0...v0.11.0

data/lib/typelizer/route_generator.rb

@@ -33,14 +33,14 @@ module Typelizer
         Rails.application.reload_routes_unless_loaded
       end
 
-      name_by_action, name_by_path = build_name_lookups(Rails.application.routes.named_routes)
+      named_paths = build_named_paths(Rails.application.routes.named_routes)
 
       routes = Rails.application.routes.routes.flat_map do |route|
         app = route.app.app
         if app.is_a?(Class) && app < Rails::Engine
           collect_engine_routes(route, app) || []
         else
-          build_route_info(route, name_by_action, name_by_path)
+          build_route_info(route, named_paths)
         end
       end.compact
 
@@ -51,50 +51,48 @@ module Typelizer
 
       if config.include
         patterns = Array(config.include)
-        routes = routes.select { |r| patterns.any? { |p| r[:path].match?(p) } }
+        routes = routes.select { |r| patterns.any? { |p| match_route?(r, p) } }
       end
       if config.exclude
         patterns = Array(config.exclude)
-        routes = routes.reject { |r| patterns.any? { |p| r[:path].match?(p) } }
+        routes = routes.reject { |r| patterns.any? { |p| match_route?(r, p) } }
       end
 
       routes
     end
 
-    def build_name_lookups(named_routes, path_prefix: "", name_prefix: "")
-      name_by_action = {}
-      name_by_path = {}
+    def match_route?(route_info, pattern)
+      if pattern.respond_to?(:call)
+        pattern.call(route_info)
+      else
+        route_info[:path].match?(pattern)
+      end
+    end
 
-      named_routes.each do |name, route|
+    def build_named_paths(named_routes, path_prefix: "")
+      named_routes.each_with_object(Set.new) do |(_name, route), paths|
         controller = route.requirements[:controller]
         action = route.requirements[:action]
         next unless controller && action
 
-        path = path_prefix + strip_format(route.path.spec.to_s)
-        prefixed_name = "#{name_prefix}#{name}"
-        name_by_action[[controller, action]] = prefixed_name
-        name_by_path[[controller, path]] = prefixed_name
+        paths << [controller, path_prefix + strip_format(route.path.spec.to_s)]
       end
-
-      [name_by_action, name_by_path]
     end
 
     def strip_format(path)
       path.sub(FORMAT_SUFFIX, "")
     end
 
-    def build_route_info(route, name_by_action, name_by_path)
+    def build_route_info(route, named_paths)
       controller = route.requirements[:controller]
       action = route.requirements[:action]
 
       path = strip_format(route.path.spec.to_s)
 
       if controller.present? && action.present?
-        has_own_name = !!route.name
-        name = route.name || name_by_action[[controller, action]]
-        name ||= name_by_path[[controller, path]] ? action : nil
+        # Match by [controller, path] so unnamed aliases at distinct paths (e.g. ActiveStorage representations) don't inherit a sibling's name
+        name = route.name || (action if named_paths.include?([controller, path]))
       elsif route.name.present?
-        has_own_name = true
         name = route.name.to_s
         controller = "_routes"
         action = name
@@ -110,7 +108,7 @@ module Typelizer
 
       {
         name: name,
-        named: has_own_name || !!name_by_action[[controller, action]],
+        named: !!route.name,
         controller: controller,
         action: action,
         verb: verb,
@@ -125,14 +123,10 @@ module Typelizer
       engine_name = mount_route.name
       return unless engine_name
 
-      name_by_action, name_by_path = build_name_lookups(
-        engine.routes.named_routes,
-        path_prefix: mount_prefix,
-        name_prefix: "#{engine_name}_"
-      )
+      named_paths = build_named_paths(engine.routes.named_routes, path_prefix: mount_prefix)
 
       engine.routes.routes.filter_map do |engine_route|
-        info = build_route_info(engine_route, name_by_action, name_by_path)
+        info = build_route_info(engine_route, named_paths)
         next unless info
         info[:path] = mount_prefix + info[:path]
         info

data/lib/typelizer/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Typelizer
-  VERSION = "0.13.0"
+  VERSION = "0.13.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: typelizer
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.13.1
 platform: ruby
 authors:
 - Svyatoslav Kryukov