plutonium 0.12.14 → 0.13.1

data/app/views/rodauth/verify_account_resend.html.erb

@@ -1,17 +1,20 @@
-<%= form_with url: rodauth.verify_account_resend_path, method: :post, data: { turbo: false }, class: "w-full max-w-sm" do |form| %>
-  <div class="mb-4 text-sm">
-    <%== rodauth.verify_account_resend_explanatory_text %>
-  </div>
-
+<div class="mb-4 text-sm text-gray-500 dark:text-gray-400">
+  <%== rodauth.verify_account_resend_explanatory_text %>
+</div>
+<%= form_with url: rodauth.verify_account_resend_path, method: :post, data: { turbo: false }, class: "space-y-4" do |form| %>
   <% if params[rodauth.login_param] %>
     <%= form.hidden_field rodauth.login_param, value: params[rodauth.login_param] %>
   <% else %>
-    <div class="mb-6">
-      <%= form.label "login", rodauth.login_label, class: "block text-sm font-semibold" %>
-      <%= form.email_field rodauth.login_param, value: params[rodauth.login_param], id: "login", autocomplete: "email", required: true, class: "mt-2 text-sm w-full px-3 py-2 border rounded-md dark:bg-gray-900 dark:text-gray-100 dark:focus:bg-gray-800 #{rodauth.field_error(rodauth.login_param) ? "border-red-600 focus:ring-red-600 focus:border-red-600 dark:border-red-400 dark:focus:ring-red-400" : "border-gray-300 dark:border-gray-700 dark:focus:border-emerald-400 dark:focus:ring-emerald-400" }", aria: ({ invalid: true, describedby: "login_error_message" } if rodauth.field_error(rodauth.login_param)) %>
+    <div>
+      <%= form.label "login", rodauth.login_label, class: "block mb-2 text-sm font-semibold text-gray-900 dark:text-white" %>
+      <%= form.email_field rodauth.login_param, value: params[rodauth.login_param],
+                                                id: "login",
+                                                autocomplete: "email",
+                                                required: true,
+                                                placeholder: "jane@acme.inc",
+                                                class: "bg-gray-50 border border-gray-300 text-gray-900 rounded-lg focus:ring-primary-600 focus:border-primary-600 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-primary-500 dark:focus:border-primary-500 #{rodauth.field_error(rodauth.login_param) ? "border-red-600 focus:ring-red-600 focus:border-red-600 dark:border-red-400 dark:focus:ring-red-400" : "border-gray-300 dark:border-gray-700 dark:focus:border-emerald-400 dark:focus:ring-emerald-400" }", aria: ({ invalid: true, describedby: "login_error_message" } if rodauth.field_error(rodauth.login_param)) %>
       <%= content_tag(:span, rodauth.field_error(rodauth.login_param), class: "block mt-1 text-red-600 text-xs dark:text-red-400", id: "login_error_message") if rodauth.field_error(rodauth.login_param) %>
     </div>
   <% end %>
-
-  <%= form.submit rodauth.verify_account_resend_button, class: "w-full px-8 py-3 cursor-pointer font-semibold text-sm rounded-md text-white bg-blue-600 hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-600 dark:bg-emerald-400 dark:hover:bg-emerald-500 dark:text-gray-900 dark:focus:ring-emerald-400 dark:focus:ring-offset-current" %>
+  <%= form.submit rodauth.verify_account_resend_button, class: "w-full text-white bg-primary-600 hover:bg-primary-700 focus:ring-4 focus:outline-none focus:ring-primary-300 font-semibold rounded-lg text-sm px-5 py-2.5 text-center dark:bg-primary-600 dark:hover:bg-primary-700 dark:focus:ring-primary-800" %>
 <% end %>

data/app/views/rodauth/verify_login_change.html.erb

