padrino-admin 0.12.8.1 → 0.12.9

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 5ebf7fb90fd59004a350073ab07954f13bf921c1
-  data.tar.gz: d18281cba70b2ce06af1f9858e73fc07d84ef71a
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YTdlNDEzYzg0NjE3NDNkOTFhOTdlODFiY2I3Y2IwOTMwNGIyMDFhMw==
+  data.tar.gz: !binary |-
+    MDNjMzgzODk4MmIyN2ZmZTM0MTIyZjU5ZjRiNzk3OTU4ZDY1MTZlOQ==
 SHA512:
-  metadata.gz: c0243477488dc8b201e766cca83033bdf87beca9ee4376ca3d9649059d66e4a28852191be2b01fdb3d280075b2e555292c784ee14b4eb6796189f9d16d9528ec
-  data.tar.gz: 277c12d2da842f751549f4af8568e13a9f04b221ac074163479f1e61d85dc0e46a5602a685db539e3d90bf38fb69378b89c2b406fa06d8195b632c56c52b1ad4
+  metadata.gz: !binary |-
+    NjM4YzEwMThlNjBhNmFmNzFhNjkwZWRjY2M2ODI5OWI4NDRiZWE5NDk5MWYy
+    YzViMjg0YTEyM2U5YWFhZDdjMGUzZGNlMjE2M2U2NjU5NDRhY2U3MWJmOTM5
+    ZTBlMmQwMjlhZTZkNjczM2E4MDE1YTc3ZTA3NGZiZmNjODU0NGM=
+  data.tar.gz: !binary |-
+    YTJhZjkxZDVjMjdjNzMwODZmNjBjN2QyZmZhNmM1NTUwYmY3YmEwNmMwYzYx
+    NzAzYjk2MDQzNmJkMzRlZjZkZDYyOTg3Y2MxODE4ZDhlZjdjY2FkNzk4OWE5
+    NjdhMDE4MWE4OWVhNWQzY2RkODdjYTQ5NGUzZTI0NmZkNDU3Njg=

data/Rakefile

@@ -1,7 +1,3 @@
-# coding:utf-8
-RAKE_ROOT = __FILE__
-
-require 'rubygems'
 require File.expand_path(File.dirname(__FILE__) + '/../gem_rake_helper')
 
 namespace :bootstrap do

data/lib/padrino-admin.rb

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

data/lib/padrino-admin/access_control.rb

@@ -1,5 +1,3 @@
-require 'active_support/core_ext/class/attribute_accessors'
-
 module Padrino
   module Admin
     class AccessControlError < StandardError
@@ -19,7 +17,15 @@ module Padrino
           app.helpers Padrino::Admin::Helpers::AuthenticationHelpers
           app.helpers Padrino::Admin::Helpers::ViewHelpers
           app.before { login_required }
-          app.send(:cattr_accessor, :access_control)
+          app.class_eval do
+            class << self
+              attr_accessor :access_control
+            end
+            def access_control
+              self.class.access_control
+            end
+          end
+
           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 "<= 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
+            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
             raise SystemExit
           end
 
@@ -76,7 +76,8 @@ 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 'ActiveRecord::ConnectionAdapters::ConnectionManagement', @admin_path if [:minirecord, :activerecord].include?(orm)
+            insert_middleware 'ConnectionPoolManagement', @admin_path if [:minirecord, :activerecord].include?(orm)
+            insert_middleware 'IdentityMap', @admin_path if orm == :datamapper
           end
 
           params = [

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

@@ -44,6 +44,11 @@ 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,21 +6,22 @@
 #   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:"
+password  = shell.ask "Tell me the password to use:", :echo => false
 
 shell.say ""
 
-account = <%= @model_name %>.create(:email => email, :name => "Foo", :surname => "Bar", :password => password, :password_confirmation => password, :role => "admin")
+account = <%= @model_name %>.new(:email => email, :name => "Foo", :surname => "Bar", :password => password, :password_confirmation => password, :role => "admin")
 
 if account.valid?
+  account.save
   shell.say "================================================================="
   shell.say "<%= @model_name %> has been successfully created, now you can login with:"
   shell.say "================================================================="
   shell.say "   email: #{email}"
-  shell.say "   password: #{password}"
+  shell.say "   password: #{?* * password.length}"
   shell.say "================================================================="
 else
-  shell.say "Sorry but some thing went wrong!"
+  shell.say "Sorry, but something went wrong!"
   shell.say ""
   account.errors.full_messages.each { |m| shell.say "   - #{m}" }
 end

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') { content_tag :button, tag_icon(:'power-off'), :type => :submit, :title => pat(:logout), :class => 'navbar-nav-form-link' } %>
+              <%%= 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') } %>
             </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=ist-menu-wrapper>
+              <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>
@@ -66,7 +66,7 @@
                  <div class=arrow> </div>
                  <h3 class=popover-title><%%= pat(:delete, :model => "<%= @orm.name_singular %>") %></h3>
                  <div class=popover-content>
-                   <%%- form_tag url(:<%= @orm.name_plural %>, :destroy, :id => <%= @orm.name_singular %>.id), :method => :delete do %>
+                   <%% form_tag url(:<%= @orm.name_plural %>, :destroy, :id => <%= @orm.name_singular %>.id), :method => :delete do %>
                      <%%= submit_tag pat(:delete), :class =>'list-row-action-popover-delete-one-btn btn btn-danger btn-small' %>
                      <div class="btn btn-default btn-small cancel"><%%= pat(:cancel) %></div>
                    <%% end %>

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' do
-                =content_tag :button, tag_icon('power-off'), :type => :submit, :title => pat(:logout), :class => 'navbar-nav-form-link'
+              = 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')
 
           %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.to_sentence}")
