padrino-admin 0.16.2 → 0.17.0

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, minirecord, sequel, mongoid, ohm, dynamoid'}
       = 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, minirecord, sequel, mongoid, ohm, dynamoid" = 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.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, mongoid, ohm, and more
   # 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/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
@@ -34,18 +34,6 @@ describe 'AccountModelGenerator' do
     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,18 +46,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') }
@@ -94,15 +70,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,27 +13,100 @@ 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 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') }
+      capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=sequel', '-e=haml') }
       assert_match_in_file(/set :session_secret, '[0-9A-z]*'/, "#{@apptmp}/sample_project/config/apps.rb")
     end
 
+    it 'should set SameSite=Lax 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$/, "#{@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
       capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=activerecord') }
       capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
@@ -49,7 +123,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 +148,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 +209,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
@@ -192,24 +320,27 @@ describe 'AdminAppGenerator' do
         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")
-      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') }
+    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
+
+      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
 

data/test/generators/test_admin_page_generator.rb

@@ -13,21 +13,50 @@ describe 'AdminPageGenerator' do
 
   describe 'the admin page generator' do
     it 'should fail outside app root' do
-      out, = capture_io { generate(:admin_page, 'foo', "-r=#{@apptmp}/sample_project") }
+      out, = capture_io { assert_equal 1, assert_raises(SystemExit) { generate(:admin_page, 'foo', "-r=#{@apptmp}/sample_project") }.status }
       assert_match(/not at the root/, out)
       assert_no_file_exists("#{@apptmp}/admin")
     end
 
+    it 'should fail when the admin app does not exist' do
+      capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=sequel') }
+      out, = capture_io { assert_equal 1, assert_raises(SystemExit) { generate(:admin_page, 'friend', "-r=#{@apptmp}/sample_project") }.status }
+      assert_match(/Unable to locate 'Admin' application/, out)
+      assert_no_dir_exists("#{@apptmp}/sample_project/admin")
+    end
+
     it 'should fail without an existent model' do
       capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=activerecord') }
       capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
       assert_raises(Padrino::Admin::Generators::OrmError) { generate(:admin_page, 'foo', "-r=#{@apptmp}/sample_project") }
     end
 
+    it 'should fail when the model does not match the project orm' do
+      capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=activerecord') }
+      capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
+      error = assert_raises(Padrino::Admin::Generators::OrmError) { capture_io { generate(:admin_page, 'friend', "-r=#{@apptmp}/sample_project") } }
+      assert_match(/Friend.*activerecord/m, error.message)
+    end
+
+    it 'should destroy a page even when the model does not match the project orm' do
+      capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=activerecord') }
+      capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
+      FileUtils.mkdir_p("#{@apptmp}/sample_project/admin/views/friends")
+      capture_io { generate(:admin_page, 'friend', "-r=#{@apptmp}/sample_project", '-d') }
+      assert_no_dir_exists("#{@apptmp}/sample_project/admin/views/friends")
+    end
+
+    it 'should fail when the project has no orm and the model is not activerecord' do
+      capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=sequel') }
+      capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
+      components = "#{@apptmp}/sample_project/.components"
+      File.write(components, File.read(components).sub(/^:orm:.*\n/, ''))
+      assert_raises(Padrino::Admin::Generators::OrmError) { capture_io { generate(:admin_page, 'friend', "-r=#{@apptmp}/sample_project") } }
+    end
+
     it 'should correctly generate a new page' do
       capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=sequel', '-e=haml') }
       capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
-      capture_io { generate(:model, 'friend', 'name:string', 'age:integer', 'email:string', "--root=#{@apptmp}/sample_project") }
       capture_io { generate(:admin_page, 'friend', "--root=#{@apptmp}/sample_project") }
       assert_file_exists "#{@apptmp}/sample_project/admin/controllers/friends.rb"
       assert_match_in_file 'SampleProject::Admin.controllers :friends do', "#{@apptmp}/sample_project/admin/controllers/friends.rb"
@@ -41,7 +70,6 @@ describe 'AdminPageGenerator' do
       custom_template_path = "#{@apptmp}/sample_project/generators/templates/haml/page/"
       `mkdir -p #{custom_template_path} && echo "%h1= 'Hello, custom generator' " > #{custom_template_path}index.haml.tt`
       capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
-      capture_io { generate(:model, 'friend', 'name:string', 'age:integer', 'email:string', "--root=#{@apptmp}/sample_project") }
       capture_io { generate(:admin_page, 'friend', "--root=#{@apptmp}/sample_project") }
       assert_match_in_file(/Hello, custom generator/, "#{@apptmp}/sample_project/admin/views/friends/index.haml")
     end
@@ -50,7 +78,6 @@ describe 'AdminPageGenerator' do
       it 'should correctly generate a new page with haml' do
         capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=sequel', '-e=haml') }
         capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
-        capture_io { generate(:model, 'friend', 'name:string', 'age:integer', 'email:string', "--root=#{@apptmp}/sample_project") }
         capture_io { generate(:admin_page, 'friend', "--root=#{@apptmp}/sample_project") }
         assert_file_exists "#{@apptmp}/sample_project/admin/views/friends/_form.haml"
         assert_file_exists "#{@apptmp}/sample_project/admin/views/friends/edit.haml"
@@ -66,7 +93,6 @@ describe 'AdminPageGenerator' do
       it 'should correctly generate a new page with erb' do
         capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=sequel', '-e=erb') }
         capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
-        capture_io { generate(:model, 'friend', 'name:string', 'age:integer', 'email:string', "--root=#{@apptmp}/sample_project") }
         capture_io { generate(:admin_page, 'friend', "--root=#{@apptmp}/sample_project") }
         assert_file_exists "#{@apptmp}/sample_project/admin/views/friends/_form.erb"
         assert_file_exists "#{@apptmp}/sample_project/admin/views/friends/edit.erb"
@@ -82,7 +108,6 @@ describe 'AdminPageGenerator' do
       it 'should correctly generate a new page with slim' do
         capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=sequel', '-e=slim') }
         capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
-        capture_io { generate(:model, 'friend', 'name:string', 'age:integer', 'email:string', "--root=#{@apptmp}/sample_project") }
         capture_io { generate(:admin_page, 'friend', "--root=#{@apptmp}/sample_project") }
         assert_file_exists "#{@apptmp}/sample_project/admin/views/friends/_form.slim"
         assert_file_exists "#{@apptmp}/sample_project/admin/views/friends/edit.slim"
@@ -99,8 +124,6 @@ describe 'AdminPageGenerator' do
     it 'should correctly generate a new padrino admin application with multiple models at the same time' do
       capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=sequel', '-e=haml') }
       capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
-      capture_io { generate(:model, 'friend', 'name:string', 'age:integer', 'email:string', "-root=#{@apptmp}/sample_project") }
-      capture_io { generate(:model, 'page', 'name:string', 'body:string', "-root=#{@apptmp}/sample_project") }
       capture_io { generate(:admin_page, 'friend', 'page', "--root=#{@apptmp}/sample_project") }
       # For Friend
       assert_file_exists "#{@apptmp}/sample_project/admin/controllers/friends.rb"

data/test/test_admin_application.rb

@@ -163,6 +163,100 @@ describe 'AdminApplication' do
     assert_equal 'posts', body
   end
 
+  it 'should match paths literally without regex metacharacter interpretation' do
+    mock_app do
+      register Padrino::Admin::AccessControl
+      enable :sessions
+
+      access_control.roles_for :any do |role|
+        role.protect '/'
+        role.allow '/accounts.json'
+      end
+    end
+
+    # Without authentication, /accounts.json should be allowed
+    assert @app.access_control.allowed?(nil, '/accounts.json')
+    # /accountsXjson must NOT match - the dot in .json is literal, not a regex wildcard
+    refute @app.access_control.allowed?(nil, '/accountsXjson')
+  end
+
+  it 'should not allow paths that merely start with an allowed path' do
+    mock_app do
+      register Padrino::Admin::AccessControl
+      enable :sessions
+
+      access_control.roles_for :any do |role|
+        role.protect '/'
+        role.allow '/sessions'
+      end
+
+      access_control.roles_for :editor do |role|
+        role.project_module :posts, '/posts'
+      end
+
+      access_control.roles_for :admin do |role|
+        role.project_module :post_admin, '/posts_admin'
+      end
+    end
+
+    assert @app.access_control.allowed?(nil, '/sessions')
+    assert @app.access_control.allowed?(nil, '/sessions/new')
+    assert @app.access_control.allowed?(nil, '/sessions.json')
+    refute @app.access_control.allowed?(nil, '/sessions_admin')
+    refute @app.access_control.allowed?(nil, '/sessionsX')
+
+    # An editor's '/posts' must not reach the admin-only '/posts_admin' module.
+    assert @app.access_control.allowed?(Account.editor, '/posts')
+    assert @app.access_control.allowed?(Account.editor, '/posts/1/edit')
+    refute @app.access_control.allowed?(Account.editor, '/posts_admin')
+    assert @app.access_control.allowed?(Account.admin, '/posts_admin')
+
+    # Paths are compared after percent-decoding.
+    refute @app.access_control.allowed?(Account.editor, '/%70osts_admin')
+    assert @app.access_control.allowed?(Account.editor, '/%70osts')
+  end
+
+  it 'should allow decoded non-ASCII paths and prefixes ending in a dot' do
+    mock_app do
+      register Padrino::Admin::AccessControl
+      enable :sessions
+
+      access_control.roles_for :any do |role|
+        role.protect '/'
+        role.allow '/café'
+        role.allow '/v1.'
+      end
+    end
+
+    assert @app.access_control.allowed?(nil, '/caf%C3%A9'.b)
+    assert @app.access_control.allowed?(nil, '/café')
+    assert @app.access_control.allowed?(nil, '/v1.json')
+    refute @app.access_control.allowed?(nil, '/v2.json')
+  end
+
+  it 'should match Regexp paths at the start of the path' do
+    mock_app do
+      register Padrino::Admin::AccessControl
+      enable :sessions
+
+      access_control.roles_for :any do |role|
+        role.protect %r{\A/secret}
+        role.allow %r{\A/reports/\d+\z}
+      end
+
+      access_control.roles_for :admin do |role|
+        role.allow %r{\A/stats}
+        role.project_module :posts, '/posts'
+      end
+    end
+
+    assert @app.access_control.allowed?(nil, '/reports/1')
+    refute @app.access_control.allowed?(nil, '/secret/x')
+    assert @app.access_control.allowed?(Account.admin, '/stats/today')
+    assert @app.access_control.allowed?(Account.admin, '/posts')
+    refute @app.access_control.allowed?(Account.editor, '/stats')
+  end
+
   it 'should emulate an ecommerce app' do
     mock_app do
       register Padrino::Admin::AccessControl
