padrino-admin 0.16.2 → 0.18.0

data/lib/padrino-admin/generators/templates/erb/app/base/index.erb.tt

@@ -6,7 +6,7 @@
 
 <div class=base-icons>
   <div class=btn-group>
-    <div class="btn btn-primary" title="Adapters for datamapper, sequel, activerecord, minirecord, mongomapper, mongoid, couchrest"><%%= tag_icon("cogs fa-2x", "Orm Agnostic") %></div>
+    <div class="btn btn-primary" title="Adapters for activerecord, sequel, mongoid"><%%= tag_icon("cogs fa-2x", "Orm Agnostic") %></div>
     <div class="btn btn-success" title="User Authentication Support, User Authorization Management"><%%= tag_icon("group fa-2x", "Authentication") %></div>
     <div class="btn btn-info" title="Erb, Haml, Slim Rendering Support"><%%= tag_icon("tasks fa-2x", "Template Agnostic") %></div>
     <div class="btn btn-warning" title="English, German, Russian, Danish, French, Brazilian and Italian localizations and many more!.."><%%= tag_icon("flag fa-2x", "Multi Language") %></div>

data/lib/padrino-admin/generators/templates/erb/app/layouts/application.erb.tt

@@ -60,6 +60,6 @@
       </div>
     </footer>
 
-    <%%= javascript_include_tag 'jquery-1.11.0.min', (Padrino.env == :production ? 'bootstrap/bootstrap.min' : %w[bootstrap/affix bootstrap/alert bootstrap/button bootstrap/carousel bootstrap/collapse bootstrap/dropdown bootstrap/tooltip bootstrap/transition bootstrap/modal bootstrap/popover bootstrap/scrollspy bootstrap/tab]), :application %>
+    <%%= javascript_include_tag 'jquery-3.7.1.min', (Padrino.env == :production ? 'bootstrap/bootstrap.min' : %w[bootstrap/affix bootstrap/alert bootstrap/button bootstrap/carousel bootstrap/collapse bootstrap/dropdown bootstrap/tooltip bootstrap/transition bootstrap/modal bootstrap/popover bootstrap/scrollspy bootstrap/tab]), :application %>
   </body>
 </html>

data/lib/padrino-admin/generators/templates/erb/app/sessions/new.erb.tt

@@ -40,6 +40,6 @@
       </div>
       <div class="login-footer modal-footer"><%%= submit_tag(pat('login.sign_in'), class: 'btn btn-primary pull-right') %></div>
     <%% end %>
-    <%%= javascript_include_tag 'jquery-1.11.0.min', (Padrino.env == :production ? 'bootstrap/bootstrap.min' : %w[bootstrap/affix bootstrap/alert bootstrap/button bootstrap/carousel bootstrap/collapse bootstrap/dropdown bootstrap/tooltip bootstrap/transition bootstrap/modal bootstrap/popover bootstrap/scrollspy bootstrap/tab]), :application %>
+    <%%= javascript_include_tag 'jquery-3.7.1.min', (Padrino.env == :production ? 'bootstrap/bootstrap.min' : %w[bootstrap/affix bootstrap/alert bootstrap/button bootstrap/carousel bootstrap/collapse bootstrap/dropdown bootstrap/tooltip bootstrap/transition bootstrap/modal bootstrap/popover bootstrap/scrollspy bootstrap/tab]), :application %>
   </body>
 </html>

data/lib/padrino-admin/generators/templates/erb/page/index.erb.tt

@@ -15,11 +15,11 @@
               <li class=list-menu-wrapper>
                 <%%= link_to tag_icon('check-square-o', pat(:select_all)), '#', id: 'select-all', class: 'list-menu-link' %>
               </li>
-              <li class=list-menu-wrapper.list-menu-wrapper-disabled>
+              <li class="list-menu-wrapper list-menu-wrapper-disabled">
                 <%%= link_to tag_icon('square-o', pat(:deselect_all)), '#', id: 'deselect-all', class: 'list-menu-link list-menu-link-disabled' %>
               </li>
               <li class="list-menu-divider divider"></li>
-              <li class=list-menu-wrapper.list-menu-wrapper-disabled>
+              <li class="list-menu-wrapper list-menu-wrapper-disabled">
                 <%%=link_to tag_icon('trash-o', pat(:delete_selected)), '#', id: 'delete-selected', class: 'list-menu-link list-menu-link-disabled' %>
                 <div class='list-menu-popover-delete-selected popover right'>
                   <div class=arrow></div>

