plutonium 0.18.4 → 0.18.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3fb21e14c1e59fae04a219cec33b1a5e4cb70f45bd65b225a1a03eae4bef2a22
-  data.tar.gz: a85a28e236f423102d8c980c71c41817ee8b69dd25a966e001b5172774afdcf4
+  metadata.gz: d1f2533a233b5da2a308e4561e48269ffd70f116143b60a4c67b53c5488b3b4e
+  data.tar.gz: cf4f9a1758eed8cead02556e88f7f860a2e4922542ac6f41c937ef01a69cf308
 SHA512:
-  metadata.gz: 6e59eb75688654e50018aae1fc931175f17200168522537cab05480f0a317ea3e64bf04db9f556775efb92cedf532b9fa1fd91ec8be57503d892cd68eb40b225
-  data.tar.gz: c61a6183c890e6d47dd35ab54d055d54ecf31d48c09642a144757f9032c945465306db11c91f6b1535188d92d8e2de1cf0f79e071bd14c71b09aff7c15576f15
+  metadata.gz: ee3eb7c3309b7037d40bb19f23d1e6d01f3b362e5224bea386c3316ed786276061557a6615387f3285bce82aa8aec26e2ea93eba56a5041e33b28e31df61cd77
+  data.tar.gz: 6c911c0b178a4060cc5f8ae01c6653a3c856df8a8937612a87914fdf7baaf8e89ef2ed0d3aa60b43f0453268822ce9ad0af4311743d6f0515e6e8b618572b0ed

data/lib/plutonium/core/controller.rb

@@ -70,7 +70,8 @@ module Plutonium
           else
             controller_chain << element.class.to_s.pluralize
             if index == args.length - 1
-              url_args[:id] = element.to_param
+              resource_route_config = current_engine.routes.resource_route_config_for(element.model_name.plural)[0]
+              url_args[:id] = element.to_param unless resource_route_config[:route_type] == :resource
               url_args[:action] ||= :show
             else
               url_args[element.model_name.singular_route_key.to_sym] = element.to_param

data/lib/plutonium/resource/controller.rb

@@ -49,11 +49,25 @@ module Plutonium
         self.class.resource_class
       end
 
-      # Returns the resource record based on path parameters
-      # @return [ActiveRecord::Base, nil] The resource record
+      def resource_record_relation
+        @resource_record_relation ||= begin
+          resource_route_config = current_engine.routes.resource_route_config_for(resource_class.model_name.plural)[0]
+          if resource_route_config[:route_type] == :resource
+            current_authorized_scope
+          elsif params[:id]
+            current_authorized_scope.from_path_param(params[:id])
+          else
+            current_authorized_scope.none
+          end
+        end
+      end
+
       def resource_record
-        @resource_record ||= current_authorized_scope.from_path_param(params[:id]).first! if params[:id]
-        @resource_record
+        @resource_record ||= resource_record_relation.first!
+      end
+
+      def resource_record?
+        @resource_record ||= resource_record_relation.first
       end
 
       # Returns the submitted resource parameters

data/lib/plutonium/resource/controllers/authorizable.rb

@@ -144,7 +144,13 @@ module Plutonium
         #
         # @return [Object] the subject for the policy (either resource_record or resource_class)
         def current_policy_subject
-          resource_record || resource_class
+          # We have an "inconsistency" here where resource_record?
+          # will return an actual record instead of nil for routes such as :new when dealing with singular resources.
+          # It impacts mainly attribute policies, such as when getting the allowed attributes for forms.
+          # But while it is an an inconsistency, I believe it is expected behaviour.
+          # You did mark the resource as singular after all.
+          # So you should disable :create? in your policy when a record exists.
+          resource_record? || resource_class
         end
       end
     end

data/lib/plutonium/routing/mapper_extensions.rb

@@ -19,7 +19,7 @@ module Plutonium
       # @yield An optional block for additional resource configuration.
       # @return [void]
       def register_resource(resource, options = {}, &)
-        route_config = route_set.register_resource(resource, &)
+        route_config = route_set.register_resource(resource, options, &)
         define_resource_routes(route_config, resource)
         resource_route_concern_names << route_config[:concern_name]
       end
@@ -65,7 +65,7 @@ module Plutonium
       # @return [void]
       def define_resource_routes(route_config, resource)
         concern route_config[:concern_name] do
-          resources route_config[:route_name], **route_config[:route_options] do
+          send route_config[:route_type], route_config[:route_name], **route_config[:route_options] do
             instance_exec(&route_config[:block]) if route_config[:block]
             define_nested_resource_routes(resource)
           end

data/lib/plutonium/routing/route_set_extensions.rb

@@ -49,17 +49,18 @@ module Plutonium
       # Registers a resource for routing.
       #
       # @param resource [Class] The resource class to be registered.
+      # @param options [Hash] Additional options for resource registration.
       # @yield An optional block for additional resource configuration.
       # @return [Hash] The configuration for the registered resource.
       # @raise [ArgumentError] If the engine is not supported.
-      def register_resource(resource, &)
+      def register_resource(resource, options = {}, &)
         self.class.validate_engine! engine
         engine.resource_register.register(resource)
 
         route_name = resource.model_name.plural
         concern_name = :"#{route_name}_routes"
 
-        config = create_resource_config(resource, route_name, concern_name, &)
+        config = create_resource_config(resource, route_name, concern_name, options, &)
         resource_route_config_lookup[route_name] = config
 
         config
@@ -101,15 +102,17 @@ module Plutonium
       # @param resource_name [String] The name of the resource.
       # @param route_name [String] The pluralized name for routes.
       # @param concern_name [Symbol] The name of the concern for this resource.
+      # @param options [Hash] Additional options for resource registration.
       # @yield An optional block for additional resource configuration.
       # @return [Hash] The complete resource configuration.
-      def create_resource_config(resource, route_name, concern_name, &block)
+      def create_resource_config(resource, route_name, concern_name, options = {}, &block)
         {
+          route_type: options[:singular] ? :resource : :resources,
           route_name: route_name,
           concern_name: concern_name,
           route_options: {
             controller: resource.to_s.pluralize.underscore,
-            path: resource.model_name.collection,
+            path: options[:singular] ? resource.model_name.singular : resource.model_name.collection,
             concerns: %i[interactive_resource_actions]
           },
           block: block

data/lib/plutonium/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plutonium
 version: !ruby/object:Gem::Version
-  version: 0.18.4
+  version: 0.18.5
 platform: ruby
 authors:
 - Stefan Froelich
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-12-31 00:00:00.000000000 Z
+date: 2025-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zeitwerk