@@ -1,3 +1,3 @@
-<%= form_with url: rodauth.verify_login_change_path, method: :post, data: { turbo: false }, class: "w-full max-w-sm" do |form| %>
-  <%= form.submit rodauth.verify_login_change_button, class: "w-full px-8 py-3 cursor-pointer font-semibold text-sm rounded-md text-white bg-blue-600 hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-600 dark:bg-emerald-400 dark:hover:bg-emerald-500 dark:text-gray-900 dark:focus:ring-emerald-400 dark:focus:ring-offset-current" %>
+<%= form_with url: rodauth.verify_login_change_path, method: :post, data: { turbo: false }, class: "space-y-4" do |form| %>
+  <%= form.submit rodauth.verify_login_change_button, class: "w-full text-white bg-primary-600 hover:bg-primary-700 focus:ring-4 focus:outline-none focus:ring-primary-300 font-semibold rounded-lg text-sm px-5 py-2.5 text-center dark:bg-primary-600 dark:hover:bg-primary-700 dark:focus:ring-primary-800" %>
 <% end %>

data/app/views/rodauth/webauthn_auth.html.erb

@@ -1,12 +1,12 @@
 <% cred = rodauth.webauthn_credential_options_for_get %>
 
-<%= form_with url: rodauth.webauthn_auth_form_path, method: :post, id: "webauthn-auth-form", data: { credential_options: cred.as_json.to_json, turbo: false }, class: "w-full max-w-sm" do |form| %>
+<%= form_with url: rodauth.webauthn_auth_form_path, method: :post, id: "webauthn-auth-form", data: { credential_options: cred.as_json.to_json, turbo: false }, class: "space-y-4" do |form| %>
   <%= form.hidden_field rodauth.login_param, value: params[rodauth.login_param] %>
   <%= form.hidden_field rodauth.webauthn_auth_challenge_param, value: cred.challenge %>
   <%= form.hidden_field rodauth.webauthn_auth_challenge_hmac_param, value: rodauth.compute_hmac(cred.challenge) %>
   <%= form.text_field rodauth.webauthn_auth_param, value: "", id: "webauthn-auth", class: "hidden", aria: { hidden: "true" } %>
   <div id="webauthn-auth-button">
-    <%= form.submit rodauth.webauthn_auth_button, class: "w-full px-8 py-3 cursor-pointer font-semibold text-sm rounded-md text-white bg-blue-600 hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-600 dark:bg-emerald-400 dark:hover:bg-emerald-500 dark:text-gray-900 dark:focus:ring-emerald-400 dark:focus:ring-offset-current" %>
+    <%= form.submit rodauth.webauthn_auth_button, class: "w-full text-white bg-primary-600 hover:bg-primary-700 focus:ring-4 focus:outline-none focus:ring-primary-300 font-semibold rounded-lg text-sm px-5 py-2.5 text-center dark:bg-primary-600 dark:hover:bg-primary-700 dark:focus:ring-primary-800" %>
   </div>
 <% end %>
 

data/app/views/rodauth/webauthn_remove.html.erb

@@ -1,8 +1,8 @@
-<%= form_with url: rodauth.webauthn_remove_path, method: :post, id: "webauthn-remove-form", data: { turbo: false }, class: "w-full max-w-sm" do |form| %>
+<%= form_with url: rodauth.webauthn_remove_path, method: :post, id: "webauthn-remove-form", data: { turbo: false }, class: "space-y-4" do |form| %>
   <% if rodauth.two_factor_modifications_require_password? %>