data/lib/padrino-admin/generators/templates/haml/app/base/index.haml.tt

@@ -5,7 +5,7 @@
 
 .base-icons
   .btn-group
-    .btn.btn-primary{title: 'Adapters for datamapper, sequel, activerecord, minirecord, mongomapper, mongoid, couchrest'}
+    .btn.btn-primary{title: 'Adapters for activerecord, sequel, mongoid'}
       = tag_icon('cogs fa-2x', 'Orm Agnostic')
     .btn.btn-success{title: 'User Authentication Support, User Authorization Management'}
       = tag_icon('group fa-2x', 'Authentication')

data/lib/padrino-admin/generators/templates/haml/app/layouts/application.haml.tt

@@ -46,4 +46,4 @@
           %li= link_to tag_icon(:github, 'code'), 'https://github.com/padrino/padrino-framework', target: :_blank, class: 'footer-links-link'
           %li= link_to tag_icon(:twitter, 'twitter'), 'http://twitter.com/padrinorb', target: :_blank, class: 'footer-links-link'
 
-    =javascript_include_tag 'jquery-1.11.0.min', (Padrino.env == :production ? 'bootstrap/bootstrap.min' : %w[bootstrap/affix bootstrap/alert bootstrap/button bootstrap/carousel bootstrap/collapse bootstrap/dropdown  bootstrap/tooltip bootstrap/transition  bootstrap/modal bootstrap/popover bootstrap/scrollspy bootstrap/tab]), :application
+    =javascript_include_tag 'jquery-3.7.1.min', (Padrino.env == :production ? 'bootstrap/bootstrap.min' : %w[bootstrap/affix bootstrap/alert bootstrap/button bootstrap/carousel bootstrap/collapse bootstrap/dropdown  bootstrap/tooltip bootstrap/transition  bootstrap/modal bootstrap/popover bootstrap/scrollspy bootstrap/tab]), :application

data/lib/padrino-admin/generators/templates/haml/app/sessions/new.haml.tt

@@ -35,5 +35,5 @@
       .login-footer.modal-footer
         = submit_tag(pat('login.sign_in'), class: 'btn btn-primary pull-right')
 
-        =javascript_include_tag 'jquery-1.11.0.min', (Padrino.env == :production ? 'bootstrap/bootstrap.min' : %w[bootstrap/affix bootstrap/alert bootstrap/button bootstrap/carousel bootstrap/collapse bootstrap/dropdown  bootstrap/tooltip bootstrap/transition  bootstrap/modal bootstrap/popover bootstrap/scrollspy bootstrap/tab]), :application
+        =javascript_include_tag 'jquery-3.7.1.min', (Padrino.env == :production ? 'bootstrap/bootstrap.min' : %w[bootstrap/affix bootstrap/alert bootstrap/button bootstrap/carousel bootstrap/collapse bootstrap/dropdown  bootstrap/tooltip bootstrap/transition  bootstrap/modal bootstrap/popover bootstrap/scrollspy bootstrap/tab]), :application
 

data/lib/padrino-admin/generators/templates/slim/app/base/index.slim.tt

@@ -5,7 +5,7 @@ div class="base-text"
 
 div class="base-icons"
   div class="btn-group"
-    div class="btn btn-primary" title="Adapters for datamapper, sequel, activerecord, minirecord, mongomapper, mongoid, couchrest" = tag_icon("cogs fa-2x", "Orm Agnostic")
+    div class="btn btn-primary" title="Adapters for activerecord, sequel, mongoid" = tag_icon("cogs fa-2x", "Orm Agnostic")
     div class="btn btn-success" title="User Authentication Support, User Authorization Management" = tag_icon("group fa-2x", "Authentication")
     div class="btn btn-info" title="Erb, Haml, Slim Rendering Support" = tag_icon("tasks fa-2x", "Template Agnostic")
     div class="btn btn-warning" title="English, German, Russian, Danish, French, Brazilian and Italian localizations" = tag_icon("flag fa-2x", "Multi Language")

data/lib/padrino-admin/generators/templates/slim/app/layouts/application.slim.tt