+      flash[:success] = pat(:destroy_many_success, :model => '<%= @orm.name_plural.capitalize %>', :ids => "#{ids.join(', ')}")
     end
     redirect url(:<%= @orm.name_plural %>, :index)
   end

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

@@ -20,8 +20,9 @@ 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') do
-              = content_tag :button, tag_icon(:'power-off'), :type => :submit, :title => pat(:logout), :class => 'navbar-nav-form-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')
 
           ul class='nav navbar-nav pull-left'
             - project_modules.each do |project_module|

data/test/fixtures/sequel.rb

@@ -0,0 +1,89 @@
+require 'digest/sha1'
+require 'sequel'
+require 'sequel/extensions/migration'
+
+Sequel::Model.db = 
+  if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
+    require 'jdbc/sqlite3' 
+    Sequel.connect("jdbc:sqlite::memory:")
+  else
+    require 'sqlite3'
+    Sequel.sqlite(":memory:")
+  end
+
+migration = Sequel.migration do
+  up do
+    create_table :accounts do
+      primary_key :id
+      String :name
+      String :surname
+      String :email
+      String :crypted_password
+      String :role
+    end
+
+    create_table :sections 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
+    drop_table :accounts
+  end
+end
+
+migration.apply(Sequel::Model.db, :up)
+
+class Friend < Sequel::Model
+end
+
+class Page < Sequel::Model
+end
+
+# Fake Section Model
+class Section < Sequel::Model
+  many_to_one :account
+end
+
+# Fake Account Model
+class Account < Sequel::Model
+  attr_accessor :password, :password_confirmation
+
+  one_to_many :sections
+
+  def self.admin;  first(:role => "admin");  end
+  def self.editor; first(:role => "editor"); end
+
+  ##
+  # Replace ActiveRecord method.
+  #
+  def self.find_by_id(id)
+    self[id] rescue nil
+  end
+end
+
+# We build some fake accounts
+admin  = Account.create(:name => "DAddYE", :role => "admin",  :email => "d.dagostino@lipsiasoft.com",
+                        :password => "some", :password_confirmation => "some")
+editor = Account.create(:name => "Dexter", :role => "editor", :email => "editor@lipsiasoft.com",
+                        :password => "some", :password_confirmation => "some")
+
+%w(News Press HowTo).each do |c|
+  admin.add_section(:name => c)
+  editor.add_section(:name => c)
+end

data/test/generators/test_account_model_generator.rb

@@ -12,7 +12,7 @@ describe "AccountModelGenerator" do
 
   describe 'activerecord' do
     before do
-      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=activerecord') }
+      capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=activerecord') }
       capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
       @model = "#{@apptmp}/sample_project/models/account.rb"
     end
@@ -24,7 +24,7 @@ describe "AccountModelGenerator" do
 
   describe 'minirecord' do
     before do
-      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=minirecord') }
+      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
@@ -36,7 +36,7 @@ describe "AccountModelGenerator" do
 
   describe 'datamapper' do
     before do
-      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=datamapper') }
+      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
@@ -48,7 +48,7 @@ describe "AccountModelGenerator" do
 
   describe 'mongoid' do
     before do
