plutonium 0.42.0 → 0.43.0

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

@@ -23,15 +23,15 @@ module Pu
       class_option :membership_model, type: :string,
         desc: "The membership model name (defaults to <Entity>User)"
 
-      class_option :roles, type: :array, default: %w[member admin],
-        desc: "Available roles for invitations"
-
       class_option :rodauth, type: :string, default: "user",
         desc: "Rodauth configuration name for signup integration"
 
       class_option :enforce_domain, type: :boolean, default: false,
         desc: "Require invited user email to match entity domain"
 
+      class_option :dest, type: :string, default: "main_app",
+        desc: "Package where entity model is located (default: main_app)"
+
       def validate_requirements
         errors = []
 
@@ -55,9 +55,13 @@ module Pu
           errors << "User policy not found: #{user_policy_path}"
         end
 
+        unless File.exist?(membership_model_file)
+          errors << "Membership model not found: #{membership_model_file.relative_path_from(Rails.root)}"
+        end
+
         if errors.any?
           errors.each { |e| say_status :error, e, :red }
-          raise Thor::Error, "Required files missing. Ensure #{entity_model} and #{user_model} resources exist."
+          raise Thor::Error, "Required files missing:\n  - #{errors.join("\n  - ")}"
         end
       end
 
@@ -132,8 +136,13 @@ module Pu
       end
 
       def create_entity_interaction
-        template "app/interactions/invite_user_interaction.rb",
+        dest_path = if entity_in_package?
+          "packages/#{entity_package}/app/interactions/#{entity_table}/invite_user_interaction.rb"
+        else
           "app/interactions/#{entity_table}/invite_user_interaction.rb"
+        end
+
+        template "app/interactions/invite_user_interaction.rb", dest_path
       end
 
       def add_entity_action
@@ -144,7 +153,7 @@ module Pu
 
       def add_entity_policy
         inject_into_file entity_policy_path,
-          "def invite_user?\n    user.is_a?(Admin) || current_membership&.admin?\n  end\n\n  ",
+          "def invite_user?\n    false # TODO: e.g., current_membership&.admin? or user.is_a?(Admin)\n  end\n\n  ",
           before: "# Core attributes"
       end
 
@@ -161,7 +170,7 @@ module Pu
 
       def add_user_policy
         inject_into_file user_policy_path,
-          "def invite_user?\n    user.is_a?(Admin) || current_membership&.admin?\n  end\n\n  ",
+          "def invite_user?\n    false # TODO: e.g., current_membership&.admin? or user.is_a?(Admin)\n  end\n\n  ",
           before: "# Core attributes"
       end
 
@@ -176,7 +185,7 @@ module Pu
   def current_membership
     return unless entity_scope && user
 