@@ -46,4 +46,4 @@ html lang='en'
           li = link_to tag_icon(:github, 'code'), 'https://github.com/padrino/padrino-framework', target: :_blank, class: 'footer-links-link'
           li = link_to tag_icon(:twitter, 'twitter'), 'http://twitter.com/padrinorb', target: :_blank, class: 'footer-links-link'
 
-    = javascript_include_tag 'jquery-1.11.0.min', (Padrino.env == :production ? 'bootstrap/bootstrap.min' : %w[bootstrap/affix bootstrap/alert bootstrap/button bootstrap/carousel bootstrap/collapse bootstrap/dropdown  bootstrap/tooltip bootstrap/transition  bootstrap/modal bootstrap/popover bootstrap/scrollspy bootstrap/tab]), :application
+    = javascript_include_tag 'jquery-3.7.1.min', (Padrino.env == :production ? 'bootstrap/bootstrap.min' : %w[bootstrap/affix bootstrap/alert bootstrap/button bootstrap/carousel bootstrap/collapse bootstrap/dropdown  bootstrap/tooltip bootstrap/transition  bootstrap/modal bootstrap/popover bootstrap/scrollspy bootstrap/tab]), :application

data/lib/padrino-admin/generators/templates/slim/app/sessions/new.slim.tt

@@ -34,4 +34,4 @@ html lang="en" xmlns="http://www.w3.org/1999/xhtml"
 
         div class="login-footer modal-footer"
           = submit_tag(pat('login.sign_in'), class: 'btn btn-primary pull-right')
-    = javascript_include_tag 'jquery-1.11.0.min', (Padrino.env == :production ? 'bootstrap/bootstrap.min' : %w[bootstrap/affix bootstrap/alert bootstrap/button bootstrap/carousel bootstrap/collapse bootstrap/dropdown  bootstrap/tooltip bootstrap/transition  bootstrap/modal bootstrap/popover bootstrap/scrollspy bootstrap/tab]), :application
+    = javascript_include_tag 'jquery-3.7.1.min', (Padrino.env == :production ? 'bootstrap/bootstrap.min' : %w[bootstrap/affix bootstrap/alert bootstrap/button bootstrap/carousel bootstrap/collapse bootstrap/dropdown  bootstrap/tooltip bootstrap/transition  bootstrap/modal bootstrap/popover bootstrap/scrollspy bootstrap/tab]), :application

data/lib/padrino-admin/generators/templates/slim/page/index.slim.tt

@@ -8,10 +8,10 @@ div class="tabs-content"
       tr
         th class='header list-menu'
           div class='dropdown'
-            a href='#' class='list-menu-toggle.dropdown-toggle dropdown-toggle' data-toggle='dropdown'
+            a href='#' class='list-menu-toggle dropdown-toggle' data-toggle='dropdown'
               = tag_icon :magic
               span class='caret'
-            ul class='list-menu dropdown-menu' role='dropdown'
+            ul class='list-menu dropdown-menu' role='menu'
               li class='list-menu-wrapper' = link_to tag_icon('check-square-o', pat(:select_all)), '#', id: 'select-all', class: 'list-menu-link'
               li class='list-menu-wrapper list-menu-wrapper-disabled' = link_to tag_icon('square-o', pat(:deselect_all)), '#', id: 'deselect-all', class: 'list-menu-link list-menu-link-disabled'
               li class='list-menu-divider divider'

data/lib/padrino-admin/helpers/authentication_helpers.rb

@@ -98,7 +98,7 @@ module Padrino
         end
 
         def admin_model_obj
-          @_admin_model_obj ||= settings.admin_model.constantize
+          @_admin_model_obj ||= Padrino::Inflections.constantize(settings.admin_model)
         rescue NameError
           raise Padrino::Admin::AccessControlError, "You must define an #{settings.admin_model} Model"
         end

data/lib/padrino-admin/helpers/view_helpers.rb

@@ -40,7 +40,7 @@ module Padrino
         #
         def padrino_admin_translate(word, *args)
           options = args.last.is_a?(Hash) ? args.pop : {}
-          options[:default] ||= word.to_s.humanize
+          options[:default] ||= Padrino::Inflections.humanize(word)
           t("padrino.admin.#{word}", options)
         end
         alias pat padrino_admin_translate
@@ -60,7 +60,7 @@ module Padrino
         #   mat(:account, :email)
         #
         def model_attribute_translate(model, attribute)
