plutonium 0.12.13 → 0.13.0

data/gemfiles/rails_7.gemfile.lock

@@ -0,0 +1,335 @@
+PATH
+  remote: ..
+  specs:
+    plutonium (0.12.13)
+      active_interaction (~> 5.3)
+      dry-initializer (~> 3.1)
+      listen (~> 3.8)
+      pagy (~> 7.0)
+      pundit (~> 2.3)
+      rabl (~> 0.16.1)
+      rails (>= 7.1, < 8.0)
+      semantic_range (~> 3.0)
+      simple_form (~> 5.3)
+      tty-prompt (~> 0.23.1)
+      view_component (~> 3)
+      view_component-form (~> 0.2.6)
+      zeitwerk
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actioncable (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+      zeitwerk (~> 2.6)
+    actionmailbox (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      activejob (= 7.1.3.4)
+      activerecord (= 7.1.3.4)
+      activestorage (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
+      mail (>= 2.7.1)
+      net-imap
+      net-pop
+      net-smtp
+    actionmailer (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      actionview (= 7.1.3.4)
+      activejob (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
+      mail (~> 2.5, >= 2.5.4)
+      net-imap
+      net-pop
+      net-smtp
+      rails-dom-testing (~> 2.2)
+    actionpack (7.1.3.4)
+      actionview (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
+      nokogiri (>= 1.8.5)
+      racc
+      rack (>= 2.2.4)
+      rack-session (>= 1.0.1)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    actiontext (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      activerecord (= 7.1.3.4)
+      activestorage (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
+      globalid (>= 0.6.0)
+      nokogiri (>= 1.8.5)
+    actionview (7.1.3.4)
+      activesupport (= 7.1.3.4)
+      builder (~> 3.1)
+      erubi (~> 1.11)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    active_interaction (5.3.0)
+      activemodel (>= 5.2, < 8)
+      activesupport (>= 5.2, < 8)
+    activejob (7.1.3.4)
+      activesupport (= 7.1.3.4)
+      globalid (>= 0.3.6)
+    activemodel (7.1.3.4)
+      activesupport (= 7.1.3.4)
+    activerecord (7.1.3.4)
+      activemodel (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
+      timeout (>= 0.4.0)
+    activestorage (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      activejob (= 7.1.3.4)
+      activerecord (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
+      marcel (~> 1.0)
+    activesupport (7.1.3.4)
+      base64
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      mutex_m
+      tzinfo (~> 2.0)
+    ansi (1.5.0)
+    appraisal (2.5.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    ast (2.4.2)
+    base64 (0.2.0)
+    bigdecimal (3.1.8)
+    brakeman (6.1.2)
+      racc
+    builder (3.3.0)
+    bundle-audit (0.1.0)
+      bundler-audit
+    bundler-audit (0.9.1)
+      bundler (>= 1.2.0, < 3)
+      thor (~> 1.0)
+    combustion (1.4.0)
+      activesupport (>= 3.0.0)
+      railties (>= 3.0.0)
+      thor (>= 0.14.6)
+    concurrent-ruby (1.3.3)
+    connection_pool (2.4.1)
+    crass (1.0.6)
+    date (3.3.4)
+    drb (2.2.1)
+    dry-initializer (3.1.1)
+    erubi (1.12.0)
+    ffi (1.17.0-x86_64-darwin)
+    globalid (1.2.1)
+      activesupport (>= 6.1)
+    i18n (1.14.5)
+      concurrent-ruby (~> 1.0)
+    importmap-rails (2.0.1)
+      actionpack (>= 6.0.0)
+      activesupport (>= 6.0.0)
+      railties (>= 6.0.0)
+    io-console (0.7.2)
+    irb (1.13.1)
+      rdoc (>= 4.0.0)
+      reline (>= 0.4.2)
+    json (2.7.2)
+    language_server-protocol (3.17.0.3)
+    lint_roller (1.1.0)
+    listen (3.9.0)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    loofah (2.22.0)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.12.0)
+    mail (2.8.1)
+      mini_mime (>= 0.1.1)
+      net-imap
+      net-pop
+      net-smtp
+    marcel (1.0.4)
+    method_source (1.1.0)
+    mini_mime (1.1.5)
+    minitest (5.23.1)
+    minitest-reporters (1.6.1)
+      ansi
+      builder
+      minitest (>= 5.0)
+      ruby-progressbar
+    mutex_m (0.2.0)
+    net-imap (0.4.12)
+      date
+      net-protocol
+    net-pop (0.1.2)
+      net-protocol
+    net-protocol (0.2.2)
+      timeout
+    net-smtp (0.5.0)
+      net-protocol
+    nio4r (2.7.3)
+    nokogiri (1.16.5-x86_64-darwin)
+      racc (~> 1.4)
+    pagy (7.0.11)
+    parallel (1.25.1)
+    parser (3.3.2.0)
+      ast (~> 2.4.1)
+      racc
+    pastel (0.8.0)
+      tty-color (~> 0.5)
+    psych (5.1.2)
+      stringio
+    puma (6.4.2)
+      nio4r (~> 2.0)
+    pundit (2.3.2)
+      activesupport (>= 3.0.0)
+    rabl (0.16.1)
+      activesupport (>= 2.3.14)
+    racc (1.8.0)
+    rack (3.1.3)
+    rack-session (2.0.0)
+      rack (>= 3.0.0)
+    rack-test (2.1.0)
+      rack (>= 1.3)
+    rackup (2.1.0)
+      rack (>= 3)
+      webrick (~> 1.8)
+    rails (7.1.3.4)
+      actioncable (= 7.1.3.4)
+      actionmailbox (= 7.1.3.4)
+      actionmailer (= 7.1.3.4)
+      actionpack (= 7.1.3.4)
+      actiontext (= 7.1.3.4)
+      actionview (= 7.1.3.4)
+      activejob (= 7.1.3.4)
+      activemodel (= 7.1.3.4)
+      activerecord (= 7.1.3.4)
+      activestorage (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
+      bundler (>= 1.15.0)
+      railties (= 7.1.3.4)
+    rails-dom-testing (2.2.0)
+      activesupport (>= 5.0.0)
+      minitest
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.6.0)
+      loofah (~> 2.21)
+      nokogiri (~> 1.14)
+    railties (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
+      irb
+      rackup (>= 1.0.0)
+      rake (>= 12.2)
+      thor (~> 1.0, >= 1.2.2)
+      zeitwerk (~> 2.6)
+    rainbow (3.1.1)
+    rake (13.2.1)
+    rb-fsevent (0.11.2)
+    rb-inotify (0.11.1)
+      ffi (~> 1.0)
+    rdoc (6.7.0)
+      psych (>= 4.0.0)
+    regexp_parser (2.9.2)
+    reline (0.5.9)
+      io-console (~> 0.5)
+    rexml (3.3.0)
+      strscan
+    rubocop (1.63.5)
+      json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
+      parallel (~> 1.10)
+      parser (>= 3.3.0.2)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.31.3)
+      parser (>= 3.3.1.0)
+    rubocop-performance (1.21.0)
+      rubocop (>= 1.48.1, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
+    ruby-progressbar (1.13.0)
+    semantic_range (3.0.0)
+    simple_form (5.3.1)
+      actionpack (>= 5.2)
+      activemodel (>= 5.2)
+    sqlite3 (1.7.3-x86_64-darwin)
+    standard (1.36.0)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.0)
+      rubocop (~> 1.63.0)
+      standard-custom (~> 1.0.0)
+      standard-performance (~> 1.4)
+    standard-custom (1.0.2)
+      lint_roller (~> 1.0)
+      rubocop (~> 1.50)
+    standard-performance (1.4.0)
+      lint_roller (~> 1.1)
+      rubocop-performance (~> 1.21.0)
+    stimulus-rails (1.3.3)
+      railties (>= 6.0.0)
+    stringio (3.1.0)
+    strscan (3.1.0)
+    thor (1.3.1)
+    timeout (0.4.1)
+    tty-color (0.6.0)
+    tty-cursor (0.7.1)
+    tty-prompt (0.23.1)
+      pastel (~> 0.8)
+      tty-reader (~> 0.8)
+    tty-reader (0.9.0)
+      tty-cursor (~> 0.7)
+      tty-screen (~> 0.8)
+      wisper (~> 2.0)
+    tty-screen (0.8.2)
+    turbo-rails (2.0.5)
+      actionpack (>= 6.0.0)
+      activejob (>= 6.0.0)
+      railties (>= 6.0.0)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.5.0)
+    view_component (3.12.1)
+      activesupport (>= 5.2.0, < 8.0)
+      concurrent-ruby (~> 1.0)
+      method_source (~> 1.0)
+    view_component-form (0.2.6)
+      actionview (>= 6.0.0, < 7.2)
+      activesupport (>= 6.0.0, < 7.2)
+      view_component (>= 2.34.0, < 4.0)
+      zeitwerk (~> 2.5)
+    webrick (1.8.1)
+    websocket-driver (0.7.6)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.5)
+    wisper (2.0.1)
+    zeitwerk (2.6.15)
+
+PLATFORMS
+  x86_64-darwin
+
+DEPENDENCIES
+  appraisal
+  brakeman
+  bundle-audit
+  combustion
+  importmap-rails
+  minitest
+  minitest-reporters
+  plutonium!
+  puma (>= 5.0)
+  rails (~> 7.1.3, >= 7.1.3.4)
+  rake
+  sqlite3 (~> 1.4)
+  standard
+  stimulus-rails
+  turbo-rails
+  tzinfo-data
+
+BUNDLED WITH
+   2.5.6

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

@@ -61,11 +61,6 @@ module Pu
 
       private
 
-      def sequel_activerecord_integration?
-        defined?(ActiveRecord::Railtie) &&
-          (!defined?(Sequel) || Sequel::DATABASES.empty?)
-      end
-
       def sequel_adapter
         SEQUEL_ADAPTERS[activerecord_adapter] || activerecord_adapter
       end

data/lib/generators/pu/rodauth/migration/active_record/audit_logging.erb

@@ -11,6 +11,6 @@ create_table :<%= table_prefix %>_authentication_audit_logs<%= primary_key_type
 <% else -%>
   t.string :metadata
 <% end -%>
-  t.index [:<%= table_prefix %>_id, :at], name: "audit_<%= table_prefix %>_at_idx"
-  t.index :at, name: "audit_at_idx"
+  t.index [:<%= table_prefix %>_id, :at], name: "audit_<%= table_prefix %>_<%= table_prefix %>_id_at_idx"
+  t.index :at, name: "audit_<%= table_prefix %>_at_idx"
 end

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

@@ -11,9 +11,12 @@ require "#{__dir__}/concerns/account_selector"
 module Pu
   module Rodauth
     class MigrationGenerator < ::Rails::Generators::Base
+      include ::ActiveRecord::Generators::Migration
       include Concerns::Configuration
       include Concerns::AccountSelector
 
+      MIGRATION_DIR = "#{__dir__}/migration/active_record"
+
       source_root "#{__dir__}/templates"
 
       desc "Generate migrations for supported features\n\n" \
@@ -124,63 +127,39 @@ module Pu
         Dir["#{MIGRATION_DIR}/*.erb"].map { |filename| File.basename(filename, ".erb").to_sym }
       end
 
-      if defined?(::ActiveRecord::Railtie) # Active Record
-        include ::ActiveRecord::Generators::Migration
-
-        MIGRATION_DIR = "#{__dir__}/migration/active_record"
-
-        def activerecord_adapter
-          if ActiveRecord::Base.respond_to?(:connection_db_config)
-            ActiveRecord::Base.connection_db_config.adapter
-          else
-            ActiveRecord::Base.connection_config.fetch(:adapter)
-          end
+      def activerecord_adapter
+        if ActiveRecord::Base.respond_to?(:connection_db_config)
+          ActiveRecord::Base.connection_db_config.adapter
+        else
+          ActiveRecord::Base.connection_config.fetch(:adapter)
         end
+      end
 
-        def primary_key_type(key = :id)
-          generators = ::Rails.application.config.generators
-          column_type = generators.options[:active_record][:primary_key_type]
-          if key
-            ", #{key}: :#{column_type}" if column_type
-          else
-            column_type || default_primary_key_type
-          end
-        end
-
-        def default_primary_key_type
-          if ActiveRecord.version >= Gem::Version.new("5.1")
-            :bigint
-          else
-            :integer
-          end
-        end
-
-        # Active Record 7+ sets default precision to 6 for timestamp columns,
-        # so we need to ensure we match this when setting the default value.
-        def current_timestamp
-          if ActiveRecord.version >= Gem::Version.new("7.0") && ["mysql2", "trilogy"].include?(activerecord_adapter) && ActiveRecord::Base.connection.supports_datetime_with_precision?
-            "CURRENT_TIMESTAMP(6)"
-          else
-            "CURRENT_TIMESTAMP"
-          end
-        end
-      else # Sequel
-        include ::Rails::Generators::Migration
-
-        MIGRATION_DIR = "#{__dir__}/migration/sequel"
-
-        def self.next_migration_number(dirname)
-          next_migration_number = current_migration_number(dirname) + 1
-          [Time.now.utc.strftime("%Y%m%d%H%M%S"), format("%.14d", next_migration_number)].max
+      def primary_key_type(key = :id)
+        generators = ::Rails.application.config.generators
+        column_type = generators.options[:active_record][:primary_key_type]
+        if key
+          ", #{key}: :#{column_type}" if column_type
+        else
+          column_type || default_primary_key_type
         end
+      end
 
-        def db_migrate_path
-          "db/migrate"
+      def default_primary_key_type
+        if ActiveRecord.version >= Gem::Version.new("5.1")
+          :bigint
+        else
+          :integer
         end
+      end
 
-        def db
-          db = ::Sequel::DATABASES.first if defined?(::Sequel)
-          db or fail Rodauth::Rails::Error, "missing Sequel database connection"
+      # Active Record 7+ sets default precision to 6 for timestamp columns,
+      # so we need to ensure we match this when setting the default value.
+      def current_timestamp
+        if ActiveRecord.version >= Gem::Version.new("7.0") && ["mysql2", "trilogy"].include?(activerecord_adapter) && ActiveRecord::Base.connection.supports_datetime_with_precision?
+          "CURRENT_TIMESTAMP(6)"
+        else
+          "CURRENT_TIMESTAMP"
         end
       end
     end

data/lib/generators/pu/rodauth/templates/app/mailers/rodauth_mailer.rb.tt

@@ -55,6 +55,7 @@ class RodauthMailer < ApplicationMailer
 
   def rodauth(name, account_id, &block)
     instance = RodauthApp.rodauth(name).allocate
+    instance.url_options = default_url_options
     instance.instance_eval { @account = account_ds(account_id).first! }
     instance.instance_eval(&block) if block
     instance

data/lib/generators/pu/rodauth/templates/app/models/account.rb.tt

@@ -1,4 +1,3 @@
-<% if defined?(ActiveRecord::Railtie) -%>
 class <%= account_path.classify %> < ResourceRecord
   include Rodauth::Rails.model<%= "(:#{table_prefix})" unless primary? %>
   # add concerns above.
@@ -30,10 +29,3 @@ class <%= account_path.classify %> < ResourceRecord
 
   # add methods above.
 end
-<% else -%>
-class <%= table_prefix.camelize %> < Sequel::Model
-  include Rodauth::Rails.model
-  plugin :enum
-  enum :status, unverified: 1, verified: 2, closed: 3
-end
-<% end -%>

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

@@ -1,6 +1,8 @@
 require "sequel/core"
 
 class RodauthPlugin < Rodauth::Rails::Auth
+  attr_accessor :url_options
+
   configure do
     # ==> Features
     # See the Rodauth documentation for the list of available config options:
@@ -14,7 +16,6 @@ class RodauthPlugin < Rodauth::Rails::Auth
 
     # ==> General
 
-<% if sequel_activerecord_integration? -%>
     # Initialize Sequel and have it reuse Active Record's database connection.
 <% if RUBY_ENGINE == "jruby" -%>
     db Sequel.connect("jdbc:<%= sequel_adapter %>://", extensions: :activerecord_connection, keep_reference: false)
@@ -26,7 +27,6 @@ class RodauthPlugin < Rodauth::Rails::Auth
     # https://github.com/janko/rodauth-rails/issues/244
     convert_token_id_to_integer? true
 
-<% end -%>
     # Change prefix of table and foreign key column names from default "account"
     # accounts_table :users
     # verify_account_table :user_verification_keys
@@ -228,4 +228,10 @@ class RodauthPlugin < Rodauth::Rails::Auth
     # Does not work with only_json?
     # remember_deadline_interval Hash[days: 30]
   end
+
+  private
+
+  def rails_url_options
+    url_options || super
+  end
 end

data/lib/generators/pu/rodauth/templates/db/migrate/create_rodauth.rb.tt

@@ -1,13 +1,5 @@
-<% if defined?(::ActiveRecord::Railtie) -%>
 class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Migration.current_version %>]
   def change
 <%= migration_content -%>
   end
 end
-<% else -%>
-Sequel.migration do
-  change do
-<%= migration_content -%>
-  end
-end
-<% end -%>

data/lib/plutonium/auth/rodauth.rb

@@ -14,7 +14,9 @@ module Plutonium
           private
 
           def rodauth(name = :#{name})
-            super(name)
+            instance = super(name)
+            instance.url_options = default_url_options.presence
+            instance
           end
 
           def current_user

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

@@ -35,18 +35,18 @@ module Plutonium
         end
 
         #
-        # Returns a dynamic list of args to be used with `url_for` which considers the route namespace and nesting.
-        # The current entity and parent record (for nested routes) are inserted appropriately, ensuring that generated urls
+        # Returns a dynamic list of args to be used with `url_for`, which considers the route namespace and nesting.
+        # The current entity and parent record (for nested routes) are inserted appropriately, ensuring that generated URLs
         # obey the current routing.
         #
-        # e.g. of route helpers that will be invoked given the output of this method
+        # e.g., of route helpers that will be invoked given the output of this method
         #
         # - when invoked in a root route (/acme/dashboard/users)
         #
         # `resource_url_args_for User`                   => `entity_users_*`
         # `resource_url_args_for @user`                  => `entity_user_*`
         # `resource_url_args_for @user, action: :edit`   => `edit_entity_user_*`
-        # `resource_url_args_for @user, Post             => `entity_user_posts_*`
+        # `resource_url_args_for @user, Post`            => `entity_user_posts_*`
         #
         # - when invoked in a nested route (/acme/dashboard/users/1/post/1)
         #
@@ -55,26 +55,36 @@ module Plutonium
         # `resource_url_args_for @post, action: :edit`   => `edit_entity_user_post_*`
         #
         # @param [Class, ApplicationRecord] *args arguments you would normally pass to `url_for`
-        # @param [Symbol] action optional action to invoke e.g. :new, :edit
+        # @param [Symbol] action optional action to invoke, e.g., :new, :edit
+        # @param [ApplicationRecord] parent the parent record for nested routes, if any
+        # @param [Hash] kwargs additional keyword arguments to pass to `url_for`
         #
-        # @return [Array[Class, ApplicationRecord, Symbol]] args to pass to `url_for`
+        # @return [Hash] args to pass to `url_for`
         #
         def resource_url_args_for(*args, action: nil, parent: nil, **kwargs)
-          # If the last item is a class and the action is :new e.g. `resource_url User, action: :new`,
-          # it must be converted into a symbol to generate the appropriate helper i.e `new_user_*`
-          # to match the url helper generated by `resources :users`
-          resource = args.pop
-          resource = resource.model_name.singular_route_key.to_sym if action == :new && resource.is_a?(Class)
-          args.push resource
-
-          base_args = if scoped_to_entity? && scoped_entity_strategy == :path
-            [action, current_scoped_entity.becomes(scoped_entity_class), parent]
-          else
-            [action, parent]
+          url_args = {**kwargs, action: action}.compact
+
+          controller_chain = [current_package.to_s]
+          [parent, *args].compact.each_with_index do |element, index|
+            if element.is_a?(Class)
+              controller_chain << element.to_s.pluralize
+            else
+              controller_chain << element.class.to_s.pluralize
+              if index == args.length - 1
+                url_args[:id] = element.to_param
+                url_args[:action] ||= :show
+              else
+                url_args[element.model_name.singular_route_key.to_sym] = element.to_param
+              end
+            end
+          end
+          url_args[:controller] = "/#{controller_chain.join("::").underscore}"
+
+          if scoped_to_entity? && scoped_entity_strategy == :path
+            url_args[scoped_entity_param_key] = current_scoped_entity
           end
 
-          # rails compacts this list. no need to handle nils
-          base_args + args + [**kwargs]
+          url_args
         end
 
         def resource_url_for(...)

data/lib/plutonium/core/fields/inputs/date_time_input.rb

@@ -6,7 +6,7 @@ module Plutonium
           private
 
           def input_options
-            {wrapper: :resource_multi_select}
+            {wrapper: :resource_multi_select, include_blank: true}
           end
         end
       end

data/lib/plutonium/helpers/display_helper.rb

@@ -47,10 +47,12 @@ module Plutonium
 
       def display_association_value(association)
         display_name = display_name_of(association)
-        link_to display_name, resource_url_for(association, parent: nil),
-          class: "font-medium text-primary-600 dark:text-primary-500"
-      rescue NoMethodError
-        display_name
+        if registered_resources.include?(association.class)
+          link_to display_name, resource_url_for(association, parent: nil),
+            class: "font-medium text-primary-600 dark:text-primary-500"
+        else
+          display_name
+        end
       end
 
       def display_numeric_value(value)