plutonium 0.43.2 → 0.44.1

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

@@ -0,0 +1,197 @@
+# frozen_string_literal: true
+
+require "rails/generators/base"
+require_relative "../lib/plutonium_generators"
+
+module Pu
+  module Saas
+    class WelcomeGenerator < ::Rails::Generators::Base
+      include PlutoniumGenerators::Generator
+      include PlutoniumGenerators::Concerns::RodauthRedirects
+
+      source_root File.expand_path("welcome/templates", __dir__)
+
+      desc "Generate a post-login welcome flow with onboarding and entity selection"
+
+      class_option :user_model, type: :string, required: true,
+        desc: "The user model name (e.g., User)"
+
+      class_option :entity_model, type: :string, required: true,
+        desc: "The entity model name (e.g., Organization)"
+
+      class_option :portal, type: :string, required: true,
+        desc: "The portal engine name (e.g., CustomerPortal)"
+
+      class_option :membership_model, type: :string,
+        desc: "The membership model name (defaults to <Entity><User>)"
+
+      class_option :rodauth, type: :string, default: "user",
+        desc: "Rodauth configuration name"
+
+      class_option :profile, type: :boolean, default: false,
+        desc: "Include profile setup in onboarding"
+
+      def start
+        validate_requirements
+        create_authenticated_controller
+        create_welcome_controller
+        create_views
+        add_routes
+        configure_rodauth
+        show_instructions
+      rescue => e
+        exception "#{self.class} failed:", e
+      end
+
+      private
+
+      def validate_requirements
+        errors = []
+
+        unless File.exist?(user_model_path)
+          errors << "User model not found: #{user_model_path.relative_path_from(Rails.root)}"
+        end
+
+        unless File.exist?(entity_model_path)
+          errors << "Entity model not found: #{entity_model_path.relative_path_from(Rails.root)}"
+        end
+
+        if File.exist?(user_model_path)
+          user_content = File.read(user_model_path)
+          unless user_content.include?("has_many :#{entity_table.pluralize}")
+            errors << "User model missing 'has_many :#{entity_table.pluralize}' — run the membership generator first"
+          end
+        end
+
+        if errors.any?
+          errors.each { |e| say_status :error, e, :red }
+          raise Thor::Error, "Required files missing:\n  - #{errors.join("\n  - ")}"
+        end
+      end
+
+      def create_authenticated_controller
+        template "app/controllers/authenticated_controller.rb",
+          "app/controllers/authenticated_controller.rb"
+      end
+
+      def create_welcome_controller
+        template "app/controllers/welcome_controller.rb",
+          "app/controllers/welcome_controller.rb"
+      end
+
+      def create_views
+        template "app/views/layouts/welcome.html.erb",
+          "app/views/layouts/welcome.html.erb"
+
+        template "app/views/welcome/select_entity.html.erb",
+          "app/views/welcome/select_entity.html.erb"
+
+        template "app/views/welcome/onboarding.html.erb",
+          "app/views/welcome/onboarding.html.erb"
+      end
+
+      def add_routes
+        routes_file = "config/routes.rb"
+        routes_content = File.read(Rails.root.join(routes_file))
+
+        if routes_content.include?("# Welcome & onboarding")
+          say_status :skip, "Welcome routes already present", :yellow
+          return
+        end
+
+        route_code = <<-RUBY
+
+  # Welcome & onboarding
+  get "welcome", to: "welcome#index"
+  get "welcome/onboard", to: "welcome#new_entity", as: :welcome_onboard
+  post "welcome/onboard", to: "welcome#onboard"
+        RUBY
+
+        # Remove the standalone invites welcome route if it exists,
+        # since the main WelcomeController now handles /welcome
+        if routes_content.include?('get "welcome", to: "invites/welcome#index"')
+          gsub_file routes_file,
+            /\n\s*# Welcome route \(handled by invites.*\n\s*get "welcome", to: "invites\/welcome#index"\n/,
+            "\n"
+        end
+
+        inject_into_file routes_file,
+          route_code,
+          before: /^end\s*\z/
+      end
+
+      def configure_rodauth
+        return unless rodauth?
+
+        update_rodauth_redirects("app/rodauth/#{rodauth_config}_rodauth_plugin.rb")
+      end
+
+      def show_instructions
+        say "\n"
+        say "=" * 79
+        say "\n"
+        say "Welcome flow installed successfully!"
+        say "\n"
+        say "Next steps:"
+        say "\n"
+        say "1. Run migrations (if you haven't already):"
+        say "   rails db:migrate"
+        say "\n"
+        say "2. Customize the onboarding view to match your app:"
+        say "   app/views/welcome/onboarding.html.erb"
+        say "\n"
+        if profile?
+          say "3. Ensure your User model has a `profile` association:"
+          say "   has_one :profile"
+          say "\n"
+        end
+        say "=" * 79
+        say "\n"
+      end
+
+      def user_model
+        options[:user_model].camelize
+      end
+
+      def user_table
+        options[:user_model].underscore
+      end
+
+      def entity_model
+        options[:entity_model].camelize
+      end
+
+      def entity_table
+        options[:entity_model].underscore
+      end
+
+      def portal_engine
+        options[:portal].camelize
+      end
+
+      def membership_model
+        options[:membership_model] || "#{entity_model}#{user_model}"
+      end
+
+      def rodauth_config
+        options[:rodauth]
+      end
+
+      def rodauth?
+        rodauth_config.present?
+      end
+
+      def profile?
+        options[:profile]
+      end
+
+      def entity_model_path
+        Rails.root.join("app/models/#{entity_table}.rb")
+      end
+
+      def user_model_path
+        Rails.root.join("app/models/#{user_table}.rb")
+      end
+    end
+  end
+end

