plutonium 0.42.0 → 0.43.1

data/lib/generators/pu/lib/plutonium_generators/model_generator_base.rb

@@ -117,11 +117,7 @@ module PlutoniumGenerators
             if name.include? "/"
               attr_options[:to_table] = name.underscore.tr("/", "_").pluralize.to_sym
               attr_options[:class_name] = name.classify
-              name = name.underscore
-              if (shared_namespace = find_shared_namespace(model_name, name, separator: "/"))
-                name = name.sub("#{shared_namespace}/", "")
-              end
-              name = name.tr("/", "_")
+              name = PlutoniumGenerators::Generator.derive_association_name(model_name, name)
             end
           end
 
@@ -259,27 +255,14 @@ module PlutoniumGenerators
           end
         end
 
-        def find_shared_namespace(model1, model2, separator: "::")
-          parts1 = model1.underscore.split(separator)
-          parts2 = model2.underscore.split(separator)
-
-          shared_namespace = []
-          [parts1.length, parts2.length].min.times do |i|
-            if parts1[i] == parts2[i]
-              shared_namespace << parts1[i]
-            else
-              break
-            end
-          end
-
-          shared_namespace.empty? ? nil : shared_namespace.join(separator)
-        end
       end
 
       def required?
-        return false if attr_options[:null] == true
-
-        super
+        if attr_options.key?(:null)
+          !attr_options[:null]
+        else
+          super
+        end
       end
 
       def cents?

data/lib/generators/pu/pkg/portal/portal_generator.rb

@@ -88,7 +88,11 @@ module Pu
       def bring_your_own_auth? = @bring_your_own_auth
 
       def configure_entity_scoping
-        @scoped_entity_class = options[:scope].camelize if options[:scope].present?
+        return unless options[:scope].present?
+
+        scope = options[:scope].camelize
+        # Prepend :: to ensure absolute constant reference (avoids NameError in engine.rb)
+        @scoped_entity_class = scope.start_with?("::") ? scope : "::#{scope}"
       end
 
       def scoped_to_entity? = scoped_entity_class.present?

data/lib/generators/pu/profile/USAGE

@@ -0,0 +1,59 @@
+Description:
+    Generate a Profile resource for managing Rodauth account settings.
+    Creates a resource linked to the User model with a customized ShowPage
+    that displays security settings links (change password, 2FA, etc.).
+
+Usage:
+    rails g pu:profile:install [NAME] [field:type field:type] --dest=DESTINATION
+
+Arguments:
+    NAME                 Profile resource name (default: Profile)
+    field:type           Additional fields to add to the profile
+
+Options:
+    --dest=DESTINATION   Target destination (required to avoid interactive prompts)
+                         Use 'main_app' for main application
+                         Use 'package_name' for feature package
+    --user-model=NAME    Rodauth user model (default: User)
+
+Examples:
+    # Basic profile in main_app
+    rails g pu:profile:install --dest=main_app
+
+    # Profile with custom fields
+    rails g pu:profile:install bio:text avatar:attachment --dest=main_app
+
+    # Custom name with fields in a package
+    rails g pu:profile:install AccountSettings \
+        bio:text \
+        'timezone:string?' \
+        'notifications_enabled:boolean' \
+        --dest=customer
+
+    # With custom user model
+    rails g pu:profile:install --dest=main_app --user-model=Account
+
+Generated Files:
+    Model:      app/models/[package/]profile.rb
+    Migration:  db/migrate/xxx_create_[package_]profiles.rb
+    Controller: [packages/package/]app/controllers/[package/]profiles_controller.rb
+    Policy:     [packages/package/]app/policies/[package/]profile_policy.rb
+    Definition: [packages/package/]app/definitions/[package/]profile_definition.rb
+
+What Gets Modified:
+    User Model: Adds `has_one :profile, dependent: :destroy`
+    Definition: Injects ShowPage with SecuritySection for Rodauth links
+
+The SecuritySection automatically displays links for enabled Rodauth features:
+    - Change Password (change_password)
+    - Change Email (change_login)
+    - Two-Factor Authentication (otp)
+    - Recovery Codes (recovery_codes)
+    - Security Keys (webauthn)
+    - Active Sessions (active_sessions)
+    - Close Account (close_account)
+
+After Generation:
+    1. Run migrations: rails db:migrate
+    2. Connect to portal: rails g pu:profile:conn --dest=my_portal
+    3. Customize the profile definition as needed

data/lib/generators/pu/profile/concerns/profile_arguments.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Pu
+  module Profile
+    module Concerns
+      module ProfileArguments
+        extend ActiveSupport::Concern
+
+        included do
+          argument :name, type: :string, default: "Profile", required: false, banner: "NAME"
+          argument :attributes, type: :array, default: [], banner: "field[:type] field[:type]"
+        end
+
+        # Normalize arguments: if name contains ":", treat it as an attribute
+        def normalize_arguments
+          if name.include?(":")
+            @profile_attributes = [name, *attributes]
+            @profile_name = "Profile"
+          else
+            @profile_name = name
+            @profile_attributes = attributes
+          end
+        end
+      end
+    end
+  end
+end

data/lib/generators/pu/profile/conn/USAGE

