plutonium 0.16.5 → 0.18.0

data/app/views/plutonium/_resource_header.html.erb

@@ -5,36 +5,45 @@
 
   <% header.with_action do %>
     <%=
-      render_component :nav_grid_menu, label: "Apps" do |menu|
-        menu.with_item url: "#", name: "Sales", icon: "outline/sale-percent"
-        menu.with_item url: "#", name: "Users", icon: "outline/users"
+      render Plutonium::UI::NavGridMenu.new(label: "Apps", icon: Phlex::TablerIcons::Apps) do |menu|
+        menu.with_item(name: "Dashboard", icon: Phlex::TablerIcons::Dashboard, href: "#")
+        menu.with_item(name: "Settings", icon: Phlex::TablerIcons::Settings, href: "#")
+        menu.with_item(name: "Profile", icon: Phlex::TablerIcons::User, href: "#")
       end
     %>
   <% end %>
 
   <% header.with_action do %>
-    <%= render_component :nav_user, email: current_user.try(:email) || current_user, logout_url: try(:logout_url) do |nav_user| %>
-      <% nav_user.with_section do |section| %>
-        <% section.with_link url: "#", label: "My profile" %>
-        <% section.with_link url: "#", label: "Account settings" %>
-      <% end %>
+    <%=
+      render Plutonium::UI::NavUser.new(
+        name: nil,
+        email: current_user.try(:email) || current_user
+      ) do |nav|
+        nav.with_section do |section|
+          section.with_link(label: "My profile", href: "#")
+          section.with_link(label: "Account settings", href: "#")
+        end
 
-      <% nav_user.with_section do |section| %>
-        <% section.with_link url: "#", label: "My likes" do |link| %>
-          <% link.with_leading do %>
-            <%= render_icon "outline/heart", classname: "mr-2 text-gray-400" %>
-          <% end %>
-        <% end %>
+        nav.with_section do |section|
+          section.with_link(label: "My likes", href: "#") do |link|
+            link.with_leading do
+              render Phlex::TablerIcons::Heart.new(class: "mr-2 text-gray-400 w-4 h-4")
+            end
+          end
+          section.with_link(label: "Pro version", href: "#") do |link|
+            link.with_leading do
+              render Phlex::TablerIcons::Flame.new(class: "mr-2 text-primary-600 dark:text-primary-500 w-4 h-4")
+            end
+            link.with_trailing do
+              render Phlex::TablerIcons::CaretRight.new(class: "w-3 h-3")
+            end
+          end
+        end
 
-        <% section.with_link url: "#", label: "Pro version" do |link| %>
-          <% link.with_leading do %>
-            <%= render_icon "outline/fire", classname: "mr-2 text-primary-600 dark:text-primary-500" %>
-          <% end %>
-          <% link.with_trailing do %>
-            <%= render_icon "outline/angle-right", size: :sm %>
-          <% end %>
-        <% end %>
-      <% end %>
-    <% end %>
+        nav.with_section do |section|
+          section.with_link(label: "Sign out", href: try(:logout_url) || "#", class: "rounded-b-lg", data: {turbo: false})
+        end
+      end
+    %>
   <% end %>
 <% end %>

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