data/lib/plutonium/auth/sequel_adapter.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "sequel/core"
-
 module Plutonium
   module Auth
     # Provides runtime detection of the database adapter for Sequel configuration.
@@ -26,6 +24,7 @@ module Plutonium
         # @return [Sequel::Database] configured Sequel database connection
         # @raise [RuntimeError] if the Sequel adapter initialization fails
         def db
+          require "sequel/core"
           adapter = sequel_adapter
           begin
             if RUBY_ENGINE == "jruby"

data/lib/plutonium/core/controller.rb

@@ -145,7 +145,10 @@ module Plutonium
         end
 
         # Build the named helper: e.g., "blogging_post_nested_post_metadata_path"
-        parent_singular = parent.model_name.singular
+        # For plural parent resources (resources :posts), nested routes use the singular member name (post_nested_...)
+        # For singular parent resources (resource :entities), nested routes use the route name as-is (entities_nested_...)
+        parent_is_singular_route = current_engine.routes.singular_resource_route?(parent.model_name.plural)
+        parent_prefix = parent_is_singular_route ? parent.model_name.plural : parent.model_name.singular
         nested_resource_name = "#{prefix}#{association_name}"
 
         # Determine if this is a collection action (no specific record)
@@ -158,12 +161,10 @@ module Plutonium
         #   - :new action uses singular (new_blogging_post_nested_comment)
         #   - member actions (show/edit/update/destroy) use singular (blogging_post_nested_comment)
         is_collection_action = action == :index || action == :create || (no_record && action != :new)
-        helper_base = if is_singular
-          "#{parent_singular}_#{nested_resource_name}"
-        elsif is_collection_action
-          "#{parent_singular}_#{nested_resource_name}"
+        helper_base = if is_singular || is_collection_action
+          "#{parent_prefix}_#{nested_resource_name}"
         else
-          "#{parent_singular}_#{nested_resource_name.to_s.singularize}"
+          "#{parent_prefix}_#{nested_resource_name.to_s.singularize}"
         end
 
         # Only add helper prefix for actions that have named route helpers (new, edit)
@@ -173,10 +174,19 @@ module Plutonium
         else "#{action}_"
         end
 
-        helper_name = :"#{helper_suffix}#{helper_base}_path"
+        # Add entity scope prefix for path-based entity scoping
+        entity_prefix = if scoped_to_entity? && scoped_entity_strategy == :path
+          "#{scoped_entity_param_key}_"
+        end
+
+        helper_name = :"#{helper_suffix}#{entity_prefix}#{helper_base}_path"
 
         # Build the arguments for the helper
-        helper_args = [parent.to_param]
+        helper_args = []
+        # Add entity scope param for path-based entity scoping
+        helper_args << current_scoped_entity.to_param if entity_prefix
+        # Singular parent resources (resource :entity) have no :id param in the route
+        helper_args << parent.to_param unless parent_is_singular_route
         # Include element ID for plural routes (has_many) when we have a record instance
         # Skip ID for collection actions (:index, :create) which don't need a member ID
         unless is_singular || no_record || is_collection_action

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