-    <div class="mb-6">
-      <%= form.label "password", rodauth.password_label, class: "block text-sm font-semibold" %>
-      <%= form.password_field rodauth.password_param, value: "", id: "password", autocomplete: rodauth.password_field_autocomplete_value, required: true, class: "mt-2 text-sm w-full px-3 py-2 border rounded-md dark:bg-gray-900 dark:text-gray-100 dark:focus:bg-gray-800 #{rodauth.field_error(rodauth.password_param) ? "border-red-600 focus:ring-red-600 focus:border-red-600 dark:border-red-400 dark:focus:ring-red-400" : "border-gray-300 dark:border-gray-700 dark:focus:border-emerald-400 dark:focus:ring-emerald-400" }", aria: ({ invalid: true, describedby: "password_error_message" } if rodauth.field_error(rodauth.password_param)) %>
+    <div>
+      <%= form.label "password", rodauth.password_label, class: "block mb-2 text-sm font-semibold text-gray-900 dark:text-white" %>
+      <%= form.password_field rodauth.password_param, value: "", id: "password", autocomplete: rodauth.password_field_autocomplete_value, required: true, class: "bg-gray-50 border border-gray-300 text-gray-900 rounded-lg focus:ring-primary-600 focus:border-primary-600 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-primary-500 dark:focus:border-primary-500 #{rodauth.field_error(rodauth.password_param) ? "border-red-600 focus:ring-red-600 focus:border-red-600 dark:border-red-400 dark:focus:ring-red-400" : "border-gray-300 dark:border-gray-700 dark:focus:border-emerald-400 dark:focus:ring-emerald-400" }", aria: ({ invalid: true, describedby: "password_error_message" } if rodauth.field_error(rodauth.password_param)) %>
       <%= content_tag(:span, rodauth.field_error(rodauth.password_param), class: "block mt-1 text-red-600 text-xs dark:text-red-400", id: "password_error_message") if rodauth.field_error(rodauth.password_param) %>
     </div>
   <% end %>
@@ -17,5 +17,5 @@
     <%= content_tag(:span, rodauth.field_error(rodauth.webauthn_remove_param), class: "block mt-1 text-red-600 text-xs dark:text-red-400", id: "webauthn_remove_error_message") if rodauth.field_error(rodauth.webauthn_remove_param) %>
   </fieldset>
 
-  <%= form.submit rodauth.webauthn_remove_button, class: "w-full px-8 py-3 cursor-pointer font-semibold text-sm rounded-md text-white bg-blue-600 hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-600 dark:bg-emerald-400 dark:hover:bg-emerald-500 dark:text-gray-900 dark:focus:ring-emerald-400 dark:focus:ring-offset-current" %>
+  <%= form.submit rodauth.webauthn_remove_button, class: "w-full text-white bg-primary-600 hover:bg-primary-700 focus:ring-4 focus:outline-none focus:ring-primary-300 font-semibold rounded-lg text-sm px-5 py-2.5 text-center dark:bg-primary-600 dark:hover:bg-primary-700 dark:focus:ring-primary-800" %>
 <% end %>

data/app/views/rodauth/webauthn_setup.html.erb

@@ -1,20 +1,20 @@
 <% cred = rodauth.new_webauthn_credential %>
 
-<%= form_with url: request.path, method: :post, id: "webauthn-setup-form", data: { credential_options: cred.as_json.to_json, turbo: false }, class: "w-full max-w-sm" do |form| %>
+<%= form_with url: request.path, method: :post, id: "webauthn-setup-form", data: { credential_options: cred.as_json.to_json, turbo: false }, class: "space-y-4" do |form| %>
   <%= form.hidden_field rodauth.webauthn_setup_challenge_param, value: cred.challenge %>
   <%= form.hidden_field rodauth.webauthn_setup_challenge_hmac_param, value: rodauth.compute_hmac(cred.challenge) %>
   <%= form.text_field rodauth.webauthn_setup_param, value: "", id: "webauthn-setup", class: "hidden", aria: { hidden: "true" } %>
 
   <% if rodauth.two_factor_modifications_require_password? %>
