plutonium 0.42.0 → 0.43.0

data/lib/generators/pu/profile/install_generator.rb

@@ -0,0 +1,119 @@
+# frozen_string_literal: true
+
+require "rails/generators/base"
+require_relative "../lib/plutonium_generators"
+require_relative "concerns/profile_arguments"
+
+module Pu
+  module Profile
+    class InstallGenerator < ::Rails::Generators::Base
+      include PlutoniumGenerators::Generator
+      include Concerns::ProfileArguments
+
+      desc "Generate a Profile resource for managing Rodauth account settings"
+
+      class_option :user_model, type: :string, default: "User",
+        desc: "The Rodauth user model"
+
+      class_option :dest, type: :string,
+        desc: "Package where the Profile resource should be created"
+
+      def start
+        normalize_arguments
+        generate_profile_scaffold
+        add_user_association
+        add_unique_index_to_migration
+      rescue => e
+        exception "#{self.class} failed:", e
+      end
+
+      private
+
+      def generate_profile_scaffold
+        invoke "pu:res:scaffold", [@profile_name, *scaffold_attributes],
+          dest: selected_destination_feature,
+          force: options[:force],
+          skip: options[:skip]
+      end
+
+      def add_user_association
+        association = if dest_package?
+          "  has_one :#{file_name}, class_name: \"#{namespaced_class_name}\", dependent: :destroy\n"
+        else
+          "  has_one :#{file_name}, dependent: :destroy\n"
+        end
+        inject_into_file user_model_path, association,
+          before: /^\s*# add has_one associations above\.\n/
+      end
+
+      def add_unique_index_to_migration
+        migration_file = Dir[File.join(migration_dir, "*_create_#{table_name}.rb")].first
+        unless migration_file
+          say_status :warning, "Migration file not found in #{migration_dir}, skipping unique index", :yellow
+          return
+        end
+
+        # Add unique: true to the user reference for has_one relationship
+        gsub_file migration_file,
+          /t\.belongs_to :#{user_table}, null: false, foreign_key: true/,
+          "t.belongs_to :#{user_table}, null: false, foreign_key: true, index: {unique: true}"
+      end
+
+      def class_name
+        @profile_name.camelize
+      end
+
+      def namespaced_class_name
+        if dest_package?
+          "#{dest_name.camelize}::#{class_name}"
+        else
+          class_name
+        end
+      end
+
+      def file_name
+        @profile_name.underscore
+      end
+
+      def user_table
+        options[:user_model].underscore
+      end
+
+      def user_model_path
+        "app/models/#{user_table}.rb"
+      end
+
+      def dest_package?
+        selected_destination_feature != "main_app"
+      end
+
+      def dest_name
+        selected_destination_feature
+      end
+
+      def migration_dir
+        if dest_package?
+          "packages/#{dest_name}/db/migrate"
+        else
+          "db/migrate"
+        end
+      end
+
+      def table_name
+        if dest_package?
+          "#{dest_name}_#{file_name.pluralize}"
+        else
+          file_name.pluralize
+        end
+      end
+
+      def scaffold_attributes
+        ["#{user_table}:belongs_to", *@profile_attributes.map(&:to_s)]
+      end
+
+      def selected_destination_feature
+        feature_option :dest, prompt: "Select destination feature"
+      end
+    end
+  end
+end

data/lib/generators/pu/profile/setup/USAGE