-      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=mongoid') }
+      capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=mongoid') }
       capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
       @model = "#{@apptmp}/sample_project/models/account.rb"
     end
@@ -60,7 +60,7 @@ describe "AccountModelGenerator" do
 
   describe 'mongomapper' do
     before do
-      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=mongomapper') }
+      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
@@ -72,7 +72,7 @@ describe "AccountModelGenerator" do
 
   describe 'ohm' do
     before do
-      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=ohm') }
+      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
@@ -84,7 +84,7 @@ describe "AccountModelGenerator" do
 
   describe 'sequel' do
     before do
-      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=sequel') }
+      capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=sequel') }
       capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
       @model = "#{@apptmp}/sample_project/models/account.rb"
     end
@@ -96,7 +96,7 @@ describe "AccountModelGenerator" do
 
   describe 'couchrest' do
     before do
-      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=couchrest') }
+      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

data/test/generators/test_admin_app_generator.rb

@@ -24,28 +24,28 @@ describe "AdminAppGenerator" do
     end
 
     it "should fail if we don't specify an orm on the project" do
-      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '-e=haml') }
+      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") } }
     end
 
     it "should store and apply session_secret" do
-      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=datamapper','-e=haml') }
+      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")
     end
 
     it "should generate the admin app" do
-      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=activerecord') }
+      capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=activerecord') }
       capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
-      assert_file_exists("#{@apptmp}/sample_project")
-      assert_file_exists("#{@apptmp}/sample_project/admin")
+      assert_dir_exists("#{@apptmp}/sample_project")
+      assert_dir_exists("#{@apptmp}/sample_project/admin")
       assert_file_exists("#{@apptmp}/sample_project/admin/app.rb")
-      assert_file_exists("#{@apptmp}/sample_project/admin/controllers")
+      assert_dir_exists("#{@apptmp}/sample_project/admin/controllers")
       assert_file_exists("#{@apptmp}/sample_project/admin/controllers/accounts.rb")
       assert_file_exists("#{@apptmp}/sample_project/admin/controllers/base.rb")
       assert_file_exists("#{@apptmp}/sample_project/admin/controllers/sessions.rb")
-      assert_file_exists("#{@apptmp}/sample_project/admin/views")
-      assert_file_exists("#{@apptmp}/sample_project/public/admin")
-      assert_file_exists("#{@apptmp}/sample_project/public/admin/stylesheets")
+      assert_dir_exists("#{@apptmp}/sample_project/admin/views")
+      assert_dir_exists("#{@apptmp}/sample_project/public/admin")
+      assert_dir_exists("#{@apptmp}/sample_project/public/admin/stylesheets")
       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")
@@ -60,14 +60,14 @@ describe "AdminAppGenerator" do
     end
 
     it "should generate the master app" do