-    <div class="mb-6">
-      <%= form.label "password", rodauth.password_label, class: "block text-sm font-semibold" %>
-      <%= form.password_field rodauth.password_param, value: "", id: "password", autocomplete: rodauth.password_field_autocomplete_value, required: true, class: "mt-2 text-sm w-full px-3 py-2 border rounded-md dark:bg-gray-900 dark:text-gray-100 dark:focus:bg-gray-800 #{rodauth.field_error(rodauth.password_param) ? "border-red-600 focus:ring-red-600 focus:border-red-600 dark:border-red-400 dark:focus:ring-red-400" : "border-gray-300 dark:border-gray-700 dark:focus:border-emerald-400 dark:focus:ring-emerald-400" }", aria: ({ invalid: true, describedby: "password_error_message" } if rodauth.field_error(rodauth.password_param)) %>
+    <div>
+      <%= form.label "password", rodauth.password_label, class: "block mb-2 text-sm font-semibold text-gray-900 dark:text-white" %>
+      <%= form.password_field rodauth.password_param, value: "", id: "password", autocomplete: rodauth.password_field_autocomplete_value, required: true, class: "bg-gray-50 border border-gray-300 text-gray-900 rounded-lg focus:ring-primary-600 focus:border-primary-600 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-primary-500 dark:focus:border-primary-500 #{rodauth.field_error(rodauth.password_param) ? "border-red-600 focus:ring-red-600 focus:border-red-600 dark:border-red-400 dark:focus:ring-red-400" : "border-gray-300 dark:border-gray-700 dark:focus:border-emerald-400 dark:focus:ring-emerald-400" }", aria: ({ invalid: true, describedby: "password_error_message" } if rodauth.field_error(rodauth.password_param)) %>
       <%= content_tag(:span, rodauth.field_error(rodauth.password_param), class: "block mt-1 text-red-600 text-xs dark:text-red-400", id: "password_error_message") if rodauth.field_error(rodauth.password_param) %>
     </div>
   <% end %>
 
   <div id="webauthn-setup-button">
-    <%= form.submit rodauth.webauthn_setup_button, class: "w-full px-8 py-3 cursor-pointer font-semibold text-sm rounded-md text-white bg-blue-600 hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-600 dark:bg-emerald-400 dark:hover:bg-emerald-500 dark:text-gray-900 dark:focus:ring-emerald-400 dark:focus:ring-offset-current" %>
+    <%= form.submit rodauth.webauthn_setup_button, class: "w-full text-white bg-primary-600 hover:bg-primary-700 focus:ring-4 focus:outline-none focus:ring-primary-300 font-semibold rounded-lg text-sm px-5 py-2.5 text-center dark:bg-primary-600 dark:hover:bg-primary-700 dark:focus:ring-primary-800" %>
   </div>
 <% end %>
 

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

@@ -65,7 +65,7 @@ module Plutonium
           url_args = {**kwargs, action: action}.compact
 
           controller_chain = [current_package.to_s]
-          [parent, *args].compact.each_with_index do |element, index|
+          [*args].compact.each_with_index do |element, index|
             if element.is_a?(Class)
               controller_chain << element.to_s.pluralize
             else
@@ -78,8 +78,9 @@ module Plutonium
               end
             end
           end
-          url_args[:controller] = controller_chain.join("::").underscore
+          url_args[:controller] = "/#{controller_chain.join("::").underscore}"
 
+          url_args[:"#{parent.model_name.singular_route_key}_id"] = parent.to_param if parent.present?
           if scoped_to_entity? && scoped_entity_strategy == :path
             url_args[scoped_entity_param_key] = current_scoped_entity
           end

data/lib/plutonium/helpers/display_helper.rb

@@ -45,12 +45,14 @@ module Plutonium
         tag.span rendered, title:
       end
 
-      def display_association_value(association_class)
-        display_name = display_name_of(association_class)
-        link_to display_name, resource_url_for(association_class, parent: nil),
-          class: "font-medium text-primary-600 dark:text-primary-500"
-      rescue NoMethodError
-        display_name
+      def display_association_value(association)
+        display_name = display_name_of(association)
+        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)

data/lib/plutonium/helpers/form_helper.rb

@@ -6,17 +6,21 @@ module Plutonium
       include ActionView::Helpers::FormHelper
 
       def resource_form_for(record, **options, &block)
