plutonium 0.45.0 → 0.45.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1073fa6b607e230a752fac717f223a0b641179b3c2b93b67d941d40b6dea07e2
-  data.tar.gz: 28da869f69c58a437c102be436ddb31f4017795dba17b244a8f2db15a15c7bea
+  metadata.gz: 2ec1a124615fb8539ddbdb8385100efb6ccfb4d2ff300dc2aef1610291bb8033
+  data.tar.gz: 5ff37e475beac544e0cfc892890799f2528bd110010bd807796e48bff493a1c5
 SHA512:
-  metadata.gz: 11b347e6f98eaeb7a3cc93c75d3c67483107ddc3d822780ce9bcb12901af3b3d9c7fe7996b7bacffc3ea32528ebbab5a9affb54d9bfb56dbeec49cb40da92f46
-  data.tar.gz: 5c0a5d6f4988980b8195cdd4d27d1c28189a8cc6d34c889136b73f512f6cd88ecaf2851af52ef666e68f1c5b66802fac570831ce6608c195d707871b5b35d899
+  metadata.gz: 7684effe6531a638833ad9c19166c080a61de1b3dd5b9d4a8e9c7189b5201bb67c7d48c25f05dca5cf974fa9351866d4ce6877dd0c470d97cf3e6154a5a59a1b
+  data.tar.gz: 1cbcf77b215cc0f19f1c15738ad5c6add48cabc6f1b687ac960379062fab3b49376956d2ef72edc758168259ab7e821709c8bd69b033009c95c8f06d56ec4f17

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## [0.45.1] - 2026-04-02
+
+### 🐛 Bug Fixes
+
+- *(routing)* Use named route helpers for top-level resource URLs
 ## [0.45.0] - 2026-04-01
 
 ### 🚀 Features

data/gemfiles/rails_7.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    plutonium (0.44.1)
+    plutonium (0.45.0)
       action_policy (~> 0.7.0)
       listen (~> 3.8)
       pagy (~> 43.0)

data/gemfiles/rails_8.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    plutonium (0.44.1)
+    plutonium (0.45.0)
       action_policy (~> 0.7.0)
       listen (~> 3.8)
       pagy (~> 43.0)

data/gemfiles/rails_8.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    plutonium (0.44.1)
+    plutonium (0.45.0)
       action_policy (~> 0.7.0)
       listen (~> 3.8)
       pagy (~> 43.0)

data/lib/plutonium/core/controller.rb

@@ -88,14 +88,16 @@ module Plutonium
       # @return [Hash] args to pass to `url_for`
       #
       def resource_url_args_for(*args, action: nil, parent: nil, association: nil, package: nil, **kwargs)
-        target_package = package || current_package
+        element = args.first
+
+        raise ArgumentError, "parent is required when using symbol association name" if element.is_a?(Symbol) && parent.nil?
 
         # For nested resources, use named route helpers to avoid Rails param recall ambiguity
         if parent.present?
-          assoc_name = if args.first.is_a?(Symbol)
-            args.first
+          assoc_name = if element.is_a?(Symbol)
+            element
           else
-            association || resolve_association(args.first, parent)
+            association || resolve_association(element, parent)
           end
 
           nested_route_key = "#{parent.class.model_name.plural}/#{assoc_name}"