@@ -0,0 +1,22 @@
+<%= form_with url: rodauth.otp_unlock_path, method: :post, data: { turbo: false }, class: "space-y-4" do |form| %>
+  <dl class="mb-6 text-sm space-y-2">
+    <dt class="font-semibold text-gray-900 dark:text-white"><%= rodauth.otp_unlock_consecutive_successes_label %>:</dt>
+    <dd class="text-gray-700 dark:text-gray-300"><%= rodauth.otp_unlock_num_successes %></dd>
+
+    <dt class="font-semibold text-gray-900 dark:text-white"><%= rodauth.otp_unlock_required_consecutive_successes_label %>:</dt>
+    <dd class="text-gray-700 dark:text-gray-300"><%= rodauth.otp_unlock_auths_required %></dd>
+
+    <dt class="font-semibold text-gray-900 dark:text-white"><%= rodauth.otp_unlock_next_auth_deadline_label %>:</dt>
+    <dd class="text-gray-700 dark:text-gray-300"><%= rodauth.otp_unlock_deadline.strftime(rodauth.strftime_format) %></dd>
+  </dl>
+
+  <div>
+    <%= form.label "otp-auth-code", rodauth.otp_auth_label, class: "block mb-2 text-sm font-semibold text-gray-900 dark:text-white" %>
+    <%= form.text_field rodauth.otp_auth_param, value: "", id: "otp-auth-code", autocomplete: "off", inputmode: "numeric", required: true, class: "mt-2 text-sm w-1/2 px-3 py-2 border rounded-md dark:bg-gray-900 dark:text-gray-100 dark:focus:bg-gray-800 #{rodauth.field_error(rodauth.otp_auth_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: "otp-auth-code_error_message" } if rodauth.field_error(rodauth.otp_auth_param)) %>
+    <%= content_tag(:span, rodauth.field_error(rodauth.otp_auth_param), class: "block mt-1 text-red-600 text-xs dark:text-red-400", id: "otp-auth-code_error_message") if rodauth.field_error(rodauth.otp_auth_param) %>
+  </div>
+
+  <%= form.submit rodauth.otp_unlock_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 %>
+
+<%== rodauth.otp_unlock_form_footer %>

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

@@ -0,0 +1,14 @@
+<dl class="mb-6 text-sm space-y-2">
+ <dt class="font-semibold text-gray-900 dark:text-white"><%= rodauth.otp_unlock_consecutive_successes_label %>:</dt>
+ <dd class="text-gray-700 dark:text-gray-300"><%= rodauth.otp_unlock_num_successes %></dd>
+
+ <dt class="font-semibold text-gray-900 dark:text-white"><%= rodauth.otp_unlock_required_consecutive_successes_label %>:</dt>
+ <dd class="text-gray-700 dark:text-gray-300"><%= rodauth.otp_unlock_auths_required %></dd>
+
+ <dt class="font-semibold text-gray-900 dark:text-white"><%= rodauth.otp_unlock_next_auth_attempt_label %>:</dt>
+ <dd class="text-gray-700 dark:text-gray-300"><%= rodauth.otp_unlock_deadline.strftime(rodauth.strftime_format) %></dd>
+</dl>
+
+<p class="mt-2 text-gray-900 dark:text-white font-semibold"><%= rodauth.otp_unlock_next_auth_attempt_refresh_label %></p>
+
+<%== rodauth.otp_unlock_refresh_tag %>

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

@@ -10,6 +10,7 @@
   <fieldset class="mb-6">
     <% rodauth.account_webauthn_usage.each do |id, last_use| %>
       <div class="flex items-center space-x-2">
+        <% last_use = last_use.strftime(rodauth.strftime_format) if last_use.is_a?(Time) %>
         <%= form.radio_button rodauth.webauthn_remove_param, id, id: "webauthn-remove-#{id}", class: "dark:bg-gray-900 dark:border-gray-600 dark:checked:bg-current dark:checked:border-current dark:checked:text-emerald-400 dark:focus:ring-emerald-400 dark:focus:ring-offset-gray-900" %>
         <%= form.label "webauthn-remove-#{id}", "Last use: #{last_use}", class: "text-sm" %>
       </div>

data/docs/guide/getting-started/resources.md

@@ -83,8 +83,8 @@ end
 ```ruby [Custom Displays]
 class BlogDefinition < Plutonium::Resource::Definition
   # Customize how fields are displayed
-  display :title, class: "col-span-full"
-  display :content, class: "col-span-full" do |f|
+  display :title, wrapper: {class: "col-span-full"}
+  display :content, wrapper: {class: "col-span-full"} do |f|
     f.text_tag class: "format dark:format-invert"
   end
 

data/docs/guide/tutorial.md

@@ -236,10 +236,10 @@ Customize the post detail layout using display grids:
 ```ruby
 # packages/blogging/app/definitions/blogging/post_definition.rb
 class Blogging::PostDefinition < Blogging::ResourceDefinition