-        options[:url] ||= resource_url_args_for(record, action: record.new_record? ? :create : :update)
-        options[:builder] ||= PlutoniumUi::FormBuilder
-        options[:wrapper] ||= :default_resource_form
-        options[:html] ||= {}
-        options[:html][:novalidate] = false unless options[:html].key?(:novalidate)
+        options[:url] ||= resource_url_for(record, action: record.new_record? ? :create : :update)
+        options = build_form_options(options)
 
         with_resource_form_field_error_proc do
           form_for(record, options, &block)
         end
       end
 
+      def resource_form_with(**options, &block)
+        options = build_form_options(options)
+        with_resource_form_field_error_proc do
+          form_with(**options, &block)
+        end
+      end
+
       def token_tag(...)
         # needed to workaround https://github.com/tailwindlabs/tailwindcss/issues/3350
         super(...).sub(" />", " hidden />").html_safe
@@ -24,6 +28,14 @@ module Plutonium
 
       private
 
+      def build_form_options(options)
+        options[:builder] ||= PlutoniumUi::FormBuilder
+        options[:wrapper] ||= :default_resource_form
+        options[:html] ||= {}
+        options[:html][:novalidate] = false unless options[:html].key?(:novalidate)
+        options
+      end
+
       def with_resource_form_field_error_proc
         # borrowed from https://github.com/heartcombo/simple_form/blob/main/lib/simple_form/action_view_extensions/form_helper.rb#L40C1-L50C10
         # this does not look threadsafe

data/lib/plutonium/rodauth/controller_methods.rb

@@ -7,6 +7,7 @@ module Plutonium
         helper Plutonium::Helpers::ApplicationHelper
         helper Plutonium::Helpers::ComponentHelper
         helper Plutonium::Helpers::AssetsHelper
+        helper Plutonium::Helpers::FormHelper
 
         layout "rodauth"
         append_view_path File.expand_path("app/views", Plutonium.root)

data/lib/plutonium/version.rb

@@ -1,3 +1,3 @@
 module Plutonium
-  VERSION = "0.12.14"
+  VERSION = "0.13.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plutonium
 version: !ruby/object:Gem::Version
-  version: 0.12.14
+  version: 0.13.1
 platform: ruby
 authors:
 - Stefan Froelich
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-06-19 00:00:00.000000000 Z
+date: 2024-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zeitwerk
@@ -1088,25 +1088,6 @@ files:
 - lib/generators/pu/rodauth/migration/active_record/verify_account.erb
 - lib/generators/pu/rodauth/migration/active_record/verify_login_change.erb
 - lib/generators/pu/rodauth/migration/active_record/webauthn.erb
-- lib/generators/pu/rodauth/migration/sequel/account_expiration.erb
-- lib/generators/pu/rodauth/migration/sequel/active_sessions.erb
-- lib/generators/pu/rodauth/migration/sequel/audit_logging.erb
-- lib/generators/pu/rodauth/migration/sequel/base.erb
-- lib/generators/pu/rodauth/migration/sequel/disallow_password_reuse.erb
-- lib/generators/pu/rodauth/migration/sequel/email_auth.erb
-- lib/generators/pu/rodauth/migration/sequel/jwt_refresh.erb
-- lib/generators/pu/rodauth/migration/sequel/lockout.erb
-- lib/generators/pu/rodauth/migration/sequel/otp.erb
-- lib/generators/pu/rodauth/migration/sequel/password_expiration.erb
-- lib/generators/pu/rodauth/migration/sequel/recovery_codes.erb
-- lib/generators/pu/rodauth/migration/sequel/remember.erb
-- lib/generators/pu/rodauth/migration/sequel/reset_password.erb
-- lib/generators/pu/rodauth/migration/sequel/separate_passwords.erb
-- lib/generators/pu/rodauth/migration/sequel/single_session.erb
-- lib/generators/pu/rodauth/migration/sequel/sms_codes.erb
-- lib/generators/pu/rodauth/migration/sequel/verify_account.erb
-- lib/generators/pu/rodauth/migration/sequel/verify_login_change.erb
-- lib/generators/pu/rodauth/migration/sequel/webauthn.erb
 - lib/generators/pu/rodauth/migration_generator.rb
 - lib/generators/pu/rodauth/templates/INSTRUCTIONS
 - lib/generators/pu/rodauth/templates/app/controllers/plugin_controller.rb.tt

data/lib/generators/pu/rodauth/migration/sequel/account_expiration.erb

@@ -1,7 +0,0 @@
-# Used by the account expiration feature
-create_table :<%= table_prefix %>_activity_times do
-  foreign_key :id, :<%= table_prefix.pluralize %>, primary_key: true, type: :Bignum
-  DateTime :last_activity_at, null: false
-  DateTime :last_login_at, null: false
-  DateTime :expired_at
-end

data/lib/generators/pu/rodauth/migration/sequel/active_sessions.erb

@@ -1,8 +0,0 @@
-# Used by the active sessions feature
-create_table :<%= table_prefix %>_active_session_keys do
-  foreign_key :<%= table_prefix %>_id, :<%= table_prefix.pluralize %>, type: :Bignum
-  String :session_id
-  Time :created_at, null: false, default: Sequel::CURRENT_TIMESTAMP
-  Time :last_use, null: false, default: Sequel::CURRENT_TIMESTAMP
-  primary_key [:<%= table_prefix %>_id, :session_id]
-end

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

@@ -1,17 +0,0 @@
-# Used by the audit logging feature
-create_table :<%= table_prefix %>_authentication_audit_logs do
-  primary_key :id, type: :Bignum
-  foreign_key :<%= table_prefix %>_id, :<%= table_prefix.pluralize %>, null: false, type: :Bignum
-  DateTime :at, null: false, default: Sequel::CURRENT_TIMESTAMP
-  String :message, null: false
-<% case db.database_type -%>
-<% when :postgres -%>
-  jsonb :metadata
-<% when :sqlite, :mysql -%>
-  json :metadata
-<% else -%>
-  String :metadata
-<% end -%>
-  index [:<%= table_prefix %>_id, :at], name: :<%= table_prefix %>_audit_<%= table_prefix %>_at_idx
-  index :at, name: :<%= table_prefix %>_audit_at_idx
-end

data/lib/generators/pu/rodauth/migration/sequel/base.erb

@@ -1,25 +0,0 @@
-<% if db.database_type == :postgres -%>
-begin
-  run "CREATE EXTENSION IF NOT EXISTS citext"
-rescue NoMethodError # migration is being reverted
-end
-
-<% end -%>
-create_table :<%= table_prefix.pluralize %> do
-  primary_key :id, type: :Bignum
-<% if db.database_type == :postgres -%>
-  citext :email, null: false
-  constraint :valid_email, email: /^[^,;@ \r\n]+@[^,@; \r\n]+\.[^,@; \r\n]+$/
-<% else -%>
-  String :email, null: false
-<% end -%>
-  Integer :status, null: false, default: 1
-<% if db.supports_partial_indexes? -%>
-  index :email, unique: true, where: { status: [1, 2] }
-<% else -%>
-  index :email, unique: true
-<% end -%>
-<% unless separate_passwords? -%>
-  String :password_hash
-<% end -%>
-end

data/lib/generators/pu/rodauth/migration/sequel/disallow_password_reuse.erb

@@ -1,6 +0,0 @@
-# Used by the disallow password reuse feature
-create_table :<%= table_prefix %>_previous_password_hashes do
-  primary_key :id, type: :Bignum
-  foreign_key :<%= table_prefix %>_id, :<%= table_prefix.pluralize %>, type: :Bignum
-  String :password_hash, null: false
-end

data/lib/generators/pu/rodauth/migration/sequel/email_auth.erb

@@ -1,7 +0,0 @@
-# Used by the email auth feature
-create_table :<%= table_prefix %>_email_auth_keys do
-  foreign_key :id, :<%= table_prefix.pluralize %>, primary_key: true, type: :Bignum
-  String :key, null: false
-  DateTime :deadline, null: false
-  DateTime :email_last_sent, null: false, default: Sequel::CURRENT_TIMESTAMP
-end