@@ -103,7 +105,7 @@ module Plutonium
 
           if route_config
             return build_nested_resource_url_args(
-              args.first,
+              element,
               parent: parent,
               association_name: assoc_name,
               route_config: route_config,
@@ -113,8 +115,8 @@ module Plutonium
           end
         end
 
-        # Top-level resource: build controller/action hash for url_for
-        build_top_level_resource_url_args(*args, action: action, parent: parent, association: association, package: target_package, **kwargs)
+        # Top-level resource: use named route helpers
+        build_top_level_resource_url_args(element, action: action, **kwargs)
       end
 
       def resource_url_for(*args, package: nil, **kwargs)
@@ -202,61 +204,73 @@ module Plutonium
         {_named_route: helper_name, _args: helper_args, _options: url_options}
       end
 
-      def build_top_level_resource_url_args(*args, action: nil, parent: nil, association: nil, package: nil, **kwargs)
-        url_args = {**kwargs, action: action}.compact
-
-        controller_chain = [package&.to_s].compact
-        [*args].compact.each_with_index do |element, index|
-          if element.is_a?(Symbol)
-            raise ArgumentError, "parent is required when using symbol association name" unless parent
-
-            assoc = parent.class.reflect_on_association(element)
-            raise ArgumentError, "Unknown association :#{element} on #{parent.class}" unless assoc
-
-            controller_chain << assoc.klass.to_s.pluralize
-            url_args[:action] ||= :index if index == args.length - 1
-          elsif element.is_a?(Class)
-            controller_chain << element.to_s.pluralize
-            if index == args.length - 1
-              # Singular resources have no index, default to show
-              is_singular = current_engine.routes.singular_resource_route?(element.model_name.plural)
-              url_args[:action] ||= is_singular ? :show : :index
-            end
-          else
-            model_class = element.class
-            if model_class.respond_to?(:base_class) && model_class != model_class.base_class
-              route_configs = current_engine.routes.resource_route_config_for(model_class.model_name.plural)
-              model_class = model_class.base_class if route_configs.empty?
-            end
-
-            controller_chain << model_class.to_s.pluralize
-            if index == args.length - 1
-              route_key = if parent.present?
-                assoc_name = association || resolve_association(element, parent)
-                "#{parent.class.model_name.plural}/#{assoc_name}"
-              else
-                model_class.model_name.plural
-              end
-              is_singular = current_engine.routes.singular_resource_route?(route_key)
-              url_args[:id] = element.to_param unless is_singular
-              url_args[:action] ||= :show
-            else
-              url_args[model_class.to_s.underscore.singularize.to_sym] = element.to_param
-            end
+      # Build URL args for top-level resources using named route helpers.
+      # This avoids Rails url_for ambiguity when multiple routes map to the same controller
+      # (e.g., both /widgets/:id and /organization/nested_widgets/:id resolve to widgets#show).
+      def build_top_level_resource_url_args(element, action: nil, **kwargs)
+        # Resolve the model class for the target resource
+        if element.is_a?(Class)
+          model_class = element
+        elsif element
+          model_class = element.class
+          if model_class.respond_to?(:base_class) && model_class != model_class.base_class
+            route_configs = current_engine.routes.resource_route_config_for(model_class.model_name.plural)
+            model_class = model_class.base_class if route_configs.empty?
           end
         end
-        url_args[:controller] = "/#{controller_chain.join("::").underscore}"
 
-        url_args[:"#{parent.model_name.singular}_id"] = parent.to_param if parent.present?
-        if scoped_to_entity? && scoped_entity_strategy == :path
-          url_args[scoped_entity_param_key] = current_scoped_entity.to_param
+        route_key = model_class.model_name.plural
+        is_singular = current_engine.routes.singular_resource_route?(route_key)
+        no_record = element.is_a?(Class) || element.nil?
+
+        # Default action based on context
+        action ||= if no_record
+          is_singular ? :show : :index
+        else
+          :show
+        end
+
+        # Build named route helper, mirroring the pattern used by build_nested_resource_url_args.
+        # e.g., "organization_scope_widgets" (collection), "organization_scope_widget" (member),
+        #        "edit_organization_scope_widget" (edit action)
+        is_collection_action = action == :index || action == :create || (no_record && action != :new)
+        helper_base = if is_singular || is_collection_action
+          model_class.model_name.plural
+        else
+          model_class.model_name.singular
         end
 
-        if !url_args.key?(:format) && request.present? && request.format.present? && !request.format.symbol.in?([:html, :turbo_stream])
-          url_args[:format] = request.format.symbol
+        # For uncountable model names (plural == singular), Rails adds _index suffix
+        # to collection route names to disambiguate from member routes.
+        uncountable_index_suffix = if is_collection_action && !is_singular && model_class.model_name.plural == model_class.model_name.singular
+          "_index"
         end
 
-        url_args
+        helper_suffix = case action
+        when :show, :index, :create, :update then ""
+        else "#{action}_"
+        end
+
+        entity_prefix = if scoped_to_entity? && scoped_entity_strategy == :path
+          "#{scoped_entity_param_key}_"
+        end
+
+        helper_name = :"#{helper_suffix}#{entity_prefix}#{helper_base}#{uncountable_index_suffix}_path"
+
+        # Build the positional arguments for the helper
+        helper_args = []
+        helper_args << current_scoped_entity.to_param if entity_prefix
+        unless is_singular || no_record || is_collection_action
+          helper_args << element.to_param
+        end
+
+        # Build URL options
+        url_options = kwargs.dup
+        if !url_options.key?(:format) && request.present? && request.format.present? && !request.format.symbol.in?([:html, :turbo_stream])
+          url_options[:format] = request.format.symbol
+        end
+
+        {_named_route: helper_name, _args: helper_args, _options: url_options}
       end
 
       def root_path(*)

data/lib/plutonium/version.rb

@@ -1,5 +1,5 @@
 module Plutonium
-  VERSION = "0.45.0"
+  VERSION = "0.45.1"
   NEXT_MAJOR_VERSION = VERSION.split(".").tap { |v|
     v[1] = v[1].to_i + 1
     v[2] = 0

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@radioactive-labs/plutonium",
-  "version": "0.45.0",
+  "version": "0.45.1",
   "description": "Build production-ready Rails apps in minutes, not days. Convention-driven, fully customizable, AI-ready.",
   "type": "module",
   "main": "src/js/core.js",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: plutonium
 version: !ruby/object:Gem::Version
-  version: 0.45.0
+  version: 0.45.1
 platform: ruby
 authors:
 - Stefan Froelich
 bindir: exe
 cert_chain: []
-date: 2026-04-01 00:00:00.000000000 Z
+date: 2026-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zeitwerk