-          t("models.#{model}.attributes.#{attribute}", default: attribute.to_s.humanize)
+          t("models.#{model}.attributes.#{attribute}", default: Padrino::Inflections.humanize(attribute))
         end
         alias t_attr model_attribute_translate
         alias mat t_attr
@@ -78,7 +78,7 @@ module Padrino
         #   mt(:account)
         #
         def model_translate(model)
-          t("models.#{model}.name", default: model.to_s.humanize)
+          t("models.#{model}.name", default: Padrino::Inflections.humanize(model))
         end
         alias mt model_translate
       end

data/lib/padrino-admin/locale/orm/pl.yml

@@ -25,14 +25,3 @@ pl:
         record_invalid: "Negatywne sprawdzenie poprawności: %{errors}"
         content_type: "nieodozwolony format pliku"
   activerecord: *activemodel
-  ohm:
-    errors:
-      messages:
-        format: "jest nieprawidłowe"
-        not_present: "nie może być puste"
-        not_numeric: "nie jest liczbą"
-        not_url: "jest nieprawidłowe"
-        not_email: "jest nieprawidłowe"
-        not_valid: "nie znajduje się na liście dopuszczalnych wartości"
-        not_in_range: "nie znajduje się na liście dopuszczalnych wartości"
-        not_decimal: "jest nieprawidłowe"

data/lib/padrino-admin.rb

@@ -8,7 +8,7 @@ module Padrino
   ##
   # Padrino::Admin is beautiful Ajax Admin, with these features:
   #
-  # Orm Agnostic:: Adapters for datamapper, activerecord, mongomapper, couchdb (now only: datamapper and activerecord), ohm
+  # Orm Agnostic:: Adapters for activerecord, sequel and mongoid
   # Authentication:: Support for Account authentication, Account Permission management
   # Scaffold:: You can simply create a new "admin interface" simply providing a Model
   # Ajax Uploads:: You can upload file, manage them and attach them to any model in a quick and simple way (coming soon)

data/padrino-admin.gemspec

@@ -24,6 +24,4 @@ Gem::Specification.new do |s|
 
   s.add_dependency('padrino-core', Padrino.version)
   s.add_dependency('padrino-helpers', Padrino.version)
-  s.add_development_dependency('therubyracer', '~> 0.11.1')
-  s.add_development_dependency('less', '~> 2.2.2')
 end

data/test/generators/test_account_model_generator.rb

@@ -7,7 +7,7 @@ describe 'AccountModelGenerator' do
   end
 
   after do