-      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=activerecord') }
+      capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=activerecord') }
       capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project", '--admin-name=master') }
       assert_file_exists("#{@apptmp}/sample_project/master/app.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', "--root=#{@apptmp}", '-d=activerecord') }
+      capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=activerecord') }
       custom_template_path = "#{@apptmp}/sample_project/generators/templates/slim/app/layouts/"
       `mkdir -p #{custom_template_path} && echo "h1 = 'Hello, custom generator' " > #{custom_template_path}application.slim.tt`
       capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
@@ -81,9 +81,9 @@ describe "AdminAppGenerator" do
 
     describe "renderers" do
       it 'should correctly generate a new padrino admin application with haml renderer (default)' do
-        capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=activerecord', '-e=haml') }
+        capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=activerecord', '-e=haml') }
         capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
-        assert_file_exists("#{@apptmp}/sample_project/admin/views")
+        assert_dir_exists("#{@apptmp}/sample_project/admin/views")
         assert_file_exists("#{@apptmp}/sample_project/admin/views/accounts/_form.haml")
         assert_file_exists("#{@apptmp}/sample_project/admin/views/accounts/edit.haml")
         assert_file_exists("#{@apptmp}/sample_project/admin/views/accounts/index.haml")
@@ -96,9 +96,9 @@ describe "AdminAppGenerator" do
       end
 
       it 'should correctly generate a new padrino admin application with erb renderer' do
-        capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=activerecord', '-e=erb') }
+        capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=activerecord', '-e=erb') }
         capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
-        assert_file_exists("#{@apptmp}/sample_project/admin/views")
+        assert_dir_exists("#{@apptmp}/sample_project/admin/views")
         assert_file_exists("#{@apptmp}/sample_project/admin/views/accounts/_form.erb")
         assert_file_exists("#{@apptmp}/sample_project/admin/views/accounts/edit.erb")
         assert_file_exists("#{@apptmp}/sample_project/admin/views/accounts/index.erb")
@@ -111,9 +111,9 @@ describe "AdminAppGenerator" do
       end
 
       it 'should correctly generate a new padrino admin application with slim renderer' do
-        capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=activerecord', '-e=slim') }
+        capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=activerecord', '-e=slim') }
         capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
-        assert_file_exists("#{@apptmp}/sample_project/admin/views")
+        assert_dir_exists("#{@apptmp}/sample_project/admin/views")
         assert_file_exists("#{@apptmp}/sample_project/admin/views/accounts/_form.slim")
         assert_file_exists("#{@apptmp}/sample_project/admin/views/accounts/edit.slim")
         assert_file_exists("#{@apptmp}/sample_project/admin/views/accounts/index.slim")
@@ -127,7 +127,7 @@ describe "AdminAppGenerator" do
     end
 
     it 'should correctly generate a new padrino admin application with a custom model' do
-      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=activerecord', '-e=slim') }
+      capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=activerecord', '-e=slim') }
       capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project", '-m=User') }
       assert_no_match_in_file(/[^_]account/i, "#{@apptmp}/sample_project/admin/controllers/users.rb")
       assert_match_in_file(/[^_]user/i, "#{@apptmp}/sample_project/admin/controllers/users.rb")
@@ -151,16 +151,16 @@ describe "AdminAppGenerator" do
       # Remember that --root/-r in the admin_app generator refers to the project's location, not the admin's location
       # inside it. See https://github.com/padrino/padrino-framework/issues/854#issuecomment-14749356
       skip
-      # capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=activerecord', '-e=haml') }
+      # capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=activerecord', '-e=haml') }
       # capture_io { generate(:admin_app,"-a=/admin", "--root=#{@apptmp}/sample_project") }
-      # assert_file_exists("#{@apptmp}/sample_project")
-      # assert_file_exists("#{@apptmp}/sample_project/admin")
+      # assert_dir_exists("#{@apptmp}/sample_project")
+      # assert_dir_exists("#{@apptmp}/sample_project/admin")
       # assert_file_exists("#{@apptmp}/sample_project/admin/app.rb")
       # assert_file_exists("#{@apptmp}/sample_project/admin/controllers")
       # assert_file_exists("#{@apptmp}/sample_project/admin/controllers/accounts.rb")
       # assert_file_exists("#{@apptmp}/sample_project/admin/controllers/base.rb")
       # assert_file_exists("#{@apptmp}/sample_project/admin/controllers/sessions.rb")
-      # assert_file_exists("#{@apptmp}/sample_project/admin/views")
+      # assert_dir_exists("#{@apptmp}/sample_project/admin/views")
       # assert_file_exists("#{@apptmp}/sample_project/admin/views/accounts/_form.haml")
       # assert_file_exists("#{@apptmp}/sample_project/admin/views/accounts/edit.haml")
       # assert_file_exists("#{@apptmp}/sample_project/admin/views/accounts/index.haml")
@@ -170,8 +170,8 @@ describe "AdminAppGenerator" do
       # assert_file_exists("#{@apptmp}/sample_project/admin/views/base/index.haml")
       # assert_file_exists("#{@apptmp}/sample_project/admin/views/layouts/application.haml")
       # assert_file_exists("#{@apptmp}/sample_project/admin/views/sessions/new.haml")
-      # assert_file_exists("#{@apptmp}/sample_project/public/admin")
-      # assert_file_exists("#{@apptmp}/sample_project/public/admin/stylesheets")
+      # assert_dir_exists("#{@apptmp}/sample_project/public/admin")
+      # assert_dir_exists("#{@apptmp}/sample_project/public/admin/stylesheets")
       # assert_file_exists("#{@apptmp}/sample_project/models/account.rb")
       # assert_no_file_exists("#{@apptmp}/sample_project/models/account.rb")
       # assert_file_exists("#{@apptmp}/sample_project/db/seeds.rb")
@@ -181,26 +181,40 @@ describe "AdminAppGenerator" do
 
     describe "activerecord middleware" do
       it 'should add it for #activerecord' do
-        capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=activerecord', '-e=haml') }
+        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 ActiveRecord::ConnectionAdapters::ConnectionManagemen/m, "#{@apptmp}/sample_project/admin/app.rb")
+        assert_match_in_file(/  use ConnectionPoolManagement/m, "#{@apptmp}/sample_project/admin/app.rb")
       end
 
       it 'should add it #minirecord' do