@@ -61,21 +61,34 @@ module Plutonium
         #
         # For Blogging::Comment, returns [:blogging_comments, :comments]
         # For Comment, returns [:comments]
+        # For Blogging::PostDetail, returns [:blogging_post_details, :post_details, :blogging_post_detail, :post_detail]
+        #
+        # Tries both plural (has_many) and singular (has_one) forms.
         #
         # @param klass [Class] The target class
         # @return [Array<Symbol>] Candidate association names in priority order
         def association_candidates_for(klass)
           candidates = []
 
-          # Full namespaced name: Blogging::Comment => :blogging_comments
-          full_name = klass.model_name.plural.to_sym
-          candidates << full_name
+          # Full namespaced name (plural): Blogging::Comment => :blogging_comments
+          full_plural = klass.model_name.plural.to_sym
+          candidates << full_plural
 
-          # Demodulized name: Blogging::Comment => :comments
+          # Demodulized name (plural): Blogging::Comment => :comments
           demodulized = klass.name.demodulize
           if demodulized != klass.name
-            short_name = demodulized.underscore.pluralize.to_sym
-            candidates << short_name unless candidates.include?(short_name)
+            short_plural = demodulized.underscore.pluralize.to_sym
+            candidates << short_plural unless candidates.include?(short_plural)
+          end
+
+          # Full namespaced name (singular): Blogging::PostDetail => :blogging_post_detail
+          full_singular = klass.model_name.singular.to_sym
+          candidates << full_singular unless candidates.include?(full_singular)
+
+          # Demodulized name (singular): Blogging::PostDetail => :post_detail
+          if demodulized != klass.name
+            short_singular = demodulized.underscore.to_sym
+            candidates << short_singular unless candidates.include?(short_singular)
           end
 
           candidates

data/lib/plutonium/invites/concerns/cancel_invite.rb

@@ -17,7 +17,9 @@ module Plutonium
         extend ActiveSupport::Concern
 
         included do
-          presents label: "Cancel Invitation", icon: "outline/x-circle"
+          presents label: "Cancel Invitation", icon: Phlex::TablerIcons::CircleX
+
+          attribute :resource
         end
 
         def execute

data/lib/plutonium/invites/concerns/invite_user.rb

@@ -57,7 +57,7 @@ module Plutonium
         # Override to specify the invite model class
         # @return [Class]
         def invite_class
-          Invites::UserInvite
+          ::Invites::UserInvite
         end
 
         # Override to specify the membership model class

data/lib/plutonium/railtie.rb

@@ -23,7 +23,7 @@ module Plutonium
       Rails.application.class.include Plutonium::Engine
     end
 
-    initializer "plutonium.rescue_responses" do |app|
+    initializer "plutonium.rescue_responses", before: "action_dispatch.configure" do |app|
       app.config.action_dispatch.rescue_responses["ActionPolicy::Unauthorized"] = :forbidden
     end
 

data/lib/plutonium/resource/controller.rb

@@ -7,7 +7,7 @@ module Plutonium
     # Controller module to handle resource actions and concerns
     module Controller
       extend ActiveSupport::Concern
-      include Pagy::Backend
+      include Pagy::Method
       include Plutonium::Core::Controller
       include Plutonium::Resource::Controllers::Defineable
       include Plutonium::Resource::Controllers::Authorizable
@@ -17,8 +17,7 @@ module Plutonium
       include Plutonium::Resource::Controllers::InteractiveActions
 
       included do
-        # https://github.com/ddnexus/pagy/blob/master/docs/extras/headers.md#headers
-        after_action { pagy_headers_merge(@pagy) if @pagy }
+        after_action { response.headers.merge!(@pagy.headers_hash) if @pagy }
 
         helper_method :current_parent, :current_nested_association, :resource_record!, :resource_record?, :resource_param_key, :resource_class
 

data/lib/plutonium/resource/controllers/crud_actions/index_action.rb

@@ -8,7 +8,7 @@ module Plutonium
           private
 
           def setup_index_action!
-            @pagy, @resource_records = pagy filtered_resource_collection
+            @pagy, @resource_records = pagy(:offset, filtered_resource_collection)
           end
 
           def filtered_resource_collection

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

@@ -59,6 +59,8 @@ module Plutonium
           return @scoped_entity_association if defined?(@scoped_entity_association)
 
           matching_assocs = resource_class.reflect_on_all_associations(:belongs_to).select do |assoc|