-    %(rm -rf #{@apptmp})
+    `rm -rf #{@apptmp}`
   end
 
   describe 'activerecord' do
@@ -22,30 +22,6 @@ describe 'AccountModelGenerator' do
     end
   end
 
-  describe 'minirecord' do
-    before do
-      capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=minirecord') }
-      capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
-      @model = "#{@apptmp}/sample_project/models/account.rb"
-    end
-
-    it 'should be an activerecord model instance' do
-      assert_match_in_file(/class Account < ActiveRecord::Base/m, @model)
-    end
-  end
-
-  describe 'datamapper' do
-    before do
-      capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=datamapper') }
-      capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
-      @model = "#{@apptmp}/sample_project/models/account.rb"
-    end
-
-    it 'should include the datamapper resource' do
-      assert_match_in_file(/include DataMapper::Resource/m, @model)
-    end
-  end
-
   describe 'mongoid' do
     before do
       capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=mongoid') }
@@ -58,30 +34,6 @@ describe 'AccountModelGenerator' do
     end
   end
 
-  describe 'mongomapper' do
-    before do
-      capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=mongomapper') }
-      capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
-      @model = "#{@apptmp}/sample_project/models/account.rb"
-    end
-
-    it 'should include the mongomapper document' do
-      assert_match_in_file(/include MongoMapper::Document/m, @model)
-    end
-  end
-
-  describe 'ohm' do
-    before do
-      capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=ohm') }
-      capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
-      @model = "#{@apptmp}/sample_project/models/account.rb"
-    end
-
-    it 'should be an ohm model instance' do
-      assert_match_in_file(/class Account < Ohm::Model/m, @model)
-    end
-  end
-
   describe 'sequel' do
     before do
       capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=sequel') }
@@ -94,15 +46,4 @@ describe 'AccountModelGenerator' do
     end
   end
 
-  describe 'couchrest' do
-    before do
-      capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=couchrest') }
-      capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
-      @model = "#{@apptmp}/sample_project/models/account.rb"
-    end
-
-    it 'should be a couchrest model instance' do
-      assert_match_in_file(/class Account < CouchRest::Model::Base/m, @model)
-    end
-  end
 end

data/test/generators/test_admin_app_generator.rb

@@ -1,4 +1,5 @@
 require_relative '../helper'
+require 'open3'
 
 describe 'AdminAppGenerator' do
   before do
@@ -12,25 +13,108 @@ describe 'AdminAppGenerator' do
 
   describe 'the admin app generator' do
     before do
-      # Account gets created by Datamapper's migration and then gets
-      # rejected by model generator as already defined
       Object.send(:remove_const, :Account) if defined?(Account)
     end
 
     it 'should fail outside app root' do
-      out, = capture_io { generate(:admin_app, "-r=#{@apptmp}") }
+      out, = capture_io { assert_equal 1, assert_raises(SystemExit) { generate(:admin_app, "-r=#{@apptmp}") }.status }
       assert_match(/not at the root/, out)
       assert_no_file_exists("#{@apptmp}/admin")
     end
 
     it "should fail if we don't specify an orm on the project" do
       capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-e=haml') }
-      assert_raises(SystemExit) { @out, @err = capture_io { generate(:admin_app, "-r=#{@apptmp}/sample_project") } }
+      out, = capture_io { assert_equal 1, assert_raises(SystemExit) { generate(:admin_app, "-r=#{@apptmp}/sample_project") }.status }
+      assert_match(/Padrino only supports/, out)
+    end
+
+    it 'should fail without writing anything when the project orm is no longer supported' do
+      capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=sequel') }
+      components = "#{@apptmp}/sample_project/.components"
+      File.write(components, File.read(components).sub(':orm: sequel', ':orm: ohm'))
+      out, = capture_io { assert_equal 1, assert_raises(SystemExit) { generate(:admin_app, "-r=#{@apptmp}/sample_project") }.status }
+      assert_match(/only supports activerecord or mongoid or sequel\. Sorry!/, out)
+      assert_no_dir_exists("#{@apptmp}/sample_project/admin")
+      assert_no_file_exists("#{@apptmp}/sample_project/models/account.rb")
+    end
+
+    it 'should fail with an unsupported renderer' do
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=activerecord', '-e=haml') }
+      out, = capture_io { assert_equal 1, assert_raises(SystemExit) { generate(:admin_app, "-r=#{@apptmp}/sample_project", '-e=liquid') }.status }
+      assert_match(/for admin we only support/, out)
+      assert_no_file_exists("#{@apptmp}/sample_project/admin")
+    end
+
+    it 'should reuse an existing account model' do
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=activerecord', '-e=haml') }
+      Object.const_set(:Account, Class.new)
+      begin
+        capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
+      rescue SystemExit => e
+        flunk "the admin generator exited with status #{e.status}"
+      end
+      assert_file_exists("#{@apptmp}/sample_project/admin/app.rb")
+      assert_match_in_file(/class Account < ActiveRecord::Base/, "#{@apptmp}/sample_project/models/account.rb")
+      assert_no_file_exists("#{@apptmp}/sample_project/db/migrate/001_create_accounts.rb")
+    ensure
+      Object.send(:remove_const, :Account) if defined?(Account)
+    end
+
+    it 'should generate the account model test with the project test_config path' do
+      capture_io { generate(:project, 'sample_project', '-e=haml', "--root=#{@apptmp}", '-d=activerecord', '-t=minitest') }
+      capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
+      assert_match_in_file %r{__dir__\}/\.\./test_config\.rb}, "#{@apptmp}/sample_project/test/models/account_test.rb"
+    end
+
+    it 'should generate seeds that read the account from piped input' do
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=sequel', '-e=haml') }
+      capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
+      script = <<~RUBY
+        require 'thor'
+        # Thor's line editor can echo or buffer piped input, so without a terminal the
+        # seeds must not ask through it.
+        class NoAskShell < Thor::Base.shell
+          def ask(*)
+            raise 'shell.ask used without a terminal'
+          end
+        end
+
+        def shell
+          @shell ||= NoAskShell.new
+        end
+        class Account
+          def initialize(attributes)
+            @attributes = attributes
+          end
+
+          def valid?
+            true
+          end
+
+          def save
+            puts "SAVED \#{@attributes[:email]} \#{@attributes[:password] == 'secret123'}"
+          end
+        end
+        load 'db/seeds.rb'
+      RUBY
+      env = { 'BUNDLE_GEMFILE' => File.expand_path('../../../Gemfile', __dir__) }
+      out, err, status = Open3.capture3(env, RbConfig.ruby, '-rbundler/setup', '-e', script,
+                                        chdir: "#{@apptmp}/sample_project", stdin_data: "admin@example.com \nsecret123\r\n")
+      assert status.success?, err
+      assert_includes out.lines.map(&:strip), 'SAVED admin@example.com true'
+      refute_includes out, 'secret123'
     end
 
     it 'should store and apply session_secret' do
