plutonium 0.51.0 → 0.53.0

data/lib/generators/pu/lite/solid_errors/solid_errors_generator.rb

@@ -44,9 +44,13 @@ module Pu
 
           Rails.application.configure do
             config.solid_errors.connects_to = {database: {writing: :#{@db_name}}}
-            config.solid_errors.send_emails = ENV["SOLID_ERRORS_SEND_EMAILS"].present?
-            config.solid_errors.email_from = ENV["SOLID_ERRORS_EMAIL_FROM"]
-            config.solid_errors.email_to = ENV["SOLID_ERRORS_EMAIL_TO"]
+            config.solid_errors.email_from = ENV["SOLID_ERRORS_EMAIL_FROM"].presence
+            config.solid_errors.email_to = ENV["SOLID_ERRORS_EMAIL_TO"].presence
+            # Only deliver notifications when explicitly opted in AND both addresses are
+            # configured. Enabling send_emails without a valid from/to makes Solid Errors
+            # attempt to deliver malformed mail.
+            config.solid_errors.send_emails = ENV["SOLID_ERRORS_SEND_EMAILS"].present? &&
+              config.solid_errors.email_from.present? && config.solid_errors.email_to.present?
             config.solid_errors.username = ENV.fetch("SOLID_ERRORS_USERNAME", nil)
             config.solid_errors.password = ENV.fetch("SOLID_ERRORS_PASSWORD", nil)
           end

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

@@ -51,7 +51,7 @@ module Pu
       end
 
       def customize_policy
-        content = <<-RUBY.chomp
+        content = <<-RUBY
 
   # Profile is scoped to current user, not entity.
   # Note: `user` here is the policy's user method (current authenticated user),
@@ -94,7 +94,7 @@ module Pu
 
       def customize_controller
         # Set user automatically when creating profile
-        content = <<-RUBY.chomp
+        content = <<-RUBY
 
   private
 

data/lib/generators/pu/res/conn/conn_generator.rb

@@ -36,9 +36,7 @@ module Pu
           @resource_class = resource
 
           if app_namespace == "MainApp"
-            insert_into_file "config/routes.rb",
-              indent("register_resource ::#{resource}#{singular_option}\n", 2),
-              after: /.*Rails\.application\.routes\.draw do.*\n/
+            register_resource_in_routes("config/routes.rb", resource)
           else
             if options[:policy] || !expected_parent_policy
               template "app/policies/resource_policy.rb",
@@ -53,9 +51,7 @@ module Pu
             template "app/controllers/resource_controller.rb",
               "packages/#{package_namespace}/app/controllers/#{package_namespace}/#{resource.pluralize.underscore}_controller.rb"
 
-            insert_into_file "packages/#{package_namespace}/config/routes.rb",
-              indent("register_resource ::#{resource}#{singular_option}\n", 2),
-              before: /.*# register resources above.*/
+            register_resource_in_routes("packages/#{package_namespace}/config/routes.rb", resource)
           end
         end
       rescue => e
@@ -66,6 +62,37 @@ module Pu
 
       attr_reader :app_namespace, :resource_class
 
+      # Insert `register_resource ::<Klass>` into a routes file. Idempotent:
+      # skips if already present. Falls back when the conventional
+      # `# register resources above.` marker is missing.
+      def register_resource_in_routes(routes_path, resource)
+        line = "register_resource ::#{resource}#{singular_option}"
+        content = File.read(File.join(destination_root, routes_path))
+
+        if /^\s*#{Regexp.escape(line)}\b/.match?(content)
+          say_status :identical, "#{routes_path} already registers #{resource}", :blue
+          return
+        end
+
+        if /^\s*#\s*register resources above\b/.match?(content)
+          insert_into_file routes_path,
+            indent("#{line}\n", 2),
+            before: /^\s*#\s*register resources above\b.*/
+        elsif /^\s*Rails\.application\.routes\.draw do\b/.match?(content)
+          insert_into_file routes_path,
+            indent("#{line}\n", 2),
+            after: /^\s*Rails\.application\.routes\.draw do.*\n/
+        elsif (match = content.match(/^(\w+::Engine)\.routes\.draw do.*\n/))
+          insert_into_file routes_path,
+            indent("#{line}\n", 2),
+            after: /^\s*#{Regexp.escape(match[1])}\.routes\.draw do.*\n/
+        else
+          say_status :warn,
+            "Could not locate routes block in #{routes_path}; add manually: #{line}",
+            :yellow
+        end
+      end
+
       def package_namespace
         app_namespace.underscore
       end

data/lib/generators/pu/res/model/templates/model.rb.tt

@@ -36,7 +36,11 @@ class <%= class_name %> < <%= [feature_package_name, "ResourceRecord"].join "::"
 
 <% attributes.select(&:required?).each do |attribute| -%>
   <%- next if attribute.reference? || attribute.rich_text? || attribute.token? || attribute.password_digest? -%>
+  <%- if attribute.type == :boolean -%>
+  validates :<%= attribute.attribute_name %>, inclusion: {in: [true, false]}
+  <%- else -%>
   validates :<%= attribute.attribute_name %>, presence: true
+  <%- end -%>
 <% end -%>
   # add validations above.
 

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

@@ -4,6 +4,7 @@ require "securerandom"
 require "#{__dir__}/concerns/configuration"
 require "#{__dir__}/concerns/account_selector"
 require "#{__dir__}/concerns/feature_selector"
+require "#{__dir__}/migration_generator"
 require "#{__dir__}/../lib/plutonium_generators/concerns/actions"
 
 module Pu
@@ -96,7 +97,7 @@ module Pu
       def generate_rodauth_migration
         return if selected_migration_features.empty?
 
-        invoke "pu:rodauth:migration", [table], features: selected_migration_features,
+        invoke Pu::Rodauth::MigrationGenerator, [table], features: selected_migration_features,
           name: kitchen_sink? ? "rodauth_kitchen_sink" : nil,
           migration_name: options[:migration_name],
           login_column: login_column,

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

@@ -1,5 +1,3 @@
-return unless defined?(Rodauth::Rails)
-
 require "rails/generators/base"
 
 require_relative "../lib/plutonium_generators"

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

@@ -1,5 +1,3 @@
-return unless defined?(Rodauth::Rails)
-
 require "rails/generators/base"
 require "rails/generators/active_record/migration"
 require "erb"

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

@@ -1,5 +1,3 @@
-return unless defined?(Rodauth::Rails)
-
 require "rails/generators/base"
 
 require "#{__dir__}/concerns/configuration"

data/lib/generators/pu/saas/membership/USAGE

@@ -6,9 +6,12 @@ Description:
 
 Example:
     rails g pu:saas:membership --user Customer --entity Organization
-    rails g pu:saas:membership --user Customer --entity Organization --roles=member,admin,owner
+    rails g pu:saas:membership --user Customer --entity Organization --roles=admin,member
     rails g pu:saas:membership --user Customer --entity Organization --extra-attributes=joined_at:datetime
 
+    Role ordering: `owner` is auto-prepended as index 0 (most privileged) — do not include it
+    in --roles. Subsequent roles run from most-privileged to least.
+
     This creates:
         app/models/organization_customer.rb (with role enum and uniqueness validation)
         db/migrate/XXX_create_organization_customers.rb (with unique index)

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

@@ -16,6 +16,9 @@ module Pu
       class_option :entity, type: :string, required: true,
         desc: "The entity model name (e.g., Organization)"
 
+      class_option :dest, type: :string, default: "main_app",
+        desc: "Destination feature/package for entity, membership, and api_client (default: main_app)"
+
       class_option :allow_signup, type: :boolean, default: true,
         desc: "Whether to allow users to sign up to the platform"
 
@@ -52,6 +55,9 @@ module Pu
       class_option :profile, type: :boolean, default: true,
         desc: "Generate user profile resource"
 
+      class_option :profile_attributes, type: :array, default: %w[name:string],
+        desc: "Additional attributes for the user profile model (default: name:string)"
+
       class_option :api_client, type: :string, default: nil,
         desc: "Generate an API client model (e.g., ApiClient)"
 
@@ -130,9 +136,15 @@ module Pu
       end
 
       def generate_profile
-        generate "pu:profile:setup",
-          "--user-model=#{options[:user]} --dest=main_app" \
-          "#{" --portal=#{portal_package}" if options[:portal]}"
+        klass = Rails::Generators.find_by_namespace("pu:profile:setup")
+        profile_options = {
+          user_model: options[:user],
+          dest: options[:dest],
+          force: options[:force],
+          skip: options[:skip]
+        }
+        profile_options[:portal] = portal_package if options[:portal]
+        klass.new([nil, *options[:profile_attributes]], profile_options).invoke_all
       end
 
       def generate_welcome
@@ -145,7 +157,7 @@ module Pu
 
       def generate_invites
         generate "pu:invites:install",
-          "--entity-model=#{options[:entity]} --user-model=#{options[:user]} --dest=main_app" \
+          "--entity-model=#{options[:entity]} --user-model=#{options[:user]} --dest=#{options[:dest]}" \
           " --rodauth=#{rodauth_config}"
       end
 

data/lib/generators/pu/saas/welcome/templates/app/controllers/welcome_controller.rb.tt

@@ -63,7 +63,7 @@ class WelcomeController < AuthenticatedController
 <% end -%>
 
   def portal_root_path(<%= entity_table %>)
-    <%= portal_engine %>::Engine.routes.url_helpers.<%= entity_table %>_root_path(<%= entity_table %>: <%= entity_table %>)
+    <%= portal_engine %>::Engine.routes.url_helpers.<%= entity_table %>_scoped_root_path(<%= entity_table %>_scoped: <%= entity_table %>)
   end
   helper_method :portal_root_path
 end

data/lib/plutonium/action/base.rb

@@ -5,41 +5,9 @@ require "active_support/string_inquirer"
 module Plutonium
   module Action
     # Base class for all actions in the Plutonium framework.
-    #
-    # @attr_reader [Symbol] name The name of the action.
-    # @attr_reader [String] label The human-readable label for the action.
-    # @attr_reader [String, nil] icon The icon associated with the action.
-    # @attr_reader [RouteOptions] route_options The routing options for the action.
-    # @attr_reader [String, nil] confirmation The confirmation message for the action.
-    # @attr_reader [String, nil] turbo_frame The Turbo Frame ID for the action.
-    # @attr_reader [Symbol, nil] color The color associated with the action.
-    # @attr_reader [Symbol, nil] category The category of the action.
-    # @attr_reader [Integer] position The position of the action within its category.
     class Base
-      attr_reader :name, :label, :description, :icon, :route_options, :confirmation, :turbo, :turbo_frame, :color, :category, :position, :return_to, :modal
-
-      # Initialize a new action.
-      #
-      # @param [Symbol] name The name of the action.
-      # @param [Hash] options The options for the action.
-      # @option options [String] :label The human-readable label for the action.
-      # @option options [String] :description The human-readable description for the action.
-      # @option options [String] :icon The icon associated with the action (e.g., 'fa-edit' for Font Awesome).
-      # @option options [Symbol] :color The color associated with the action (e.g., :primary, :secondary, :success, :warning, :danger).
-      # @option options [String] :confirmation The confirmation message to display before executing the action.
-      # @option options [RouteOptions, Hash] :route_options The routing options for the action.
-      # @option options [String] :turbo_frame The Turbo Frame ID for the action (used in Hotwire/Turbo Drive applications).
-      # @option options [String, Symbol] :return_to Override the return_to URL for this action. If not provided, defaults to current URL.
-      # @option options [Boolean] :bulk_action (false) If true, applies to a bulk selection of records (e.g., "Mark Selected as Read").
-      # @option options [Boolean] :collection_record_action (false) If true, applies to records in a collection (e.g., "Edit Record" button in a table).
-      # @option options [Boolean] :record_action (false) If true, applies to an individual record (e.g., "Delete" button on a Show page).
-      # @option options [Boolean] :resource_action (false) If true, applies to the entire resource and can be used in any context (e.g., "Import from CSV").
-      # @option options [Symbol] :category The category of the action. Determines visibility and grouping.
-      #   Valid values include:
-      #   @option options [Symbol] :primary Always shown and given prominence in the UI.
-      #   @option options [Symbol] :secondary Shown in secondary menus or less prominent areas.
-      #   @option options [Symbol] :danger Actions that require caution, often destructive operations.
-      # @option options [Integer] :position (50) The position of the action in its group. Lower numbers appear first.
+      attr_reader :name, :label, :description, :icon, :route_options, :confirmation, :turbo, :color, :category, :position, :return_to
+
       def initialize(name, **options)
         @name = name.to_sym
         @label = options[:label] || @name.to_s.titleize
@@ -57,51 +25,53 @@ module Plutonium
         @resource_action = options[:resource_action] || false
         @category = ActiveSupport::StringInquirer.new((options[:category] || :secondary).to_s)
         @position = options[:position] || 50
-        @modal = options[:modal] || :centered
-        validate_modal!
+        @modal_mode = options[:modal]
+        @modal_size = options[:size]
+        validate_modal_mode!
+        validate_modal_size!
 
         freeze
       end
 
-      # @return [Boolean] Whether this is a bulk action.
-      def bulk_action?
-        @bulk_action
+      # Resolves to the definition's `modal_mode` when unset on the action.
+      def modal_mode(definition = nil)
+        return @modal_mode if @modal_mode || definition.nil?
+        definition.modal_mode
       end
 
-      # @return [Boolean] Whether this is a collection record action.
-      def collection_record_action?
-        @collection_record_action
+      # Resolves to the definition's `modal_size` when unset on the action.
+      def modal_size(definition = nil)
+        return @modal_size if @modal_size || definition.nil?
+        definition.modal_size
       end
 
-      # @return [Boolean] Whether this is a record action.
-      def record_action?
-        @record_action
+      # Downgrades the remote-modal frame to nil when the definition has
+      # `modal false`, so the link navigates as a full page instead of
+      # targeting a frame that won't exist. Other frames pass through.
+      def turbo_frame(definition = nil)
+        return nil if definition && targets_remote_modal? && definition.modal_mode == false
+        @turbo_frame
       end
 
-      # @return [Boolean] Whether this is a resource action.
-      def resource_action?
-        @resource_action
-      end
+      def bulk_action? = @bulk_action
+      def collection_record_action? = @collection_record_action
+      def record_action? = @record_action
+      def resource_action? = @resource_action
 
       def permitted_by?(policy)
         policy.allowed_to?(:"#{name}?")
       end
 
       # Returns a new Action with the given options merged over this one.
-      # Used by the resource definition to derive variants (e.g. dropping
-      # `turbo_frame` when `modal false` is configured) without mutating
-      # the frozen original.
       def with(**overrides)
         self.class.new(name, **to_options.merge(overrides))
       end
 
       protected
 
-      # Canonical representation for reconstruction via `with`. Every
+      # Canonical option hash for reconstruction via `with`. Every
       # attribute set in `initialize` MUST appear here; otherwise
       # `with(**overrides)` would silently drop it on round-trip.
-      # `category` is exposed as a Symbol since `initialize` re-wraps
-      # it in StringInquirer.
       def to_options
         {
           label: @label,
@@ -119,21 +89,31 @@ module Plutonium
           resource_action: @resource_action,
           category: @category.to_sym,
           position: @position,
-          modal: @modal
+          modal: @modal_mode,
+          size: @modal_size
         }
       end
 
       private
 
-      def validate_modal!
-        return if [:centered, :slideover].include?(@modal)
-        raise ArgumentError, "modal must be :centered or :slideover, got #{@modal.inspect}"
+      def targets_remote_modal?
+        @turbo_frame == Plutonium::REMOTE_MODAL_FRAME
+      end
+
+      def validate_modal_mode!
+        return if @modal_mode.nil?
+        return if [:centered, :slideover].include?(@modal_mode)
+        raise ArgumentError, "modal must be :centered or :slideover, got #{@modal_mode.inspect}"
+      end
+
+      def validate_modal_size!
+        return if @modal_size.nil?
+        return if Plutonium::UI::Modal::Base::VALID_SIZES.include?(@modal_size)
+        raise ArgumentError,
+          "size must be one of #{Plutonium::UI::Modal::Base::VALID_SIZES.inspect}, " \
+            "got #{@modal_size.inspect}"
       end
 
-      # Build RouteOptions from the provided options
-      #
-      # @param [RouteOptions, Hash, nil] options The routing options
-      # @return [RouteOptions] The built RouteOptions object
       def build_route_options(options)
         case options
         when RouteOptions

data/lib/plutonium/configuration.rb

@@ -30,6 +30,12 @@ module Plutonium
     # @return [Symbol] :classic (legacy Header/Sidebar) or :modern (Topbar/IconRail)
     attr_accessor :shell
 
+    # @return [String] host URL of the Navii avatar service (no path), used by
+    #   {Plutonium::UI::Avatar} as the default profile-image fallback. The
+    #   component appends the `/avatar/:seed` route. Repoint this to self-host
+    #   or proxy the service.
+    attr_accessor :navii_host_url
+
     # Map of version numbers to their default configurations
     VERSION_DEFAULTS = {
       1.0 => proc do |config|
@@ -52,6 +58,7 @@ module Plutonium
       @cache_discovery = !Rails.env.development?
       @enable_hotreload = Rails.env.development?
       @shell = :modern
+      @navii_host_url = "https://api.navii.dev"
     end
 
     # Load default configuration for a specific version

data/lib/plutonium/definition/actions.rb

@@ -6,19 +6,19 @@ module Plutonium
       included do
         defineable_prop :action
 
-        def self.action(name, interaction: nil, **)
+        def self.action(name, interaction: nil, **opts)
           defined_actions[name] = if interaction
-            Plutonium::Action::Interactive::Factory.create(name, interaction:, **)
+            Plutonium::Action::Interactive::Factory.create(name, interaction:, **opts)
           else
-            Plutonium::Action::Simple.new(name, **)
+            Plutonium::Action::Simple.new(name, **opts)
           end
         end
 
-        def action(name, interaction: nil, **)
+        def action(name, interaction: nil, **opts)
           instance_defined_actions[name] = if interaction
-            Plutonium::Action::Interactive::Factory.create(name, interaction:, **)
+            Plutonium::Action::Interactive::Factory.create(name, interaction:, **opts)
           else
-            Plutonium::Action::Simple.new(name, **)
+            Plutonium::Action::Simple.new(name, **opts)
           end
         end
 
@@ -32,12 +32,10 @@ module Plutonium
 
         # standard CRUD actions
 
-        # turbo_frame for :new and :edit is set by
-        # Resource::Definition.configure_crud_modal_targets! based on the
-        # `modal` config. Don't hard-code it here.
         action(:new, route_options: {action: :new},
           resource_action: true, category: :primary,
-          icon: Phlex::TablerIcons::Plus, position: 10)
+          icon: Phlex::TablerIcons::Plus, position: 10,
+          turbo_frame: Plutonium::REMOTE_MODAL_FRAME)
 
         action(:show, route_options: {action: :show},
           collection_record_action: true, category: :primary,
@@ -45,7 +43,8 @@ module Plutonium
 
         action(:edit, route_options: {action: :edit},
           record_action: true, collection_record_action: true, category: :primary,
-          icon: Phlex::TablerIcons::Edit, position: 20)
+          icon: Phlex::TablerIcons::Edit, position: 20,
+          turbo_frame: Plutonium::REMOTE_MODAL_FRAME)
 
         action(:destroy, route_options: {method: :delete},
           record_action: true, collection_record_action: true, category: :danger,

data/lib/plutonium/definition/base.rb

@@ -86,6 +86,35 @@ module Plutonium
       # false = always hide
       inheritable_config_attr :submit_and_continue
 
+      # modals — drive how :new / :edit and interactive actions render.
+      # Actions read these lazily at render time, so override order and
+      # subclass inheritance both work naturally.
+      VALID_MODAL_MODES = [:centered, :slideover, false].freeze
+
+      inheritable_config_attr :modal_mode, :modal_size
+      modal_mode :slideover
+      modal_size :md
+
+      # Sets `modal_mode` and `modal_size` together with validation.
+      #
+      # - :slideover (default) — slide-in panel from the right
+      # - :centered — centered dialog
+      # - false — no modal; new/edit are full standalone pages
+      #
+      # `size:` see Plutonium::UI::Modal::Base::VALID_SIZES. `:auto`
+      # hugs the form's natural width.
+      def self.modal(mode, size: :md)
+        unless VALID_MODAL_MODES.include?(mode)
+          raise ArgumentError, "modal must be one of #{VALID_MODAL_MODES.inspect}, got #{mode.inspect}"
+        end
+        unless Plutonium::UI::Modal::Base::VALID_SIZES.include?(size)
+          raise ArgumentError,
+            "modal size must be one of #{Plutonium::UI::Modal::Base::VALID_SIZES.inspect}, got #{size.inspect}"
+        end
+        modal_mode mode
+        modal_size size
+      end
+
       def initialize
         super
       end

data/lib/plutonium/helpers/assets_helper.rb

@@ -4,29 +4,6 @@ module Plutonium
   module Helpers
     # Helper module for managing asset-related functionality
     module AssetsHelper
-      # Generate a stylesheet tag for the resource
-      #
-      # @return [ActiveSupport::SafeBuffer] HTML stylesheet link tag
-      def resource_stylesheet_tag
-        url = resource_asset_url_for(:css, resource_stylesheet_asset)
-        stylesheet_link_tag(url, "data-turbo-track": "reload")
-      end
-
-      # Generate a script tag for the resource
-      #
-      # @return [ActiveSupport::SafeBuffer] HTML script tag
-      def resource_script_tag
-        url = resource_asset_url_for(:js, resource_script_asset)
-        javascript_include_tag(url, "data-turbo-track": "reload", type: "module")
-      end
-
-      # Generate a favicon link tag
-      #
-      # @return [ActiveSupport::SafeBuffer] HTML favicon link tag
-      def resource_favicon_tag
-        favicon_link_tag(resource_favicon_asset)
-      end
-
       # Generate an image tag for the logo
       #
       # @param classname [String] CSS class name for the image tag
@@ -56,13 +33,6 @@ module Plutonium
         Plutonium.configuration.assets.script
       end
 
-      # Get the favicon asset path
-      #
-      # @return [String] path to the favicon asset
-      def resource_favicon_asset
-        Plutonium.configuration.assets.favicon
-      end
-
       private
 
       # Generate the appropriate asset URL based on the environment

data/lib/plutonium/helpers/content_helper.rb

@@ -17,50 +17,6 @@ module Plutonium
           }
         )
       end
-
-      def read_more(content, clamp = 4)
-        return if content.blank?
-
-        # Stimulus Read More (https://www.stimulus-components.com/docs/stimulus-read-more/)
-        style = "overflow: hidden; display: -webkit-box; -webkit-box-orient: vertical; " \
-                "-webkit-line-clamp: var(--read-more-line-clamp, #{clamp});"
-
-        tag.div(
-          data: {
-            controller: "read-more",
-            read_more_more_text_value: "Read more",
-            read_more_less_text_value: "Read less"
-          }
-        ) do
-          concat tag.div(content,
-            style:,
-            data: {read_more_target: "content"})
-
-          next unless content.lines.size > clamp
-
-          concat tag.button("Read more",
-            class: "btn btn-sm btn-link text-decoration-none ps-0",
-            data: {action: "read-more#toggle"})
-        end
-      end
-
-      def quill(content)
-        return if content.blank?
-
-        tag.div(
-          content,
-          class: "ql-viewer",
-          data: {
-            controller: "quill-viewer"
-          }
-        )
-      end
-
-      def clamp_content(content)
-        return if content.blank?
-
-        tag.div content, class: "clamped-content"
-      end
     end
   end
 end