+            next false if assoc.polymorphic?
+
             assoc.klass.name == scoped_entity_class.name
           rescue NameError
             false

data/lib/plutonium/ui/form/components/resource_select.rb

@@ -10,7 +10,7 @@ module Plutonium
 
           def choices
             @choices ||= begin
-              collection = attributes.delete(:choices) || @association_class&.all || []
+              collection = @raw_choices || @association_class&.all || []
               build_choice_mapper(collection)
             end
           end

data/lib/plutonium/ui/form/components/secure_association.rb

@@ -44,8 +44,8 @@ module Plutonium
 
           def choices
             @choices ||= begin
-              collection = if (user_choices = attributes.delete(:choices))
-                user_choices
+              collection = if @raw_choices
+                @raw_choices
               elsif @skip_authorization
                 choices_from_association(association_reflection.klass)
               else

data/lib/plutonium/ui/form/components/secure_polymorphic_association.rb

@@ -14,17 +14,12 @@ module Plutonium
 
           def choices
             @choices ||= begin
-              Plutonium.eager_load_rails!
-              collection = if (user_choices = attributes.delete(:choices))
-                user_choices
-              else
-                associated_classes.map { |klass|
-                  [
-                    klass.model_name.human.pluralize,
-                    @skip_authorization ? choices_from_association(klass) : authorized_resource_scope(klass, relation: choices_from_association(klass))
-                  ]
-                }.to_h
-              end
+              collection = @raw_choices || associated_classes.map { |klass|
+                [
+                  klass.model_name.human.pluralize,
+                  @skip_authorization ? choices_from_association(klass) : authorized_resource_scope(klass, relation: choices_from_association(klass))
+                ]
+              }.to_h
               build_choice_mapper(collection)
             end
           end

data/lib/plutonium/ui/table/components/pagy_info.rb

@@ -5,8 +5,6 @@ module Plutonium
     module Table
       module Components
         class PagyInfo < Plutonium::UI::Component::Base
-          include Pagy::Frontend
-
           def initialize(pagy, per_page_options: [5, 10, 20, 50, 100])
             @pagy = pagy
             @per_page_options = (per_page_options + [@pagy.limit]).uniq.sort
@@ -57,11 +55,7 @@ module Plutonium
           end
 
           def page_url(limit)
-            original_limit = @pagy.vars[:limit]
-            @pagy.vars[:limit] = limit
-            pagy_url_for(@pagy, @pagy.page)
-          ensure
-            @pagy.vars[:limit] = original_limit
+            @pagy.page_url(@pagy.page, limit: limit, client_max_limit: limit)
           end
         end
       end

data/lib/plutonium/ui/table/components/pagy_pagination.rb

@@ -5,8 +5,6 @@ module Plutonium
     module Table
       module Components
         class PagyPagination < Plutonium::UI::Component::Base
-          include Pagy::Frontend
-
           def initialize(pagy)
             @pagy = pagy
           end
@@ -25,8 +23,8 @@ module Plutonium
 
           def prev_link
             li do