-      capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=datamapper', '-e=haml') }
-      assert_match_in_file(/set :session_secret, '[0-9A-z]*'/, "#{@apptmp}/sample_project/config/apps.rb")
+      capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=sequel', '-e=haml') }
+      assert_match_in_file(/^  set :session_secret, ENV\.fetch\('SESSION_SECRET'\) \{ '\h{64}' \}$/, "#{@apptmp}/sample_project/config/apps.rb")
+    end
+
+    it 'should set SameSite=Lax and Secure in production on the admin session cookie' do
+      capture_io { generate(:project, 'sample_project', '-e=haml', "--root=#{@apptmp}", '-d=activerecord') }
+      capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
+      assert_match_in_file(/^    set :sessions, same_site: :lax, secure: Padrino\.env == :production$/, "#{@apptmp}/sample_project/admin/app.rb")
+      assert_no_match_in_file(/^\s*enable\s+:sessions/, "#{@apptmp}/sample_project/admin/app.rb")
     end
 
     it 'should generate the admin app' do
@@ -49,7 +133,7 @@ describe 'AdminAppGenerator' do
       assert_file_exists("#{@apptmp}/sample_project/public/admin/stylesheets/application.css")
       assert_file_exists("#{@apptmp}/sample_project/public/admin/stylesheets/bootstrap.css")
       assert_file_exists("#{@apptmp}/sample_project/public/admin/javascripts/application.js")
-      assert_file_exists("#{@apptmp}/sample_project/public/admin/javascripts/jquery-1.11.0.min.js")
+      assert_file_exists("#{@apptmp}/sample_project/public/admin/javascripts/jquery-3.7.1.min.js")
       assert_file_exists("#{@apptmp}/sample_project/models/account.rb")
       assert_file_exists("#{@apptmp}/sample_project/db/seeds.rb")
       assert_file_exists("#{@apptmp}/sample_project/db/migrate/001_create_accounts.rb")
@@ -74,6 +158,17 @@ describe 'AdminAppGenerator' do
       assert_match_in_file(/Hello, custom generator/, "#{@apptmp}/sample_project/admin/views/layouts/application.slim")
     end
 
+    it 'should generate the account pages in an admin app named with a plural' do
+      capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=sequel') }
+      begin
+        capture_io { generate(:admin_app, '-a=admins', "--root=#{@apptmp}/sample_project") }
+      rescue SystemExit => e
+        flunk "the admin generator exited with status #{e.status}"
+      end
+      assert_file_exists("#{@apptmp}/sample_project/admins/controllers/accounts.rb")
+      assert_no_dir_exists("#{@apptmp}/sample_project/admin")
+    end
+
     it 'should generate the admin app under a different folder' do
       # TODO: FIXME Implement option --admin_root or something. See https://github.com/padrino/padrino-framework/issues/854#issuecomment-14749356
       skip
@@ -124,6 +219,49 @@ describe 'AdminAppGenerator' do
         assert_file_exists("#{@apptmp}/sample_project/admin/views/layouts/application.slim")
         assert_file_exists("#{@apptmp}/sample_project/admin/views/sessions/new.slim")
       end