@@ -0,0 +1,42 @@
+Description:
+    Generate a complete Profile setup: creates the resource and connects it to a portal.
+    This combines pu:profile:install and pu:profile:conn into a single command.
+
+Usage:
+    rails g pu:profile:setup [NAME] [field:type ...] --dest=PACKAGE --portal=PORTAL
+
+Arguments:
+    NAME                 Profile resource name (default: Profile)
+    field:type           Additional fields for the profile
+
+Options:
+    --dest=PACKAGE       Package where Profile resource is created
+    --portal=PORTAL      Portal to connect the Profile to
+    --user-model=NAME    Rodauth user model (default: User)
+
+Examples:
+    # Complete setup in one command
+    rails g pu:profile:setup date_of_birth:date bio:text \
+        --dest=competition \
+        --portal=competition_portal
+
+    # With custom name
+    rails g pu:profile:setup AccountSettings bio:text avatar:attachment \
+        --dest=main_app \
+        --portal=customer_portal
+
+    # Main app profile connected to admin portal
+    rails g pu:profile:setup --dest=main_app --portal=admin_portal
+
+What This Does:
+    1. Creates Profile resource (model, migration, controller, policy, definition)
+    2. Adds has_one :profile to User model
+    3. Adds unique index on user_id
+    4. Customizes policy for owner-only access
+    5. Adds SecuritySection to show page
+    6. Connects to portal as singular resource
+    7. Adds profile_url helper to portal
+
+Equivalent to running:
+    rails g pu:profile:install [NAME] [fields] --dest=PACKAGE
+    rails g pu:profile:conn [RESOURCE] --dest=PORTAL

data/lib/generators/pu/profile/setup_generator.rb

@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+require "rails/generators/base"
+require_relative "../lib/plutonium_generators"
+require_relative "concerns/profile_arguments"
+
+module Pu
+  module Profile
+    class SetupGenerator < ::Rails::Generators::Base
+      include PlutoniumGenerators::Generator
+      include Concerns::ProfileArguments
+
+      desc "Generate a complete Profile setup with resource and portal connection"
+
+      class_option :user_model, type: :string, default: "User",
+        desc: "The Rodauth user model"
+
+      class_option :dest, type: :string,
+        desc: "Package where the Profile resource should be created"
+
+      class_option :portal, type: :string,
+        desc: "Portal to connect the Profile to"
+
+      def start
+        normalize_arguments
+        generate_profile
+        connect_to_portal if options[:portal].present?
+      rescue => e
+        exception "#{self.class} failed:", e
+      end
+
+      private
+
+      def generate_profile
+        klass = Rails::Generators.find_by_namespace("pu:profile:install")
+        klass.new(
+          [@profile_name, *@profile_attributes],
+          {
+            user_model: options[:user_model],
+            dest: selected_destination_feature,
+            force: options[:force],
+            skip: options[:skip]
+          }
+        ).invoke_all
+      end
+
+      def connect_to_portal
+        # Shell out to a new process so the newly created model file gets loaded
+        generate "pu:profile:conn", "#{resource_class_name} --dest=#{options[:portal]} --user-model=#{options[:user_model]}"
+      end
+
+      def resource_class_name
+        if dest_package?
+          "#{dest_name.camelize}::#{@profile_name.camelize}"
+        else
+          @profile_name.camelize
+        end
+      end
+
+      def dest_package?
+        selected_destination_feature != "main_app"
+      end
+
+      def dest_name
+        selected_destination_feature
+      end
+
+      def selected_destination_feature
+        @selected_destination_feature ||= feature_option :dest, prompt: "Select destination feature"
+      end
+    end
+  end
+end

data/lib/generators/pu/rodauth/account_generator.rb

@@ -1,19 +1,17 @@
-return unless defined?(Rodauth::Rails)
-
 require "rails/generators/base"
 require "securerandom"
 
 require "#{__dir__}/concerns/configuration"
 require "#{__dir__}/concerns/account_selector"
 require "#{__dir__}/concerns/feature_selector"
-require "#{__dir__}/concerns/gem_helpers"
+require "#{__dir__}/../lib/plutonium_generators/concerns/actions"
 
 module Pu
   module Rodauth
     class AccountGenerator < ::Rails::Generators::Base
       include Concerns::AccountSelector
       include Concerns::FeatureSelector
-      include Concerns::GemHelpers
+      include PlutoniumGenerators::Concerns::Actions
 
       source_root "#{__dir__}/templates"
 

data/lib/generators/pu/rodauth/install_generator.rb

@@ -2,13 +2,13 @@ require "rails/generators/base"
 require "rails/generators/active_record/migration"
 require "securerandom"
 
-require "#{__dir__}/concerns/gem_helpers"
+require "#{__dir__}/../lib/plutonium_generators/concerns/actions"
 
 module Pu
   module Rodauth
     class InstallGenerator < ::Rails::Generators::Base
       include ::ActiveRecord::Generators::Migration
-      include Concerns::GemHelpers
+      include PlutoniumGenerators::Concerns::Actions
 
       source_root "#{__dir__}/templates"
 

data/lib/generators/pu/rodauth/templates/app/rodauth/account_rodauth_plugin.rb.tt

@@ -290,6 +290,9 @@ class <%= account_path.classify %>RodauthPlugin < RodauthPlugin
 <% end -%>
 <% if reset_password? -%>
 
+    # Redirect to login page after requesting password reset.
+    reset_password_email_sent_redirect { login_path }
+
     # Redirect to login page after password reset.
     reset_password_redirect { login_path }
 <% end -%>

data/lib/generators/pu/saas/api_client_generator.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-return unless defined?(Rodauth::Rails)
-
 require "rails/generators/named_base"
 require_relative "../lib/plutonium_generators"
 

data/lib/generators/pu/saas/membership_generator.rb

@@ -39,14 +39,14 @@ module Pu
 
       def validate_models_exist!
         user_model_path = File.join("app", "models", "#{normalized_user_name}.rb")
-        entity_model_path = File.join("app", "models", "#{normalized_entity_name}.rb")
+        entity_model_path = File.join(dest_root, "app", "models", "#{full_entity_path}.rb")
 
         unless File.exist?(Rails.root.join(user_model_path))
           raise "User model '#{normalized_user_name}' does not exist at #{user_model_path}. Please create it first with: rails g pu:saas:user #{options[:user]}"
         end
 
-        unless File.exist?(Rails.root.join(entity_model_path))
-          raise "Entity model '#{normalized_entity_name}' does not exist at #{entity_model_path}. Please create it first with: rails g pu:saas:entity #{options[:entity]}"
+        unless File.exist?(entity_model_path)
+          raise "Entity model '#{full_entity_path}' does not exist at #{entity_model_path}. Please create it first with: rails g pu:saas:entity #{options[:entity]}"
         end
       end
 
@@ -63,7 +63,7 @@ module Pu
         return unless migration_file
 
         insert_into_file migration_file,
-          indent("add_index :#{membership_table_name}, [:#{normalized_entity_name}_id, :#{normalized_user_name}_id], unique: true\n", 4),
+          indent("add_index :#{full_membership_table_name}, [:#{normalized_entity_name}_id, :#{normalized_user_name}_id], unique: true\n", 4),
           before: /^  end\s*$/
       end
 
@@ -78,18 +78,18 @@ module Pu
       end
 
       def add_role_enum_to_model
-        model_file = File.join("app", "models", "#{membership_model_name}.rb")
+        model_file = File.join(dest_root, "app", "models", "#{full_membership_path}.rb")
 
-        return unless File.exist?(Rails.root.join(model_file))
+        return unless File.exist?(model_file)
 
         enum_definition = "enum :role, #{roles_enum}\n"
         insert_into_file model_file, indent(enum_definition, 2), before: /^\s*# add enums above\./
       end
 
       def add_unique_validation_to_model
-        model_file = File.join("app", "models", "#{membership_model_name}.rb")
+        model_file = File.join(dest_root, "app", "models", "#{full_membership_path}.rb")
 
-        return unless File.exist?(Rails.root.join(model_file))
+        return unless File.exist?(model_file)
 
         validation = "validates :#{normalized_user_name}, uniqueness: {scope: :#{normalized_entity_name}_id, message: \"is already a member of this #{normalized_entity_name.humanize.downcase}\"}\n"
         insert_into_file model_file, indent(validation, 2), before: /^\s*# add validations above\./
@@ -101,9 +101,9 @@ module Pu
       end
 
       def add_association_to_entity_model
-        entity_model_path = File.join("app", "models", "#{normalized_entity_name}.rb")
+        entity_model_path = File.join(dest_root, "app", "models", "#{full_entity_path}.rb")
 
-        return unless File.exist?(Rails.root.join(entity_model_path))
+        return unless File.exist?(entity_model_path)
 
         associations = <<~RUBY
           has_many :#{membership_table_name}, dependent: :destroy
@@ -117,17 +117,24 @@ module Pu
 
         return unless File.exist?(Rails.root.join(user_model_path))
 
-        associations = <<~RUBY
-          has_many :#{membership_table_name}, dependent: :destroy
-          has_many :#{normalized_entity_name.pluralize}, through: :#{membership_table_name}
-        RUBY
+        associations = if dest_namespace
+          <<~RUBY
+            has_many :#{membership_table_name}, class_name: "#{full_membership_class_name}", dependent: :destroy
+            has_many :#{normalized_entity_name.pluralize}, through: :#{membership_table_name}, source: :#{normalized_entity_name}
+          RUBY
+        else
+          <<~RUBY
+            has_many :#{membership_table_name}, dependent: :destroy
+            has_many :#{normalized_entity_name.pluralize}, through: :#{membership_table_name}
+          RUBY
+        end
         inject_into_file user_model_path, indent(associations, 2), before: /^\s*# add has_many associations above\.\n/
       end
 
       def add_associated_with_scope_to_entity
-        entity_model_path = File.join("app", "models", "#{normalized_entity_name}.rb")
+        entity_model_path = File.join(dest_root, "app", "models", "#{full_entity_path}.rb")
 
-        return unless File.exist?(Rails.root.join(entity_model_path))
+        return unless File.exist?(entity_model_path)
 
         scope_code = <<~RUBY
           scope :associated_with_#{normalized_user_name}, ->(#{normalized_user_name}) { joins(:#{membership_table_name}).where(#{membership_table_name}: {#{normalized_user_name}_id: #{normalized_user_name}.id}) }
@@ -136,8 +143,8 @@ module Pu
       end
 
       def find_migration_file
-        migration_dir = File.join("db", "migrate")
-        Dir[Rails.root.join(migration_dir, "*_create_#{membership_table_name}.rb")].first
+        migration_dir = File.join(dest_root, "db", "migrate")
+        Dir[File.join(migration_dir, "*_create_#{full_membership_table_name}.rb")].first
       end
 
       def membership_model_name