data/lib/generators/pu/rodauth/migration/sequel/jwt_refresh.erb

@@ -1,8 +0,0 @@
-# Used by the jwt refresh feature
-create_table :<%= table_prefix %>_jwt_refresh_keys do
-  primary_key :id, type: :Bignum
-  foreign_key :<%= table_prefix %>_id, :<%= table_prefix.pluralize %>, null: false, type: :Bignum
-  String :key, null: false
-  DateTime :deadline, null: false
-  index :<%= table_prefix %>_id, name: :<%= table_prefix %>_jwt_rk_<%= table_prefix %>_id_idx
-end

data/lib/generators/pu/rodauth/migration/sequel/lockout.erb

@@ -1,11 +0,0 @@
-# Used by the lockout feature
-create_table :<%= table_prefix %>_login_failures do
-  foreign_key :id, :<%= table_prefix.pluralize %>, primary_key: true, type: :Bignum
-  Integer :number, null: false, default: 1
-end
-create_table :<%= table_prefix %>_lockouts do
-  foreign_key :id, :<%= table_prefix.pluralize %>, primary_key: true, type: :Bignum
-  String :key, null: false
-  DateTime :deadline, null: false
-  DateTime :email_last_sent
-end

data/lib/generators/pu/rodauth/migration/sequel/otp.erb

@@ -1,7 +0,0 @@
-# Used by the otp feature
-create_table :<%= table_prefix %>_otp_keys do
-  foreign_key :id, :<%= table_prefix.pluralize %>, primary_key: true, type: :Bignum
-  String :key, null: false
-  Integer :num_failures, null: false, default: 0
-  Time :last_use, null: false, default: Sequel::CURRENT_TIMESTAMP
-end

data/lib/generators/pu/rodauth/migration/sequel/password_expiration.erb

@@ -1,5 +0,0 @@
-# Used by the password expiration feature
-create_table :<%= table_prefix %>_password_change_times do
-  foreign_key :id, :<%= table_prefix.pluralize %>, primary_key: true, type: :Bignum
-  DateTime :changed_at, null: false, default: Sequel::CURRENT_TIMESTAMP
-end

data/lib/generators/pu/rodauth/migration/sequel/recovery_codes.erb

@@ -1,6 +0,0 @@
-# Used by the recovery codes feature
-create_table :<%= table_prefix %>_recovery_codes do
-  foreign_key :id, :<%= table_prefix.pluralize %>, type: :Bignum
-  String :code
-  primary_key [:id, :code]
-end

data/lib/generators/pu/rodauth/migration/sequel/remember.erb

@@ -1,6 +0,0 @@
-# Used by the remember me feature
-create_table :<%= table_prefix %>_remember_keys do
-  foreign_key :id, :<%= table_prefix.pluralize %>, primary_key: true, type: :Bignum
-  String :key, null: false
-  DateTime :deadline, null: false
-end

data/lib/generators/pu/rodauth/migration/sequel/reset_password.erb

@@ -1,7 +0,0 @@
-# Used by the password reset feature
-create_table :<%= table_prefix %>_password_reset_keys do
-  foreign_key :id, :<%= table_prefix.pluralize %>, primary_key: true, type: :Bignum
-  String :key, null: false
-  DateTime :deadline, null: false
-  DateTime :email_last_sent, null: false, default: Sequel::CURRENT_TIMESTAMP
-end

data/lib/generators/pu/rodauth/migration/sequel/separate_passwords.erb

@@ -1,6 +0,0 @@
-# Stores password hashes separate from the account table
-create_table :<%= table_prefix %>_password_hashes do
-  primary_key :id, type: :Bignum
-  foreign_key :<%= table_prefix %>_id, :<%= table_prefix.pluralize %>, type: :Bignum
-  String :password_hash, null: false
-end