+
+      %w[haml erb slim].each do |engine|
+        it "should serve every script the #{engine} admin pages include" do
+          skip 'the sqlite3 gem is only bundled on MRI' if RUBY_ENGINE == 'jruby'
+          capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=sequel', "-e=#{engine}") }
+          capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
+          script = <<~'RUBY'
+            ENV['RACK_ENV'] = 'test'
+            %w[sequel haml slim erubi nokogiri rack/test].each { |lib| require lib }
+            Sequel.extension :migration
+            Sequel.sqlite('db/sample_project_test.db') { |db| Sequel::Migrator.run(db, 'db/migrate') }
+            require File.expand_path('config/boot')
+            account_id = Account.dataset.insert(email: 'admin@example.com', role: 'admin', crypted_password: 'unused')
+
+            browser = Rack::Test::Session.new(Padrino.application)
+            check = lambda do |page|
+              browser.get(page)
+              puts "PAGE #{page} #{browser.last_response.status}"
+              srcs = Nokogiri::HTML(browser.last_response.body).css('script[src]').map { |tag| tag['src'] }
+              srcs.select { |src| src.start_with?('/') }.each do |src|
+                puts "SCRIPT #{page} #{src} #{browser.get(src).status}"
+              end
+            end
+            check.call('/admin/sessions/new')
+            browser.env('rack.session', SampleProject::Admin.session_id => account_id)
+            check.call('/admin/')
+            check.call('/admin/accounts')
+          RUBY
+          env = { 'BUNDLE_GEMFILE' => File.expand_path('../../../Gemfile', __dir__) }
+          out, err, status = Open3.capture3(env, RbConfig.ruby, '-rbundler/setup', '-e', script, chdir: "#{@apptmp}/sample_project")
+          assert status.success?, err
+          pages = out.lines.grep(/\APAGE /).map(&:split)
+          scripts = out.lines.grep(/\ASCRIPT /).map(&:split)
+          statuses = pages.map { |line| line[1, 2] }
+          assert_equal [['/admin/sessions/new', '200'], ['/admin/', '200'], ['/admin/accounts', '200']], statuses
+          pages.each do |(_, page)|
+            refute_empty scripts.select { |line| line[1] == page }, "#{page} includes no local scripts"
+          end
+          scripts.each do |(_, page, src, code)|
+            assert_equal '200', code, "#{page} includes #{src}, which is not served"
+          end
+        end
+      end
     end
 
     it 'should correctly generate a new padrino admin application with a custom model' do
@@ -185,31 +323,27 @@ describe 'AdminAppGenerator' do
         capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
         assert_match_in_file(/  use ConnectionPoolManagement/m, "#{@apptmp}/sample_project/admin/app.rb")
       end
+    end
 
-      it 'should add it #minirecord' do
-        capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=minirecord', '-e=haml') }
-        capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
-        assert_match_in_file(/  use ConnectionPoolManagement/m, "#{@apptmp}/sample_project/admin/app.rb")
-      end
-
-      it 'should not add it for #datamapper' do
-        capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=datamapper', '-e=haml') }
-        capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
-        assert_no_match_in_file(/  use ConnectionPoolManagement/m, "#{@apptmp}/sample_project/admin/app.rb")
+    describe 'with the vite script component' do
+      def assert_activesupport_listed_once(gemfile)
+        Bundler.ui.expects(:warn).never
+        dsl = Bundler::Dsl.new
+        dsl.eval_gemfile(gemfile)
+        assert_equal(1, dsl.dependencies.count { |dep| dep.name == 'activesupport' })
       end
-    end
 
-    describe 'datamapper middleware' do
-      it 'should add it for #datamapper' do
-        capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=datamapper', '-e=haml') }
+      it 'should list activesupport once when admin is added after vite' do
+        capture_io { generate(:project, 'sample_project', '-e=haml', "--root=#{@apptmp}", '-d=sequel', '--script=vite') }
         capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
-        assert_match_in_file(/  use IdentityMap/m, "#{@apptmp}/sample_project/admin/app.rb")
+        assert_activesupport_listed_once("#{@apptmp}/sample_project/Gemfile")
       end
 
-      it 'should not add it for #activerecord' do
-        capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=activerecord', '-e=haml') }
+      it 'should list activesupport once when vite is added after admin' do
+        capture_io { generate(:project, 'sample_project', '-e=haml', "--root=#{@apptmp}", '-d=sequel') }
         capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
-        assert_no_match_in_file(/  use IdentityMap/m, "#{@apptmp}/sample_project/admin/app.rb")
+        capture_io { generate(:component, '--script=vite', "-r=#{@apptmp}/sample_project") }
+        assert_activesupport_listed_once("#{@apptmp}/sample_project/Gemfile")
       end
     end