-        capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=minirecord', '-e=haml') }
+        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 ActiveRecord::ConnectionAdapters::ConnectionManagemen/m, "#{@apptmp}/sample_project/admin/app.rb")
+        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', "--root=#{@apptmp}", '-d=datamapper', '-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") }
-        assert_no_match_in_file(/  use ActiveRecord::ConnectionAdapters::ConnectionManagemen/m, "#{@apptmp}/sample_project/admin/app.rb")
+        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")
       end
     end
 
     it 'should not conflict with existing seeds file' do
-      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=activerecord', '-e=erb') }
+      capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=activerecord', '-e=erb') }
 
       # Add seeds file
       FileUtils.mkdir_p @apptmp + '/sample_project/db' unless File.exist?(@apptmp + '/sample_project/db')
@@ -212,7 +226,7 @@ describe "AdminAppGenerator" do
       refute_match /Overwrite\s.*?\/db\/seeds.rb/, out
 
       assert_file_exists "#{@apptmp}/sample_project/db/seeds.old"
-      assert_match_in_file 'Account.create(', "#{@apptmp}/sample_project/db/seeds.rb"
+      assert_match_in_file 'Account.new(', "#{@apptmp}/sample_project/db/seeds.rb"
     end
   end
 end

data/test/generators/test_admin_page_generator.rb

@@ -1,16 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/../helper')
-
-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
+require File.join(File.dirname(__FILE__), '../fixtures/sequel')
 
 describe "AdminPageGenerator" do
   before do 
@@ -30,100 +19,100 @@ describe "AdminPageGenerator" do
     end
 
     it 'should fail without an existent model' do
-      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=activerecord') }
+      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 correctly generate a new page' do
-      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=datamapper','-e=haml') }
+      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, '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"
+      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"
       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', "--root=#{@apptmp}", '-d=datamapper','-e=haml') }
+      capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=sequel','-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, '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")
+      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
 
     describe "renderers" do
       it 'should correctly generate a new page with haml' do
-        capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=datamapper','-e=haml') }
+        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, '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"
+        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"
         %w(name age email).each do |field|
-          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"
+          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"
         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', "--root=#{@apptmp}", '-d=datamapper','-e=erb') }
+        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, '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"
+        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"
         %w(name age email).each do |field|
-          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"
+          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"
         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', "--root=#{@apptmp}", '-d=datamapper','-e=slim') }
+        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, '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"
+        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"
         %w(name age email).each do |field|
-          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"
+          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"
         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', "--root=#{@apptmp}", '-d=datamapper','-e=haml') }
+      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, 'person', "name:string", "age:integer", "email:string", "-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, '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"
+      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"
       %w(name age email).each do |field|
-        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"
+        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"
       end
-      assert_match_in_file "role.project_module :people, '/people'", "#{@apptmp}/sample_project/admin/app.rb"
+      assert_match_in_file "role.project_module :friends, '/friends'", "#{@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

@@ -1,18 +1,16 @@
 ENV['RACK_ENV'] = 'test'
 PADRINO_ROOT = File.dirname(__FILE__) unless defined? PADRINO_ROOT
 
-require File.expand_path('../../../load_paths', __FILE__)
 require 'minitest/autorun'
 require 'minitest/pride'
 require 'mocha/setup'
 require 'rack/test'
-require 'rack'
 require 'thor/group'
+require 'sequel/model'
 require 'padrino-admin'
-require 'dm-core'
-require 'dm-migrations'
-require 'dm-validations'
-require 'dm-aggregates'
+
+require 'ext/minitest-spec'
+require 'ext/rack-test-methods'
 
 Padrino::Generators.load_components!
 
@@ -32,8 +30,10 @@ class MiniTest::Spec
   # given. Used in setup or individual spec methods to establish
   # the application.
   def mock_app(base=Padrino::Application, &block)
-    @app = Sinatra.new(base, &block)
-    @app.register Padrino::Helpers
+    @app = Sinatra.new base do
+      register Padrino::Helpers
+      instance_eval &block
+    end
   end
 
   def app