@@ -150,7 +157,7 @@ module Pu
 
       def membership_attributes
         [
-          "#{normalized_entity_name}:references",
+          "#{full_entity_name}:references",
           "#{normalized_user_name}:references",
           "role:integer",
           *Array(options[:extra_attributes])
@@ -161,6 +168,48 @@ module Pu
 
       def normalized_entity_name = options[:entity].underscore
 
+      def dest_namespace
+        return nil if main_app?
+
+        selected_destination_feature.underscore
+      end
+
+      def main_app?
+        selected_destination_feature == "main_app"
+      end
+
+      def dest_root
+        if main_app?
+          Rails.root
+        else
+          Rails.root.join("packages", dest_namespace)
+        end
+      end
+
+      def full_entity_path
+        [dest_namespace, normalized_entity_name].compact.join("/")
+      end
+
+      def full_membership_path
+        [dest_namespace, membership_model_name].compact.join("/")
+      end
+
+      def full_entity_name
+        full_entity_path
+      end
+
+      def full_membership_table_name
+        full_membership_path.tr("/", "_").pluralize
+      end
+
+      def full_membership_class_name
+        full_membership_path.camelize
+      end
+
+      def full_entity_class_name
+        full_entity_path.camelize
+      end
+
       def roles
         Array(options[:roles]).flat_map { |r| r.split(",") }.map(&:strip)
       end

data/lib/generators/pu/saas/setup_generator.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-return unless defined?(Rodauth::Rails)
-
 require "rails/generators/base"
 require_relative "../lib/plutonium_generators"
 
@@ -46,6 +44,7 @@ module Pu
         desc: "Available roles for API client memberships"
 
       def start
+        ensure_rodauth_installed
         generate_user
         generate_entity unless options[:skip_entity]
         generate_membership unless options[:skip_membership]
@@ -56,6 +55,12 @@ module Pu
 
       private
 
+      def ensure_rodauth_installed
+        return if File.exist?(Rails.root.join("app/rodauth/rodauth_app.rb"))
+
+        invoke "pu:rodauth:install"
+      end
+
       def generate_user
         # Use class-based invocation to avoid Thor's invoke caching
         klass = Rails::Generators.find_by_namespace("pu:saas:user")

data/lib/generators/pu/saas/user_generator.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-return unless defined?(Rodauth::Rails)
-
 require "rails/generators/named_base"
 require_relative "../lib/plutonium_generators"
 

data/lib/plutonium/auth/rodauth.rb

@@ -9,6 +9,7 @@ module Plutonium
           included do
             helper_method :current_user
             helper_method :logout_url
+            helper_method :profile_url
           end
 
           private
@@ -27,6 +28,13 @@ module Plutonium
             rodauth.logout_path
           end
 
+          # Override this method to return your profile page URL.
+          # When defined, a "Profile" link will appear in the user menu.
+          # Example: rodauth.change_password_path or your custom profile_path
+          def profile_url
+            nil
+          end
+
           define_singleton_method(:to_s) { "Plutonium::Auth::Rodauth(:#{name})" }
           define_singleton_method(:inspect) { "Plutonium::Auth::Rodauth(:#{name})" }
         RUBY

data/lib/plutonium/core/controller.rb

@@ -207,7 +207,11 @@ module Plutonium
             url_args[:action] ||= :index if index == args.length - 1
           elsif element.is_a?(Class)
             controller_chain << element.to_s.pluralize
-            url_args[:action] ||= :index if index == args.length - 1 && parent.present?
+            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
@@ -223,8 +227,7 @@ module Plutonium
               else
                 model_class.model_name.plural
               end
-              resource_route_config = current_engine.routes.resource_route_config_for(route_key)[0]
-              is_singular = resource_route_config&.dig(:route_type) == :resource
+              is_singular = current_engine.routes.singular_resource_route?(route_key)
               url_args[:id] = element.to_param unless is_singular
               url_args[:action] ||= :show
             else
@@ -236,7 +239,7 @@ module Plutonium
 
         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
+          url_args[scoped_entity_param_key] = current_scoped_entity.to_param
         end
 
         if !url_args.key?(:format) && request.present? && request.format.present? && !request.format.symbol.in?([:html, :turbo_stream])

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

@@ -30,7 +30,11 @@ module Plutonium
         end
 
         def entity_scope_for_authorize
-          current_scoped_entity if scoped_to_entity?
+          # Use the instance variable directly to avoid circular dependency.
+          # When authorizing the scoped entity itself (in fetch_current_scoped_entity),
+          # @current_scoped_entity is not yet set, so this returns nil, which is correct
+          # since we can't use the entity as its own authorization scope.
+          @current_scoped_entity if scoped_to_entity?
         end
 
         def verify_authorized

data/lib/plutonium/definition/base.rb

@@ -75,6 +75,13 @@ module Plutonium
       # global default
       breadcrumbs true
 
+      # forms
+      # Controls the "Save and add another" / "Update and continue editing" buttons
+      # nil = auto-detect (hidden for singular resources, shown for plural)
+      # true = always show
+      # false = always hide
+      inheritable_config_attr :submit_and_continue
+
       def initialize
         super
       end

data/lib/plutonium/helpers/display_helper.rb

@@ -14,6 +14,12 @@ module Plutonium
         resource_name resource_class, 2
       end
 
+      # Returns the appropriate label for a resource (singular for singular resources, plural otherwise)
+      def resource_label(resource_class)
+        is_singular = current_engine.routes.singular_resource_route?(resource_class.model_name.plural)
+        resource_name(resource_class, is_singular ? 1 : 2)
+      end
+
       # Returns a human-readable name for a nested collection using the association name.
       # Falls back to resource_name_plural if not in a nested context.
       # Uses I18n via human_attribute_name for proper localization.