-  display :user, class: "col-span-full"
-  display :title, class: "col-span-full"
-  display :content, class: "col-span-full"
-  display :published_at, class: "col-span-full"
+  display :user, wrapper: {class: "col-span-full"}
+  display :title, wrapper: {class: "col-span-full"}
+  display :content, wrapper: {class: "col-span-full"}
+  display :published_at, wrapper: {class: "col-span-full"}
 end
 ```
 

data/gemfiles/rails_7.gemfile.lock

@@ -0,0 +1,406 @@
+PATH
+  remote: ..
+  specs:
+    plutonium (0.17.0)
+      action_policy (~> 0.7.0)
+      dry-initializer (~> 3.1)
+      listen (~> 3.8)
+      pagy (~> 9.0)
+      phlex (~> 1.11)
+      phlex-rails
+      phlex-slotable
+      phlex-tabler_icons
+      phlexi-display
+      phlexi-form
+      phlexi-menu
+      phlexi-table
+      rabl (~> 0.16.1)
+      rails (>= 7.1, < 8.0)
+      redcarpet
+      semantic_range (~> 3.0)
+      simple_form (~> 5.3)
+      tailwind_merge
+      tty-prompt (~> 0.23.1)
+      zeitwerk
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    action_policy (0.7.3)
+      ruby-next-core (>= 1.0)
+    actioncable (7.1.5.1)
+      actionpack (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+      zeitwerk (~> 2.6)
+    actionmailbox (7.1.5.1)
+      actionpack (= 7.1.5.1)
+      activejob (= 7.1.5.1)
+      activerecord (= 7.1.5.1)
+      activestorage (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
+      mail (>= 2.7.1)
+      net-imap
+      net-pop
+      net-smtp
+    actionmailer (7.1.5.1)
+      actionpack (= 7.1.5.1)
+      actionview (= 7.1.5.1)
+      activejob (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
+      mail (~> 2.5, >= 2.5.4)
+      net-imap
+      net-pop
+      net-smtp
+      rails-dom-testing (~> 2.2)
+    actionpack (7.1.5.1)
+      actionview (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
+      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.5.1)
+      actionpack (= 7.1.5.1)
+      activerecord (= 7.1.5.1)
+      activestorage (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
+      globalid (>= 0.6.0)
+      nokogiri (>= 1.8.5)
+    actionview (7.1.5.1)
+      activesupport (= 7.1.5.1)
+      builder (~> 3.1)
+      erubi (~> 1.11)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    activejob (7.1.5.1)
+      activesupport (= 7.1.5.1)
+      globalid (>= 0.3.6)
+    activemodel (7.1.5.1)
+      activesupport (= 7.1.5.1)
+    activerecord (7.1.5.1)
+      activemodel (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
+      timeout (>= 0.4.0)
+    activestorage (7.1.5.1)
+      actionpack (= 7.1.5.1)
+      activejob (= 7.1.5.1)
+      activerecord (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
+      marcel (~> 1.0)
+    activesupport (7.1.5.1)
+      base64
+      benchmark (>= 0.3)
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
+      i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
+      minitest (>= 5.1)
+      mutex_m
+      securerandom (>= 0.3)
+      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)
+    benchmark (0.4.0)
+    bigdecimal (3.1.9)
+    brakeman (6.2.2)
+      racc
+    builder (3.3.0)
+    bundle-audit (0.1.0)
+      bundler-audit
+    bundler-audit (0.9.2)
+      bundler (>= 1.2.0, < 3)
+      thor (~> 1.0)
+    combustion (1.5.0)
+      activesupport (>= 3.0.0)
+      railties (>= 3.0.0)
+      thor (>= 0.14.6)
+    concurrent-ruby (1.3.4)
+    connection_pool (2.4.1)
+    crass (1.0.6)
+    date (3.4.1)
+    drb (2.2.1)
+    dry-initializer (3.1.1)
+    erubi (1.13.1)
+    ffi (1.17.0-aarch64-linux-gnu)
+    ffi (1.17.0-aarch64-linux-musl)
+    ffi (1.17.0-arm-linux-gnu)
+    ffi (1.17.0-arm-linux-musl)
+    ffi (1.17.0-arm64-darwin)
+    ffi (1.17.0-x86_64-darwin)
+    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.0-x86_64-linux-musl)
+    fiber-local (1.1.0)
+      fiber-storage
+    fiber-storage (1.0.0)
+    globalid (1.2.1)
+      activesupport (>= 6.1)
+    i18n (1.14.6)
+      concurrent-ruby (~> 1.0)
+    importmap-rails (2.1.0)
+      actionpack (>= 6.0.0)
+      activesupport (>= 6.0.0)
+      railties (>= 6.0.0)
+    io-console (0.8.0)
+    irb (1.14.3)
+      rdoc (>= 4.0.0)
+      reline (>= 0.4.2)
+    json (2.9.1)
+    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)
+    logger (1.6.4)
+    loofah (2.23.1)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.12.0)
+    lru_redux (1.1.0)
+    mail (2.8.1)
+      mini_mime (>= 0.1.1)
+      net-imap
+      net-pop
+      net-smtp
+    marcel (1.0.4)
+    mini_mime (1.1.5)
+    minitest (5.25.4)
+    minitest-reporters (1.7.1)
+      ansi
+      builder
+      minitest (>= 5.0)
+      ruby-progressbar
+    mutex_m (0.3.0)
+    net-imap (0.5.4)
+      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.4)
+    nokogiri (1.18.0-aarch64-linux-gnu)
+      racc (~> 1.4)
+    nokogiri (1.18.0-aarch64-linux-musl)
+      racc (~> 1.4)
+    nokogiri (1.18.0-arm-linux-gnu)
+      racc (~> 1.4)
+    nokogiri (1.18.0-arm-linux-musl)
+      racc (~> 1.4)
+    nokogiri (1.18.0-arm64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.18.0-x86_64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.18.0-x86_64-linux-gnu)
+      racc (~> 1.4)
+    nokogiri (1.18.0-x86_64-linux-musl)
+      racc (~> 1.4)
+    pagy (9.3.3)
+    parallel (1.26.3)
+    parser (3.3.6.0)
+      ast (~> 2.4.1)
+      racc
+    pastel (0.8.0)
+      tty-color (~> 0.5)
+    phlex (1.11.0)
+    phlex-rails (1.2.2)
+      phlex (>= 1.10, < 2)
+      railties (>= 6.1, < 9)
+    phlex-slotable (0.5.0)
+      phlex (>= 1.9, < 3)
+    phlex-tabler_icons (0.3.0)
+    phlexi-display (0.0.9)
+      activesupport
+      phlex (~> 1.11)
+      phlexi-field
+      zeitwerk
+    phlexi-field (0.0.11)
+      activesupport
+      fiber-local
+      phlex (~> 1.11)
+      zeitwerk
+    phlexi-form (0.7.0)
+      activesupport
+      phlex (~> 1.11)
+      phlexi-field
+      zeitwerk
+    phlexi-menu (0.2.0)
+      phlex (~> 1.11)
+      phlexi-field
+      zeitwerk
+    phlexi-table (0.0.5)
+      activesupport
+      phlex (~> 1.11)
+      phlexi-display
+      phlexi-field
+      zeitwerk
+    psych (5.2.2)
+      date
+      stringio
+    puma (6.5.0)
+      nio4r (~> 2.0)
+    rabl (0.16.1)
+      activesupport (>= 2.3.14)
+    racc (1.8.1)
+    rack (3.1.8)
+    rack-session (2.0.0)
+      rack (>= 3.0.0)
+    rack-test (2.2.0)
+      rack (>= 1.3)
+    rackup (2.2.1)
+      rack (>= 3)
+    rails (7.1.5.1)
+      actioncable (= 7.1.5.1)
+      actionmailbox (= 7.1.5.1)
+      actionmailer (= 7.1.5.1)
+      actionpack (= 7.1.5.1)
+      actiontext (= 7.1.5.1)
+      actionview (= 7.1.5.1)
+      activejob (= 7.1.5.1)
+      activemodel (= 7.1.5.1)
+      activerecord (= 7.1.5.1)
+      activestorage (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
+      bundler (>= 1.15.0)
+      railties (= 7.1.5.1)
+    rails-dom-testing (2.2.0)
+      activesupport (>= 5.0.0)
+      minitest
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.6.2)
+      loofah (~> 2.21)
+      nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
+    railties (7.1.5.1)
+      actionpack (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
+      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.10.0)
+      psych (>= 4.0.0)
+    redcarpet (3.6.0)
+    regexp_parser (2.10.0)
+    reline (0.6.0)
+      io-console (~> 0.5)
+    rubocop (1.69.2)
+      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 (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.36.2, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.37.0)
+      parser (>= 3.3.1.0)
+    rubocop-performance (1.23.0)
+      rubocop (>= 1.48.1, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
+    ruby-next-core (1.0.3)
+    ruby-progressbar (1.13.0)
+    securerandom (0.4.1)
+    semantic_range (3.1.0)
+    simple_form (5.3.1)
+      actionpack (>= 5.2)
+      activemodel (>= 5.2)
+    sqlite3 (1.7.3-aarch64-linux)
+    sqlite3 (1.7.3-arm-linux)
+    sqlite3 (1.7.3-arm64-darwin)
+    sqlite3 (1.7.3-x86_64-darwin)
+    sqlite3 (1.7.3-x86_64-linux)
+    standard (1.43.0)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.0)
+      rubocop (~> 1.69.1)
+      standard-custom (~> 1.0.0)
+      standard-performance (~> 1.6)
+    standard-custom (1.0.2)
+      lint_roller (~> 1.0)
+      rubocop (~> 1.50)
+    standard-performance (1.6.0)
+      lint_roller (~> 1.1)
+      rubocop-performance (~> 1.23.0)
+    stimulus-rails (1.3.4)
+      railties (>= 6.0.0)
+    stringio (3.1.2)
+    tailwind_merge (0.14.0)
+      lru_redux (~> 1.1)
+    thor (1.3.2)
+    timeout (0.4.3)
+    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.11)
+      actionpack (>= 6.0.0)
+      railties (>= 6.0.0)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (3.1.3)
+      unicode-emoji (~> 4.0, >= 4.0.4)
+    unicode-emoji (4.0.4)
+    websocket-driver (0.7.6)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.5)
+    wisper (2.0.1)
+    zeitwerk (2.7.1)
+
+PLATFORMS
+  aarch64-linux
+  aarch64-linux-gnu
+  aarch64-linux-musl
+  arm-linux
+  arm-linux-gnu
+  arm-linux-musl
+  arm64-darwin
+  x86_64-darwin
+  x86_64-linux
+  x86_64-linux-gnu
+  x86_64-linux-musl
+
+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.16

data/lib/generators/pu/core/assets/assets_generator.rb

@@ -29,7 +29,7 @@ module Pu
       end
 
       def install_dependencies
-        run "yarn add @radioactive-labs/plutonium flowbite @tailwindcss/forms @tailwindcss/typography flowbite-typography postcss-cli cssnano marked"
+        run "yarn add @radioactive-labs/plutonium @tailwindcss/forms @tailwindcss/typography flowbite-typography postcss-cli cssnano marked"
       end
 
       def configure_application

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

@@ -29,16 +29,30 @@ module Pu
 
         selected_resources.each do |resource|
           @resource_class = resource
-
-          template "app/controllers/resource_controller.rb", "packages/#{package_namespace}/app/controllers/#{package_namespace}/#{resource.pluralize.underscore}_controller.rb"
-          template "app/policies/resource_policy.rb", "packages/#{package_namespace}/app/policies/#{package_namespace}/#{resource.underscore}_policy.rb" unless expected_parent_policy
-          # template "app/presenters/resource_presenter.rb", "packages/#{package_namespace}/app/presenters/#{package_namespace}/#{resource.underscore}_presenter.rb" unless expected_parent_presenter
-          # template "app/query_objects/resource_query_object.rb", "packages/#{package_namespace}/app/query_objects/#{package_namespace}/#{resource.underscore}_query_object.rb" unless expected_parent_query_object
-          template "app/definitions/resource_definition.rb", "packages/#{package_namespace}/app/definitions/#{package_namespace}/#{resource.underscore}_definition.rb" unless expected_parent_definition
-
-          insert_into_file "packages/#{package_namespace}/config/routes.rb",
-            indent("register_resource ::#{resource}\n", 2),
-            before: /.*# register resources above.*/
+          if app_namespace == "MainApp"
+            insert_into_file "config/routes.rb",
+              indent("register_resource ::#{resource}\n", 2),
+              after: /.*Rails\.application\.routes\.draw do.*\n/
+          else
+            unless expected_parent_policy
+              template "app/policies/resource_policy.rb",
+                "packages/#{package_namespace}/app/policies/#{package_namespace}/#{resource.underscore}_policy.rb"
+            end
+
+            unless expected_parent_definition
+              template "app/definitions/resource_definition.rb",
+                "packages/#{package_namespace}/app/definitions/#{package_namespace}/#{resource.underscore}_definition.rb"
+            end
+            # template "app/presenters/resource_presenter.rb", "packages/#{package_namespace}/app/presenters/#{package_namespace}/#{resource.underscore}_presenter.rb" unless expected_parent_presenter
+            # template "app/query_objects/resource_query_object.rb", "packages/#{package_namespace}/app/query_objects/#{package_namespace}/#{resource.underscore}_query_object.rb" unless expected_parent_query_object
+
+            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}\n", 2),
+              before: /.*# register resources above.*/
+          end
         end
       rescue => e
         exception "#{self.class} failed:", e

data/lib/generators/pu/rodauth/concerns/configuration.rb

@@ -101,6 +101,14 @@ module Pu
               otp_keys_table: "%<singular>s_otp_keys"
             }
           },
+          otp_unlock: {
+            views: %w[otp_unlock otp_unlock_not_available],
+            migrations: {
+              otp_unlock_table: "%<singular>s_otp_unlocks"
+            }
+          },
+          otp_lockout_email: {},
+          otp_modify_email: {},
           sms_codes: {
             views: %w[sms_setup sms_confirm sms_auth sms_request sms_disable],
             migrations: {
@@ -121,9 +129,12 @@ module Pu
               webauthn_keys_account_id_column: "%<singular>s_id"
             }
           },
+          webauthn_login: {},
           webauthn_autofill: {
             views: %w[webauthn_autofill]
           },
+          webauthn_modify_email: {},
+          webauthn_verify_account: {},
           lockout: {
             views: %w[unlock_account_request unlock_account],
             migrations: {

data/lib/generators/pu/rodauth/concerns/feature_selector.rb

@@ -55,6 +55,10 @@ module Pu
             return true if only_json?
           when :remember
             return false if only_json?
+          when :otp
+            return true if otp_unlock? || otp_lockout_email? || otp_modify_email?
+          when :webauthn
+            return true if webauthn_login? || webauthn_autofill? || webauthn_modify_email? || webauthn_verify_account?
           end
 
           return feature_options[:default] if defaults? && options[feature].nil?

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

@@ -21,7 +21,9 @@ module Pu
 
       def add_rodauth
         Bundler.with_unbundled_env do
-          run "bundle add bcrypt rodauth-rails"
+          %w[bcrypt sequel-activerecord_connection tilt rodauth-rails].each do |gem|
+            run "bundle add #{gem}"
+          end
         end
       end
 

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

@@ -0,0 +1,7 @@
+# Used by the otp_unlock feature
+create_table :<%= table_prefix %>_otp_unlocks, id: false do |t|
+  t.<%= primary_key_type(nil) %> :id, primary_key: true
+  t.foreign_key :<%= table_prefix.pluralize %>, column: :id
+  t.integer :num_successes, null: false, default: 1
+  t.datetime :next_auth_attempt_after, null: false, default: -> { "<%= current_timestamp %>" }
+end