@@ -44,34 +44,4 @@ class MiniTest::Spec
   def generate(name, *params)
     "Padrino::Generators::#{name.to_s.camelize}".constantize.start(params)
   end
-
-  # Assert_file_exists('/tmp/app')
-  def assert_file_exists(file_path)
-    assert File.exist?(file_path), "File at path '#{file_path}' does not exist!"
-  end
-
-  # Assert_no_file_exists('/tmp/app')
-  def assert_no_file_exists(file_path)
-    assert !File.exist?(file_path), "File should not exist at path '#{file_path}' but was found!"
-  end
-
-  # Asserts that a file matches the pattern
-  def assert_match_in_file(pattern, file)
-    File.exist?(file) ? assert_match(pattern, File.read(file)) : assert_file_exists(file)
-  end
-
-  def assert_no_match_in_file(pattern, file)
-    File.exist?(file) ? refute_match(pattern, File.read(file)) : assert_file_exists(file)
-  end
-
-  # Delegate other missing methods to response.
-  def method_missing(name, *args, &block)
-    if response && response.respond_to?(name)
-      response.send(name, *args, &block)
-    else
-      super(name, *args, &block)
-    end
-  end
-
-  alias :response :last_response
 end

data/test/test_admin_application.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/helper')
 describe "AdminApplication" do
 
   def setup
-    load_fixture 'data_mapper'
+    load_fixture 'sequel'
   end
 
   describe "session id setting" do
@@ -268,4 +268,21 @@ 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.8.1
+  version: 0.12.9
 platform: ruby
 authors:
 - Padrino Team
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-06 00:00:00.000000000 Z
+date: 2018-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: padrino-core
@@ -19,54 +19,54 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.8.1
+        version: 0.12.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.8.1
+        version: 0.12.9
 - !ruby/object:Gem::Dependency
   name: padrino-helpers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.8.1
+        version: 0.12.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.8.1
+        version: 0.12.9
 - !ruby/object:Gem::Dependency
   name: therubyracer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.11.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.11.1
 - !ruby/object:Gem::Dependency
   name: less
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.2.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.2.2
 description: Admin View for Padrino applications
@@ -76,9 +76,9 @@ extensions: []
 extra_rdoc_files:
 - README.rdoc
 files:
-- ".document"
-- ".gitignore"
-- ".yardopts"
+- .document
+- .gitignore
+- .yardopts
 - LICENSE.txt
 - README.rdoc
 - Rakefile
@@ -263,7 +263,7 @@ files:
 - lib/padrino-admin/locale/orm/zh_cn.yml
 - lib/padrino-admin/locale/orm/zh_tw.yml
 - padrino-admin.gemspec
-- test/fixtures/data_mapper.rb
+- 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
@@ -276,22 +276,22 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- "--charset=UTF-8"
+- --charset=UTF-8
 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
 requirements: []
 rubyforge_project: padrino-admin
-rubygems_version: 2.5.1
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Admin Dashboard for Padrino

data/test/fixtures/data_mapper.rb

@@ -1,52 +0,0 @@
-require 'jdbc/sqlite3' if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
-require 'digest/sha1'
-
-DataMapper.setup(:default, 'sqlite3::memory:')
-
-# Fake Category Model
-class Category
-  include DataMapper::Resource
-  property :id,   Serial
-  property :name, String
-  belongs_to :account
-end
-
-# Fake Account Model
-class Account
-  include DataMapper::Resource
-  include DataMapper::Validate
-  attr_accessor :password, :password_confirmation
-
-  # Properties
-  property :id,               Serial
-  property :name,             String
-  property :surname,          String
-  property :email,            String
-  property :crypted_password, String
-  property :salt,             String
-  property :role,             String
-
-  has n, :categories
-  def self.admin;  first(:role => "admin");  end
-  def self.editor; first(:role => "editor"); end
-
-  ##
-  # This method is used from AuthenticationHelper
-  #
-  def self.find_by_id(id)
-    get(id)
-  end
-end
-
-DataMapper.auto_migrate!
-
-# We build some fake accounts
-admin  = Account.create(:name => "DAddYE", :role => "admin",  :email => "d.dagostino@lipsiasoft.com",
-                        :password => "some", :password_confirmation => "some")
-editor = Account.create(:name => "Dexter", :role => "editor", :email => "editor@lipsiasoft.com",
-                        :password => "some", :password_confirmation => "some")
-
-%w(News Press HowTo).each do |c|
-  admin.categories.create(:name => c)
-  editor.categories.create(:name => c)
-end