-    cache(entity_scope, user, :current_membership) { #{membership_model}.find_by(#{entity_table}: entity_scope, user: user) }
+    @current_membership ||= #{membership_model}.find_by(#{entity_association_name}: entity_scope, user: user)
   end
         RUBY
 
@@ -308,16 +317,43 @@ module Pu
         options[:entity_model].underscore
       end
 
+      # Returns the association name for entity on the membership model.
+      # Strips shared namespace between membership and entity models.
+      # e.g., Competition::TeamUser -> Competition::Team uses :team (not :competition_team)
+      def entity_association_name
+        PlutoniumGenerators::Generator.derive_association_name(membership_model, entity_model)
+      end
+
+      def entity_in_package?
+        options[:dest] != "main_app"
+      end
+
+      def entity_package
+        options[:dest]
+      end
+
       def entity_model_path
-        "app/models/#{entity_table}.rb"
+        if entity_in_package?
+          "packages/#{entity_package}/app/models/#{entity_table}.rb"
+        else
+          "app/models/#{entity_table}.rb"
+        end
       end
 
       def entity_definition_path
-        "app/definitions/#{entity_table}_definition.rb"
+        if entity_in_package?
+          "packages/#{entity_package}/app/definitions/#{entity_table}_definition.rb"
+        else
+          "app/definitions/#{entity_table}_definition.rb"
+        end
       end
 
       def entity_policy_path
-        "app/policies/#{entity_table}_policy.rb"
+        if entity_in_package?
+          "packages/#{entity_package}/app/policies/#{entity_table}_policy.rb"
+        else
+          "app/policies/#{entity_table}_policy.rb"
+        end
       end
 
       def user_model
@@ -340,12 +376,23 @@ module Pu
         options[:membership_model] || "#{entity_model}User"
       end
 
-      def roles
-        Array(options[:roles]).flat_map { |r| r.split(",") }.map(&:strip)
+      def membership_model_file
+        model_path = "#{membership_model.underscore}.rb"
+        if entity_in_package?
+          Rails.root.join("packages", options[:dest], "app/models", model_path)
+        else
+          Rails.root.join("app/models", model_path)
+        end
       end
 
-      def roles_enum
-        roles.each_with_index.map { |r, i| "#{r}: #{i}" }.join(", ")
+      # Read roles from the membership model's enum definition
+      def roles
+        content = File.read(membership_model_file)
+        if (match = content.match(/enum\s+:role,\s*(.+?)(?:\n|$)/))
+          match[1].scan(/(\w+):/).flatten
+        else
+          raise Thor::Error, "Could not find 'enum :role' in #{membership_model_file.relative_path_from(Rails.root)}"
+        end
       end
 
       def rodauth_config

data/lib/generators/pu/invites/templates/db/migrate/create_user_invites.rb.tt

@@ -4,7 +4,7 @@ class CreateUserInvites < ActiveRecord::Migration[<%= ActiveRecord::Migration.cu
   def change
     create_table :user_invites do |t|
       # Entity association
-      t.belongs_to :<%= entity_table %>, null: false, foreign_key: true
+      t.belongs_to :<%= entity_association_name %>, null: false, foreign_key: true
 
       # Invitation details
       t.string :email, null: false
@@ -34,7 +34,7 @@ class CreateUserInvites < ActiveRecord::Migration[<%= ActiveRecord::Migration.cu
       t.index :token, unique: true
 
       # Only one pending invite per email per entity
-      t.index [:<%= entity_table %>_id, :email], unique: true, where: "state = 0",
+      t.index [:<%= entity_association_name %>_id, :email], unique: true, where: "state = 0",
         name: "index_user_invites_on_entity_email_pending"
 
       # Only one pending invite per invitable (when invitable is present)

data/lib/generators/pu/invites/templates/packages/invites/app/controllers/invites/user_invitations_controller.rb.tt

@@ -4,7 +4,9 @@ module Invites
   class UserInvitationsController < ApplicationController
     include Plutonium::Invites::Controller
 
+    prepend_view_path Invites::Engine.root.join("app/views")
     layout "invites/invitation"
+    helper_method :login_path
 
     private
 

data/lib/generators/pu/invites/templates/packages/invites/app/controllers/invites/welcome_controller.rb.tt

@@ -4,6 +4,7 @@ module Invites
   class WelcomeController < ApplicationController
     include Plutonium::Invites::PendingInviteCheck
 
+    prepend_view_path Invites::Engine.root.join("app/views")
     layout "invites/invitation"
 
 <% if rodauth? -%>

data/lib/generators/pu/invites/templates/packages/invites/app/models/invites/user_invite.rb.tt

@@ -4,11 +4,11 @@ module Invites
   class UserInvite < Invites::ResourceRecord
     include Plutonium::Invites::Concerns::InviteToken
 
-    enum :role, <%= roles_enum %>
+    enum :role, <%= membership_model %>.roles
 
     encrypts :token, deterministic: true
 
-    belongs_to :<%= entity_table %>
+    belongs_to :<%= entity_association_name %>, class_name: "<%= entity_model %>"
     belongs_to :invited_by, polymorphic: true
     belongs_to :<%= user_table %>, optional: true
     belongs_to :invitable, polymorphic: true, optional: true
@@ -30,12 +30,12 @@ module Invites
     end
 
     def create_membership_for(user)
-      <%= membership_model %>.create!(<%= entity_table %>: <%= entity_table %>, user: user, role: role)
+      <%= membership_model %>.create!(<%= entity_association_name %>: <%= entity_association_name %>, user: user, role: role)
     end
-<% if entity_table != "entity" -%>
+<% if entity_association_name != "entity" -%>
 
     # Alias for InviteToken concern compatibility
-    alias_method :entity, :<%= entity_table %>
+    alias_method :entity, :<%= entity_association_name %>
 <% end -%>
   end
 end

data/lib/generators/pu/invites/templates/packages/invites/app/views/invites/user_invitations/signup.html.erb.tt

@@ -15,13 +15,13 @@
     <label for="email" class="pu-label">Email</label>
     <%% if @invite.enforce_email? %>
       <input type="email" name="email" value="<%%= @invite.email %>" disabled
-             class="pu-input cursor-not-allowed opacity-60">
+             autocomplete="email" class="pu-input cursor-not-allowed opacity-60">
       <input type="hidden" name="email" value="<%%= @invite.email %>">
       <p class="pu-hint">This email is required for your invitation</p>
     <%% else %>
       <%%= form.email_field :email, value: @invite.email, required: true,
           placeholder: "you@example.com",
-          class: "pu-input" %>
+          autocomplete: "email", class: "pu-input" %>
       <%% if (domain = @invite.enforce_domain) %>
         <p class="pu-hint">Must be from <%%= domain %> domain</p>
       <%% else %>
@@ -32,12 +32,12 @@
 
   <div>
     <label for="password" class="pu-label">Password</label>
-    <%%= form.password_field :password, required: true, class: "pu-input" %>
+    <%%= form.password_field :password, required: true, autocomplete: "new-password", class: "pu-input" %>
   </div>
 
   <div>
     <label for="password_confirmation" class="pu-label">Confirm Password</label>
-    <%%= form.password_field :password_confirmation, required: true, class: "pu-input" %>
+    <%%= form.password_field :password_confirmation, required: true, autocomplete: "new-password", class: "pu-input" %>
   </div>
 
   <div class="space-y-3 pt-4">

data/lib/generators/pu/lib/plutonium_generators/concerns/actions.rb

@@ -447,7 +447,7 @@ module PlutoniumGenerators
 
       def gem_in_bundle?(name)
         in_root do
-          return true if File.exist?("Gemfile") && File.read("Gemfile").match?(/gem ['"]#{name}['"]/)
+          return true if File.exist?("Gemfile") && File.read("Gemfile").match?(/^\s*gem ['"]#{name}['"]/)
           return true if File.exist?("Gemfile.lock") && File.read("Gemfile.lock").include?("    #{name} ")
         end
         false

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

@@ -10,6 +10,35 @@ module PlutoniumGenerators
     include Concerns::Serializer
     include Concerns::Actions
 
+    # Finds the shared namespace prefix between two model names.
+    # Used to derive association names when models share a namespace.
+    # e.g., find_shared_namespace("Competition::TeamUser", "Competition::Team") => "competition"
+    def self.find_shared_namespace(model1, model2, separator: "/")
+      parts1 = model1.underscore.split(separator)
+      parts2 = model2.underscore.split(separator)
+
+      shared = []
+      [parts1.length, parts2.length].min.times do |i|
+        break unless parts1[i] == parts2[i]
+        shared << parts1[i]
+      end
+
+      shared.empty? ? nil : shared.join(separator)
+    end
+
+    # Derives the association name for a reference, stripping shared namespace.
+    # e.g., derive_association_name("Competition::TeamUser", "Competition::Team") => "team"
+    def self.derive_association_name(from_model, to_model)
+      to_parts = to_model.underscore.split("/")
+
+      if (shared = find_shared_namespace(from_model, to_model))
+        shared_parts = shared.split("/")
+        to_parts = to_parts.drop(shared_parts.length)
+      end
+
+      to_parts.join("_")
+    end
+
     def self.included(base)
       base.send :class_option, :interactive, type: :boolean, desc: "Show prompts. Default: true"
       base.send :class_option, :bundle, type: :boolean, desc: "Run bundle after setup. Default: true"

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