-              if @pagy.prev
-                a(href: page_url(@pagy.prev), class: link_classes(true)) {
+              if @pagy.previous
+                a(href: page_url(@pagy.previous), class: link_classes(true)) {
                   render Phlex::TablerIcons::ChevronLeft.new
                 }
               else
@@ -52,7 +50,7 @@ module Plutonium
           end
 
           def page_links
-            @pagy.series.each do |item|
+            @pagy.send(:series).each do |item|
               li do
                 case item
                 when Integer
@@ -101,7 +99,7 @@ module Plutonium
           end
 
           def page_url(page)
-            pagy_url_for(@pagy, page)
+            @pagy.page_url(page)
           end
         end
       end

data/lib/plutonium/version.rb

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

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@radioactive-labs/plutonium",
-  "version": "0.43.2",
+  "version": "0.44.1",
   "description": "Build production-ready Rails apps in minutes, not days. Convention-driven, fully customizable, AI-ready.",
   "type": "module",
   "main": "src/js/core.js",

data/plutonium.gemspec

@@ -35,7 +35,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "zeitwerk"
   spec.add_dependency "rails", ">= 7.2"
   spec.add_dependency "listen", "~> 3.8"
-  spec.add_dependency "pagy", "~> 9.0"
+  spec.add_dependency "pagy", "~> 43.0"
   spec.add_dependency "rabl", "~> 0.17.0" # TODO: what to do with RABL
   spec.add_dependency "semantic_range", "~> 3.0"
   spec.add_dependency "tty-prompt", "~> 0.23.1"
@@ -44,7 +44,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "phlex-rails"
   spec.add_dependency "phlex-tabler_icons"
   spec.add_dependency "phlexi-field", ">= 0.2.0"
-  spec.add_dependency "phlexi-form", ">= 0.14.1"
+  spec.add_dependency "phlexi-form", ">= 0.14.2"
   spec.add_dependency "phlexi-table", ">= 0.2.0"
   spec.add_dependency "phlexi-display", ">= 0.2.0"
   spec.add_dependency "phlexi-menu", ">= 0.4.1"

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: plutonium
 version: !ruby/object:Gem::Version
-  version: 0.43.2
+  version: 0.44.1
 platform: ruby
 authors:
 - Stefan Froelich
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-03-13 00:00:00.000000000 Z
+date: 2026-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zeitwerk
@@ -58,14 +57,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '9.0'
+        version: '43.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '9.0'
+        version: '43.0'
 - !ruby/object:Gem::Dependency
   name: rabl
   requirement: !ruby/object:Gem::Requirement
@@ -184,14 +183,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.1
+        version: 0.14.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.1
+        version: 0.14.2
 - !ruby/object:Gem::Dependency
   name: phlexi-table
   requirement: !ruby/object:Gem::Requirement
@@ -690,10 +689,12 @@ files:
 - lib/generators/pu/lib/plutonium_generators/concerns/mounts_engines.rb
 - lib/generators/pu/lib/plutonium_generators/concerns/package_selector.rb
 - lib/generators/pu/lib/plutonium_generators/concerns/resource_selector.rb
+- lib/generators/pu/lib/plutonium_generators/concerns/rodauth_redirects.rb
 - lib/generators/pu/lib/plutonium_generators/concerns/serializer.rb
 - lib/generators/pu/lib/plutonium_generators/generator.rb
 - lib/generators/pu/lib/plutonium_generators/installer.rb
 - lib/generators/pu/lib/plutonium_generators/model_generator_base.rb
+- lib/generators/pu/lib/plutonium_generators/non_interactive_prompt.rb
 - lib/generators/pu/lite/litestream/litestream_generator.rb
 - lib/generators/pu/lite/rails_pulse/rails_pulse_generator.rb
 - lib/generators/pu/lite/rails_pulse/templates/config/initializers/rails_pulse.rb.tt
@@ -822,10 +823,19 @@ files:
 - lib/generators/pu/saas/entity_generator.rb
 - lib/generators/pu/saas/membership/USAGE
 - lib/generators/pu/saas/membership_generator.rb
+- lib/generators/pu/saas/portal/USAGE
+- lib/generators/pu/saas/portal_generator.rb
 - lib/generators/pu/saas/setup/USAGE
 - lib/generators/pu/saas/setup_generator.rb
 - lib/generators/pu/saas/user/USAGE
 - lib/generators/pu/saas/user_generator.rb
+- lib/generators/pu/saas/welcome/USAGE
+- lib/generators/pu/saas/welcome/templates/app/controllers/authenticated_controller.rb.tt
+- lib/generators/pu/saas/welcome/templates/app/controllers/welcome_controller.rb.tt
+- lib/generators/pu/saas/welcome/templates/app/views/layouts/welcome.html.erb.tt
+- lib/generators/pu/saas/welcome/templates/app/views/welcome/onboarding.html.erb.tt
+- lib/generators/pu/saas/welcome/templates/app/views/welcome/select_entity.html.erb.tt
+- lib/generators/pu/saas/welcome_generator.rb
 - lib/generators/pu/service/postgres/postgres_generator.rb
 - lib/generators/pu/service/postgres/templates/.keep
 - lib/generators/pu/service/postgres/templates/bin/initdb.d/create-multiple-postgresql-databases.sh
@@ -1087,7 +1097,6 @@ metadata:
   allowed_push_host: https://rubygems.org
   homepage_uri: https://radioactive-labs.github.io/plutonium-core/
   source_code_uri: https://github.com/radioactive-labs/plutonium-core
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -1102,8 +1111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Build production-ready Rails apps in minutes, not days
 test_files: []