padrino-admin 0.12.9 → 0.13.0.beta1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YTdlNDEzYzg0NjE3NDNkOTFhOTdlODFiY2I3Y2IwOTMwNGIyMDFhMw==
-  data.tar.gz: !binary |-
-    MDNjMzgzODk4MmIyN2ZmZTM0MTIyZjU5ZjRiNzk3OTU4ZDY1MTZlOQ==
+SHA1:
+  metadata.gz: 075a91f178b97e4b77bf2a317dfd6b19023a9821
+  data.tar.gz: 6f64155d39707b903644f21dd97a5437d0fc8ba3
 SHA512:
-  metadata.gz: !binary |-
-    NjM4YzEwMThlNjBhNmFmNzFhNjkwZWRjY2M2ODI5OWI4NDRiZWE5NDk5MWYy
-    YzViMjg0YTEyM2U5YWFhZDdjMGUzZGNlMjE2M2U2NjU5NDRhY2U3MWJmOTM5
-    ZTBlMmQwMjlhZTZkNjczM2E4MDE1YTc3ZTA3NGZiZmNjODU0NGM=
-  data.tar.gz: !binary |-
-    YTJhZjkxZDVjMjdjNzMwODZmNjBjN2QyZmZhNmM1NTUwYmY3YmEwNmMwYzYx
-    NzAzYjk2MDQzNmJkMzRlZjZkZDYyOTg3Y2MxODE4ZDhlZjdjY2FkNzk4OWE5
-    NjdhMDE4MWE4OWVhNWQzY2RkODdjYTQ5NGUzZTI0NmZkNDU3Njg=
+  metadata.gz: ccc59406df0dd0e3d4847644ee53727c9b3a657a548a20b75667c60346c3f54bade33a0b4fe6dfcb0d9fea40dc280c72a49f1c236442b5d2b4be02d5f05953f3
+  data.tar.gz: 7d31f4ec18bac84c382da388a151576d5e8ebffaa9f88442a27ceb13629e5b23f01dc72991b6727432a8ee95370c357a8fd0316fa94ad0bb083c999ba9c21b5f

data/lib/padrino-admin.rb

@@ -1,3 +1,4 @@
+require 'active_support/core_ext/array/conversions'
 require 'padrino-core'
 require 'padrino-helpers'
 

data/lib/padrino-admin/access_control.rb

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/class/attribute_accessors'
+
 module Padrino
   module Admin
     class AccessControlError < StandardError
@@ -17,15 +19,7 @@ module Padrino
           app.helpers Padrino::Admin::Helpers::AuthenticationHelpers
           app.helpers Padrino::Admin::Helpers::ViewHelpers
           app.before { login_required }
-          app.class_eval do
-            class << self
-              attr_accessor :access_control
-            end
-            def access_control
-              self.class.access_control
-            end
-          end
-
+          app.send(:cattr_accessor, :access_control)
           app.send(:access_control=, Padrino::Admin::AccessControl::Base.new)
         end
         alias :included :registered

data/lib/padrino-admin/generators/admin_app.rb

@@ -49,7 +49,7 @@ module Padrino
 
           tmp_ext = options[:renderer] || fetch_component_choice(:renderer)
           unless supported_ext.include?(tmp_ext.to_sym)
-            say "<= You are using '#{tmp_ext}' and for admin we only support '#{supported_ext.join(', ')}'. Please use #{supported_ext.map { |ext| '-e ' + ext }.join(' or ')}", :yellow
+            say "<= Your are using '#{tmp_ext}' and for admin we only support '#{supported_ext.join(', ')}'. Please use -e haml or -e erb or -e slim", :yellow
             raise SystemExit
           end
 
@@ -76,8 +76,7 @@ module Padrino
           template  "templates/app.rb.tt", destination_root(@admin_path + "/app.rb")
           inject_into_file destination_root('config/apps.rb'), "\nPadrino.mount(\"#{@app_name}::#{@admin_name}\", :app_file => Padrino.root('#{@admin_path}/app.rb')).to(\"/#{@admin_path}\")\n", :before => /^Padrino.mount.*\.to\('\/'\)$/
           unless options[:destroy]