@@ -282,4 +376,11 @@ describe 'AdminApplication' do
     assert_equal '/foo', app1.access_control.project_modules(:any).first.path
     assert_equal '/bar', app2.access_control.project_modules(:any).first.path
   end
+
+  it 'should raise AccessControlError for invalid roles' do
+    access_control = Padrino::Admin::AccessControl::Base.new
+    error = assert_raises(Padrino::Admin::AccessControlError) { access_control.roles_for('admin') }
+    assert_match(/"admin"/, error.message)
+    assert_raises(Padrino::Admin::AccessControlError) { access_control.roles_for }
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-admin
 version: !ruby/object:Gem::Version
-  version: 0.16.2
+  version: 0.17.0
 platform: ruby
 authors:
 - Padrino Team
@@ -19,28 +19,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.16.2
+        version: 0.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.16.2
+        version: 0.17.0
 - !ruby/object:Gem::Dependency
   name: padrino-helpers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.16.2
+        version: 0.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.16.2
+        version: 0.17.0
 - !ruby/object:Gem::Dependency
   name: therubyracer
   requirement: !ruby/object:Gem::Requirement
@@ -143,12 +143,9 @@ files:
 - lib/padrino-admin/generators/admin_page.rb
 - lib/padrino-admin/generators/orm.rb
 - lib/padrino-admin/generators/templates/account/activerecord.rb.tt
-- lib/padrino-admin/generators/templates/account/couchrest.rb.tt
-- lib/padrino-admin/generators/templates/account/datamapper.rb.tt
 - lib/padrino-admin/generators/templates/account/dynamoid.rb.tt
 - lib/padrino-admin/generators/templates/account/minirecord.rb.tt
 - lib/padrino-admin/generators/templates/account/mongoid.rb.tt
-- lib/padrino-admin/generators/templates/account/mongomapper.rb.tt
 - lib/padrino-admin/generators/templates/account/ohm.rb.tt
 - lib/padrino-admin/generators/templates/account/seeds.rb.tt
 - lib/padrino-admin/generators/templates/account/sequel.rb.tt
@@ -176,7 +173,7 @@ files:
 - lib/padrino-admin/generators/templates/assets/javascripts/bootstrap/tab.js
 - lib/padrino-admin/generators/templates/assets/javascripts/bootstrap/tooltip.js
 - lib/padrino-admin/generators/templates/assets/javascripts/bootstrap/transition.js
-- lib/padrino-admin/generators/templates/assets/javascripts/jquery-1.11.0.min.js
+- lib/padrino-admin/generators/templates/assets/javascripts/jquery-3.7.1.min.js
 - lib/padrino-admin/generators/templates/assets/stylesheets/application.css
 - lib/padrino-admin/generators/templates/assets/stylesheets/bootstrap.css
 - lib/padrino-admin/generators/templates/assets/stylesheets/fonts/FontAwesome.otf