@@ -0,0 +1,33 @@
+Description:
+    Connect a Profile resource to a portal with the profile_url helper configured.
+    This enables the "Profile" link in the user menu.
+
+Usage:
+    rails g pu:profile:conn [RESOURCE] --dest=PORTAL
+
+Arguments:
+    RESOURCE             Profile resource class (default: Profile)
+                         Use namespaced class for package resources (e.g., Competition::Profile)
+
+Options:
+    --dest=PORTAL        Target portal (required to avoid interactive prompts)
+
+Examples:
+    # Connect namespaced Profile to portal
+    rails g pu:profile:conn Competition::Profile --dest=competition_portal
+
+    # Connect main_app Profile to portal
+    rails g pu:profile:conn Profile --dest=customer_portal
+
+    # Connect custom-named profile
+    rails g pu:profile:conn Competition::AccountSettings --dest=competition_portal
+
+What Gets Created:
+    Controller: packages/[portal]/app/controllers/[portal]/profiles_controller.rb
+
+What Gets Modified:
+    Routes:     packages/[portal]/config/routes.rb (registers as singular resource)
+    Controller: packages/[portal]/app/controllers/[portal]/resource_controller.rb
+                (adds profile_url helper method)
+
+The profile_url helper enables the "Profile" link in the user navigation menu.

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

@@ -0,0 +1,167 @@
+# frozen_string_literal: true
+
+require "rails/generators/base"
+require_relative "../lib/plutonium_generators"
+
+module Pu
+  module Profile
+    class ConnGenerator < ::Rails::Generators::Base
+      include PlutoniumGenerators::Generator
+
+      desc "Connect a Profile resource to a portal and configure the profile_url helper"
+
+      argument :name, type: :string, default: "Profile", required: false, banner: "RESOURCE"
+
+      class_option :dest, type: :string,
+        desc: "Destination portal"
+
+      class_option :user_model, type: :string, default: "User",
+        desc: "The Rodauth user model"
+
+      def start
+        validate_portal_destination!
+        connect_to_portal
+        customize_policy
+        customize_definition
+        customize_controller
+        add_profile_url_helper
+      rescue => e
+        exception "#{self.class} failed:", e
+      end
+
+      private
+
+      def validate_portal_destination!
+        if selected_destination_portal == "main_app"
+          raise ArgumentError, <<~MSG.squish
+            pu:profile:conn is for portal packages only. For main_app, configure
+            profile_url directly in your ResourceController.
+          MSG
+        end
+      end
+
+      def connect_to_portal
+        invoke "pu:res:conn", [resource_class_name],
+          dest: selected_destination_portal,
+          singular: true,
+          policy: true,
+          definition: true,
+          force: options[:force],
+          skip: options[:skip]
+      end
+
+      def customize_policy
+        content = <<-RUBY.chomp
+
+  # Profile is scoped to current user, not entity.
+  # Note: `user` here is the policy's user method (current authenticated user),
+  # while `#{user_table}` is the model's association name.
+  relation_scope do |relation|
+    skip_default_relation_scope!
+    relation.where(#{user_table}: user)
+  end
+
+  def create?
+    user.#{profile_association}.nil?
+  end
+
+  def destroy?
+    false
+  end
+
+  # User is set automatically from current_user, not via mass assignment
+  def permitted_attributes_for_create
+    super - [:#{user_table}]
+  end
+        RUBY
+        inject_into_file policy_path, content, after: /include #{dest_name.camelize}::ResourcePolicy\n/
+      end
+
+      def customize_definition
+        # Add ShowPage with SecuritySection
+        content = indent(<<~RUBY, 2)
+
+          class ShowPage < ShowPage
+            private
+
+            def render_after_content
+              render Plutonium::Profile::SecuritySection.new
+            end
+          end
+        RUBY
+        inject_into_file definition_path, content, after: /include #{dest_name.camelize}::ResourceDefinition\n/
+      end
+
+      def customize_controller
+        # Set user automatically when creating profile
+        content = <<-RUBY.chomp
+
+  private
+
+  def resource_params
+    super.merge(#{user_table}: current_user)
+  end
+        RUBY
+        inject_into_file controller_path, content, after: /include #{dest_name.camelize}::Concerns::Controller\n/
+      end
+
+      def add_profile_url_helper
+        content = <<-RUBY.chomp
+
+      included do
+        helper_method :profile_url
+      end
+
+      private
+
+      # Returns the URL to the user's profile page.
+      def profile_url
+        profile = current_user.#{profile_association}
+        if profile
+          resource_url_for(profile)
+        else
+          resource_url_for(#{resource_class_name}, action: :new)
+        end
+      end
+        RUBY
+        inject_into_file concerns_controller_path, content, after: /# add concerns above\.\n/
+      end
+
+      def profile_association
+        resource_class_name.demodulize.underscore
+      end
+
+      def resource_class_name
+        name.camelize
+      end
+
+      def user_table
+        options[:user_model].underscore
+      end
+
+      def dest_name
+        selected_destination_portal
+      end
+
+      def concerns_controller_path
+        "packages/#{dest_name}/app/controllers/#{dest_name}/concerns/controller.rb"
+      end
+
+      def controller_path
+        "packages/#{dest_name}/app/controllers/#{dest_name}/#{resource_class_name.underscore.pluralize}_controller.rb"
+      end
+
+      def policy_path
+        "packages/#{dest_name}/app/policies/#{dest_name}/#{resource_class_name.underscore}_policy.rb"
+      end
+
+      def definition_path
+        "packages/#{dest_name}/app/definitions/#{dest_name}/#{resource_class_name.underscore}_definition.rb"
+      end
+
+      def selected_destination_portal
+        @selected_destination_portal ||= portal_option :dest, prompt: "Select destination portal"
+      end
+    end
+  end
+end

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"