-            insert_middleware 'ConnectionPoolManagement', @admin_path if [:minirecord, :activerecord].include?(orm)
-            insert_middleware 'IdentityMap', @admin_path if orm == :datamapper
+            insert_middleware 'ActiveRecord::ConnectionAdapters::ConnectionManagement', @admin_path if [:minirecord, :activerecord].include?(orm)
           end
 
           params = [

data/lib/padrino-admin/generators/templates/account/datamapper.rb.tt

@@ -44,11 +44,6 @@ class <%= @model_name %>
     ::BCrypt::Password.new(crypted_password) == password
   end
 
-  def password=(password)
-    self.crypted_password = nil if password.present?
-    @password = password
-  end
-
   private
 
   def password_required

data/lib/padrino-admin/generators/templates/account/seeds.rb.tt

@@ -6,7 +6,7 @@
 #   shell.say name
 #
 email     = shell.ask "Which email do you want use for logging into admin?"
-password  = shell.ask "Tell me the password to use:", :echo => false
+password  = shell.ask "Tell me the password to use:"
 
 shell.say ""
 
@@ -18,7 +18,7 @@ if account.valid?
   shell.say "<%= @model_name %> has been successfully created, now you can login with:"
   shell.say "================================================================="
   shell.say "   email: #{email}"
-  shell.say "   password: #{?* * password.length}"
+  shell.say "   password: #{password}"
   shell.say "================================================================="
 else
   shell.say "Sorry, but something went wrong!"

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

@@ -20,7 +20,7 @@
           <ul class="nav navbar-nav pull-right">
             <li class=navbar-edit-account><%%= link_to tag_icon(:user), url(:<%= @model_plural %>, :edit, :id => current_account.id), :title => pat(:profile), :class => 'navbar-nav-link' %></li>
             <li class=navbar-logout>
-              <%%= button_to(:logout, url(:sessions, :destroy), :method => :delete, :class => 'navbar-nav-form', :submit_options => { :type => :submit, :title => pat(:logout), :class => 'navbar-nav-form-link' }) { tag_icon(:'power-off') } %>
+              <%%= button_to(:logout, url(:sessions, :destroy), :method => :delete, :class => 'navbar-nav-form') { content_tag :button, tag_icon(:'power-off'), :type => :submit, :title => pat(:logout), :class => 'navbar-nav-form-link' } %>
             </li>
           </ul>
 

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

@@ -12,7 +12,7 @@
               <%%= tag_icon :magic %> <span class=caret></span>
             </a>
             <ul class="list-menu dropdown-menu" role=menu>
-              <li class=list-menu-wrapper>
+              <li class=ist-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>

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

@@ -20,8 +20,8 @@
           %ul.nav.navbar-nav.pull-right
             %li.navbar-edit-account=link_to tag_icon(:user), url(:accounts, :edit, :id => current_account.id), :title => pat(:profile), :class => 'navbar-nav-link'
             %li.navbar-logout
-              = button_to :logout, url(:sessions, :destroy), :method => :delete, :class => 'navbar-nav-form', :submit_options => { :type => :submit, :title => pat(:logout), :class => 'navbar-nav-form-link' } do
-                = tag_icon('power-off')
+              =button_to :logout, url(:sessions, :destroy), :method => :delete, :class => 'navbar-nav-form' do
+                =content_tag :button, tag_icon('power-off'), :type => :submit, :title => pat(:logout), :class => 'navbar-nav-form-link'
 
           %ul.nav.navbar-nav.pull-left
             - project_modules.each do |project_module|

data/lib/padrino-admin/generators/templates/page/controller.rb.tt

@@ -85,7 +85,7 @@
     <% else %>
     if <%= @orm.multiple_destroy(@orm.name_plural) %>
     <% end %>
-      flash[:success] = pat(:destroy_many_success, :model => '<%= @orm.name_plural.capitalize %>', :ids => "#{ids.join(', ')}")
+      flash[:success] = pat(:destroy_many_success, :model => '<%= @orm.name_plural.capitalize %>', :ids => "#{ids.to_sentence}")
     end
     redirect url(:<%= @orm.name_plural %>, :index)
   end

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

@@ -20,9 +20,8 @@ html lang='en'
 
           ul class='nav navbar-nav pull-right'
             li class='navbar-edit-account' = link_to tag_icon(:user), url(:<%= @model_plural %>, :edit, :id => current_account.id), :title => pat(:profile), :class => 'navbar-nav-link'
-            li class='navbar-logout'
-              = button_to pat(:logout), url(:sessions, :destroy), :method => :delete, :class => 'navbar-nav-form', :submit_options => { :type => :submit, :title => pat(:logout), :class => 'navbar-nav-form-link' } do
-                = tag_icon(:'power-off')
+            li class='navbar-logout' = button_to(pat(:logout), url(:sessions, :destroy), :method => :delete, :class => 'navbar-nav-form') do
+              = content_tag :button, tag_icon(:'power-off'), :type => :submit, :title => pat(:logout), :class => 'navbar-nav-form-link'
 
           ul class='nav navbar-nav pull-left'
             - project_modules.each do |project_module|

data/test/fixtures/sequel.rb

@@ -1,6 +1,7 @@
 require 'digest/sha1'
 require 'sequel'
-require 'sequel/extensions/migration'
+
+Sequel::Model.plugin(:schema)
 
 Sequel::Model.db = 
   if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
@@ -11,6 +12,7 @@ Sequel::Model.db =
     Sequel.sqlite(":memory:")
   end
 
+Sequel.extension :migration
 migration = Sequel.migration do
   up do
     create_table :accounts do
@@ -22,24 +24,11 @@ migration = Sequel.migration do
       String :role
     end
 
-    create_table :sections do
+    create_table :categories do
       primary_key :id
       foreign_key :account_id
       String :name
     end
-
-    create_table :friends do
-      primary_key :id
-      String :name
-      String :age
-      String :email
-    end
-
-    create_table :pages do
-      primary_key :id
-      String :name
-      String :body
-    end
   end
 
   down do
@@ -49,14 +38,8 @@ end
 
 migration.apply(Sequel::Model.db, :up)
 
-class Friend < Sequel::Model
-end
-
-class Page < Sequel::Model
-end
-
-# Fake Section Model
-class Section < Sequel::Model
+# Fake Category Model
+class Category < Sequel::Model
   many_to_one :account
 end
 
@@ -64,7 +47,7 @@ end
 class Account < Sequel::Model
   attr_accessor :password, :password_confirmation
 
-  one_to_many :sections
+  one_to_many :categories
 
   def self.admin;  first(:role => "admin");  end
   def self.editor; first(:role => "editor"); end
@@ -84,6 +67,6 @@ editor = Account.create(:name => "Dexter", :role => "editor", :email => "editor@
                         :password => "some", :password_confirmation => "some")
 
 %w(News Press HowTo).each do |c|
-  admin.add_section(:name => c)
-  editor.add_section(:name => c)
+  admin.add_category(:name => c)
+  editor.add_category(:name => c)
 end

data/test/generators/test_admin_app_generator.rb

@@ -183,33 +183,19 @@ describe "AdminAppGenerator" do
       it 'should add it for #activerecord' do
         capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=activerecord', '-e=haml') }
         capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
-        assert_match_in_file(/  use ConnectionPoolManagement/m, "#{@apptmp}/sample_project/admin/app.rb")
+        assert_match_in_file(/  use ActiveRecord::ConnectionAdapters::ConnectionManagemen/m, "#{@apptmp}/sample_project/admin/app.rb")
       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")
+        assert_match_in_file(/  use ActiveRecord::ConnectionAdapters::ConnectionManagemen/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') }
-        capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
-        assert_match_in_file(/  use IdentityMap/m, "#{@apptmp}/sample_project/admin/app.rb")
-      end
-
-      it 'should not add it for #activerecord' do
-        capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=activerecord', '-e=haml') }
-        capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
-        assert_no_match_in_file(/  use IdentityMap/m, "#{@apptmp}/sample_project/admin/app.rb")
+        assert_no_match_in_file(/  use ActiveRecord::ConnectionAdapters::ConnectionManagemen/m, "#{@apptmp}/sample_project/admin/app.rb")
       end
     end
 

data/test/generators/test_admin_page_generator.rb

@@ -1,5 +1,16 @@
 require File.expand_path(File.dirname(__FILE__) + '/../helper')
-require File.join(File.dirname(__FILE__), '../fixtures/sequel')
+
+class Person
+  def self.properties
+    [:id, :name, :age, :email].map { |c| OpenStruct.new(:name => c) }
+  end
+end
+
+class Page
+  def self.properties
+    [:id, :name, :body].map { |c| OpenStruct.new(:name => c) }
+  end
+end
 
 describe "AdminPageGenerator" do
   before do 
@@ -25,94 +36,94 @@ describe "AdminPageGenerator" do
     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(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=datamapper','-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"
-      assert_match_in_file "role.project_module :friends, '/friends'", "#{@apptmp}/sample_project/admin/app.rb"
+      capture_io { generate(:model, 'person', "name:string", "age:integer", "email:string", "--root=#{@apptmp}/sample_project") }
+      capture_io { generate(:admin_page, 'person', "--root=#{@apptmp}/sample_project") }
+      assert_file_exists "#{@apptmp}/sample_project/admin/controllers/people.rb"
+      assert_match_in_file "SampleProject::Admin.controllers :people do", "#{@apptmp}/sample_project/admin/controllers/people.rb"
+      assert_match_in_file "role.project_module :people, '/people'", "#{@apptmp}/sample_project/admin/app.rb"
       assert_match_in_file "elsif Padrino.env == :development && params[:bypass]", "#{@apptmp}/sample_project/admin/controllers/sessions.rb"
     end
 
     # users can override certain templates from a generators/templates folder in the destination_root
     it "should use custom generator templates from the project root, if they exist" do
-      capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=sequel','-e=haml') }
+      capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=datamapper','-e=haml') }
       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")
+      capture_io { generate(:model, 'person', "name:string", "age:integer", "email:string", "--root=#{@apptmp}/sample_project") }
+      capture_io { generate(:admin_page, 'person', "--root=#{@apptmp}/sample_project") }
+      assert_match_in_file(/Hello, custom generator/, "#{@apptmp}/sample_project/admin/views/people/index.haml")
     end
 
     describe "renderers" 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(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=datamapper','-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"
-        assert_file_exists "#{@apptmp}/sample_project/admin/views/friends/index.haml"
-        assert_file_exists "#{@apptmp}/sample_project/admin/views/friends/new.haml"
+        capture_io { generate(:model, 'person', "name:string", "age:integer", "email:string", "--root=#{@apptmp}/sample_project") }
+        capture_io { generate(:admin_page, 'person', "--root=#{@apptmp}/sample_project") }
+        assert_file_exists "#{@apptmp}/sample_project/admin/views/people/_form.haml"
+        assert_file_exists "#{@apptmp}/sample_project/admin/views/people/edit.haml"
+        assert_file_exists "#{@apptmp}/sample_project/admin/views/people/index.haml"
+        assert_file_exists "#{@apptmp}/sample_project/admin/views/people/new.haml"
         %w(name age email).each do |field|
-          assert_match_in_file "label :#{field}", "#{@apptmp}/sample_project/admin/views/friends/_form.haml"
-          assert_match_in_file "text_field :#{field}", "#{@apptmp}/sample_project/admin/views/friends/_form.haml"
+          assert_match_in_file "label :#{field}", "#{@apptmp}/sample_project/admin/views/people/_form.haml"
+          assert_match_in_file "text_field :#{field}", "#{@apptmp}/sample_project/admin/views/people/_form.haml"
         end
         assert_match_in_file "check_box_tag :bypass", "#{@apptmp}/sample_project/admin/views/sessions/new.haml"
       end
 
       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(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=datamapper','-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"
-        assert_file_exists "#{@apptmp}/sample_project/admin/views/friends/index.erb"
-        assert_file_exists "#{@apptmp}/sample_project/admin/views/friends/new.erb"
+        capture_io { generate(:model, 'person', "name:string", "age:integer", "email:string", "--root=#{@apptmp}/sample_project") }
+        capture_io { generate(:admin_page, 'person', "--root=#{@apptmp}/sample_project") }
+        assert_file_exists "#{@apptmp}/sample_project/admin/views/people/_form.erb"
+        assert_file_exists "#{@apptmp}/sample_project/admin/views/people/edit.erb"
+        assert_file_exists "#{@apptmp}/sample_project/admin/views/people/index.erb"
+        assert_file_exists "#{@apptmp}/sample_project/admin/views/people/new.erb"
         %w(name age email).each do |field|
-          assert_match_in_file "label :#{field}", "#{@apptmp}/sample_project/admin/views/friends/_form.erb"
-          assert_match_in_file "text_field :#{field}", "#{@apptmp}/sample_project/admin/views/friends/_form.erb"
+          assert_match_in_file "label :#{field}", "#{@apptmp}/sample_project/admin/views/people/_form.erb"
+          assert_match_in_file "text_field :#{field}", "#{@apptmp}/sample_project/admin/views/people/_form.erb"
         end
         assert_match_in_file "check_box_tag :bypass", "#{@apptmp}/sample_project/admin/views/sessions/new.erb"
       end
 
       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(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=datamapper','-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"
-        assert_file_exists "#{@apptmp}/sample_project/admin/views/friends/index.slim"
-        assert_file_exists "#{@apptmp}/sample_project/admin/views/friends/new.slim"
+        capture_io { generate(:model, 'person', "name:string", "age:integer", "email:string", "--root=#{@apptmp}/sample_project") }
+        capture_io { generate(:admin_page, 'person', "--root=#{@apptmp}/sample_project") }
+        assert_file_exists "#{@apptmp}/sample_project/admin/views/people/_form.slim"
+        assert_file_exists "#{@apptmp}/sample_project/admin/views/people/edit.slim"
+        assert_file_exists "#{@apptmp}/sample_project/admin/views/people/index.slim"
+        assert_file_exists "#{@apptmp}/sample_project/admin/views/people/new.slim"
         %w(name age email).each do |field|
-          assert_match_in_file "label :#{field}", "#{@apptmp}/sample_project/admin/views/friends/_form.slim"
-          assert_match_in_file "text_field :#{field}", "#{@apptmp}/sample_project/admin/views/friends/_form.slim"
+          assert_match_in_file "label :#{field}", "#{@apptmp}/sample_project/admin/views/people/_form.slim"
+          assert_match_in_file "text_field :#{field}", "#{@apptmp}/sample_project/admin/views/people/_form.slim"
         end
         assert_match_in_file "check_box_tag :bypass", "#{@apptmp}/sample_project/admin/views/sessions/new.slim"
       end
     end
 
     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(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=datamapper','-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, 'person', "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"
-      assert_file_exists "#{@apptmp}/sample_project/admin/views/friends/_form.haml"
-      assert_file_exists "#{@apptmp}/sample_project/admin/views/friends/edit.haml"
-      assert_file_exists "#{@apptmp}/sample_project/admin/views/friends/index.haml"
-      assert_file_exists "#{@apptmp}/sample_project/admin/views/friends/new.haml"
+      capture_io { generate(:admin_page, 'person', 'page', "--root=#{@apptmp}/sample_project") }
+      # For Person
+      assert_file_exists "#{@apptmp}/sample_project/admin/controllers/people.rb"
+      assert_file_exists "#{@apptmp}/sample_project/admin/views/people/_form.haml"
+      assert_file_exists "#{@apptmp}/sample_project/admin/views/people/edit.haml"
+      assert_file_exists "#{@apptmp}/sample_project/admin/views/people/index.haml"
+      assert_file_exists "#{@apptmp}/sample_project/admin/views/people/new.haml"
       %w(name age email).each do |field|
-        assert_match_in_file "label :#{field}", "#{@apptmp}/sample_project/admin/views/friends/_form.haml"
-        assert_match_in_file "text_field :#{field}", "#{@apptmp}/sample_project/admin/views/friends/_form.haml"
+        assert_match_in_file "label :#{field}", "#{@apptmp}/sample_project/admin/views/people/_form.haml"
+        assert_match_in_file "text_field :#{field}", "#{@apptmp}/sample_project/admin/views/people/_form.haml"
       end
-      assert_match_in_file "role.project_module :friends, '/friends'", "#{@apptmp}/sample_project/admin/app.rb"
+      assert_match_in_file "role.project_module :people, '/people'", "#{@apptmp}/sample_project/admin/app.rb"
       # For Page
       assert_file_exists "#{@apptmp}/sample_project/admin/controllers/pages.rb"
       assert_file_exists "#{@apptmp}/sample_project/admin/views/pages/_form.haml"

data/test/helper.rb

@@ -6,7 +6,7 @@ require 'minitest/pride'
 require 'mocha/setup'
 require 'rack/test'
 require 'thor/group'
-require 'sequel/model'
+require 'dm-core'
 require 'padrino-admin'
 
 require 'ext/minitest-spec'

data/test/test_admin_application.rb

@@ -109,7 +109,7 @@ describe "AdminApplication" do
       end
 
       # Prepare a basic page
-      get "/login(/:role)" do
+      get "/login(/:role)?" do
         set_current_account(Account.send(params[:role])) if params[:role]
         "logged as #{params[:role] || "any"}"
       end
@@ -268,21 +268,4 @@ describe "AdminApplication" do
     get "/modules"
     assert_equal "admin => /admin", body
   end
-
-  it 'should use different access control for different apps' do
-    app1 = Sinatra.new Padrino::Application do
-      register Padrino::Admin::AccessControl
-      access_control.roles_for :any do |role|
-        role.project_module :foo, "/foo"
-      end
-    end
-    app2 = Sinatra.new Padrino::Application do
-      register Padrino::Admin::AccessControl
-      access_control.roles_for :any do |role|
-        role.project_module :bar, "/bar"
-      end
-    end
-    assert_equal '/foo', app1.access_control.project_modules(:any).first.path
-    assert_equal '/bar', app2.access_control.project_modules(:any).first.path
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-admin
 version: !ruby/object:Gem::Version
-  version: 0.12.9
+  version: 0.13.0.beta1
 platform: ruby
 authors:
 - Padrino Team
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-23 00:00:00.000000000 Z
+date: 2015-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: padrino-core
@@ -19,28 +19,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.9
+        version: 0.13.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.9
+        version: 0.13.0.beta1
 - !ruby/object:Gem::Dependency
   name: padrino-helpers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.9
+        version: 0.13.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.9
+        version: 0.13.0.beta1
 - !ruby/object:Gem::Dependency
   name: therubyracer
   requirement: !ruby/object:Gem::Requirement
@@ -281,18 +281,26 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: 1.3.6
+      version: 1.3.1
 requirements: []
 rubyforge_project: padrino-admin
-rubygems_version: 2.6.14
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: Admin Dashboard for Padrino
-test_files: []
+test_files:
+- test/fixtures/sequel.rb
+- test/generators/test_account_model_generator.rb
+- test/generators/test_admin_app_generator.rb
+- test/generators/test_admin_page_generator.rb
+- test/helper.rb
+- test/test_admin_application.rb
+- test/test_locale.rb
+has_rdoc: