padrino-admin 0.9.10 → 0.9.11

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

@@ -0,0 +1,26 @@
+es:
+  activemodel: &activemodel
+    errors:
+      messages:
+        inclusion: "no está incluido en la lista"
+        exclusion: "está reservado"
+        invalid: "es inválido"
+        confirmation: "no es igual a la confirmación"
+        accepted: "debe ser aceptado"
+        empty: "no puede estar vacío"
+        blank: "no puede estar en blanco"
+        too_long: "es demasiado largo (máximo %{count} caracteres)"
+        too_short: "es demasiado corto (minimo %{count} caracteres)"
+        wrong_length: "tiene una longitud incorrecta (debería tener %{count} caracteres)"
+        taken: "ya está tomado"
+        not_a_number: "no es un número"
+        greater_than: "debe ser mayor a %{count}"
+        greater_than_or_equal_to: "debe ser igual o mayor a %{count}"
+        equal_to: "debe ser igual a %{count}"
+        less_than: "debe ser menor a %{count}"
+        less_than_or_equal_to: "debe ser igual o menor a %{count}"
+        odd: "debe ser impar"
+        even: "debe ser par"
+        record_invalid: "Fallo la validación: %{errors}"
+        content_type: "formato de archivo no soportado"
+  activerecord: *activemodel

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

@@ -9,18 +9,18 @@ fr:
         accepted: "doit être accepté"
         empty: "ne peux pas être vide"
         blank: "ne peux pas être vide"
-        too_long: "est trop long (le maximum est de {{count}} caractères)"
-        too_short: "est trop court (le minimum est de {{count}} caractères)"
-        wrong_length: "n'est  pas de bonne longueur (devrait être long de {{count}} caractères)"
+        too_long: "est trop long (le maximum est de %{count} caractères)"
+        too_short: "est trop court (le minimum est de %{count} caractères)"
+        wrong_length: "n'est  pas de bonne longueur (devrait être long de %{count} caractères)"
         taken: "n'est pas disponible"
         not_a_number: "n'est pas un nombre"
-        greater_than: "doit être supèrieur à {{count}}"
-        greater_than_or_equal_to: "doit être supèrieur ou égal à {{count}}"
-        equal_to: "doit être égal à {{count}}"
-        less_than: "doit être infèrieur à {{count}}"
-        less_than_or_equal_to: "doit être infèrieur ou égal à {{count}}"
+        greater_than: "doit être supèrieur à %{count}"
+        greater_than_or_equal_to: "doit être supèrieur ou égal à %{count}"
+        equal_to: "doit être égal à %{count}"
+        less_than: "doit être infèrieur à %{count}"
+        less_than_or_equal_to: "doit être infèrieur ou égal à %{count}"
         odd: "doit être impair"
         even: "doit être pair"
-        record_invalid: "La validation a échoué: {{errors}}"
+        record_invalid: "La validation a échoué: %{errors}"
         content_type: "format de fichier non pris en charge"
   activerecord: *activemodel

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

@@ -9,18 +9,18 @@ it:
         accepted: "deve essere accettata"
         empty: "non può essere vuoto"
         blank: "non può essere lasciato in bianco"
-        too_long: "è troppo lungo (il massimo è {{count}} lettere)"
-        too_short: "è troppo corto (il minimo è {{count}} lettere)"
-        wrong_length: "è della lunghezza sbagliata (deve essere di {{count}} lettere)"
+        too_long: "è troppo lungo (il massimo è %{count} lettere)"
+        too_short: "è troppo corto (il minimo è %{count} lettere)"
+        wrong_length: "è della lunghezza sbagliata (deve essere di %{count} lettere)"
         taken: "è già in uso"
         not_a_number: "non è un numero"
-        greater_than: "deve essere superiore a {{count}}"
-        greater_than_or_equal_to: "deve essere superiore o uguale a {{count}}"
-        equal_to: "deve essere uguale a {{count}}"
-        less_than: "deve essere meno di {{count}}"
-        less_than_or_equal_to: "deve essere meno o uguale a {{count}}"
+        greater_than: "deve essere superiore a %{count}"
+        greater_than_or_equal_to: "deve essere superiore o uguale a %{count}"
+        equal_to: "deve essere uguale a %{count}"
+        less_than: "deve essere meno di %{count}"
+        less_than_or_equal_to: "deve essere meno o uguale a %{count}"
         odd: "deve essere dispari"
         even: "deve essere pari"
-        record_invalid: "Validazione fallita: {{errors}}"
+        record_invalid: "Validazione fallita: %{errors}"
         content_type: "il seguente tipo di file non è supportato"
   activerecord: *activemodel

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

@@ -9,18 +9,18 @@ pt_br:
         accepted: "deve ser aceita"
         empty: "não pode estar vazio"
         blank: "não pode ser deixado em branco"
-        too_long: "é longo demais (o máximo são {{count}} letras)"
-        too_short: "é curto demais (o mínimo são {{count}} letras)"
-        wrong_length: "o comprimento está errado (deve ser de {{count}} letras)"
+        too_long: "é longo demais (o máximo são %{count} letras)"
+        too_short: "é curto demais (o mínimo são %{count} letras)"
+        wrong_length: "o comprimento está errado (deve ser de %{count} letras)"
         taken: "já está em uso"
         not_a_number: "não é um número"
-        greater_than: "deve ser maior que {{count}}"
-        greater_than_or_equal_to: "deve ser maior ou igual a {{count}}"
-        equal_to: "deve ser igual a {{count}}"
-        less_than: "deve ser menor que {{count}}"
-        less_than_or_equal_to: "deve ser menor ou igual a {{count}}"
+        greater_than: "deve ser maior que %{count}"
+        greater_than_or_equal_to: "deve ser maior ou igual a %{count}"
+        equal_to: "deve ser igual a %{count}"
+        less_than: "deve ser menor que %{count}"
+        less_than_or_equal_to: "deve ser menor ou igual a %{count}"
         odd: "deve ser ímpar"
         even: "deve ser par"
-        record_invalid: "Falha na validação: {{errors}}"
+        record_invalid: "Falha na validação: %{errors}"
         content_type: "o seguinte tipo de arquivo não é suportado"
   activerecord: *activemodel

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

@@ -9,18 +9,18 @@ ru:
         accepted: "должно быть принято"
         empty: "не может быть пустым"
         blank: "не может быть пустым"
-        too_long: "превышает длину (максимум {{count}} символов)"
-        too_short: "недостатночной длины (минимум {{count}} символов)"
-        wrong_length: "неправильной длины (должно быть {{count}} символов)"
+        too_long: "превышает длину (максимум %{count} символов)"
+        too_short: "недостатночной длины (минимум %{count} символов)"
+        wrong_length: "неправильной длины (должно быть %{count} символов)"
         taken: "уже занят"
         not_a_number: "не число"
-        greater_than: "должно быть больше {{count}}"
-        greater_than_or_equal_to: "должно быть не менее {{count}}"
-        equal_to: "должно быть равно {{count}}"
-        less_than: "должно быть меньше {{count}}"
-        less_than_or_equal_to: "должно быть не более {{count}}"
+        greater_than: "должно быть больше %{count}"
+        greater_than_or_equal_to: "должно быть не менее %{count}"
+        equal_to: "должно быть равно %{count}"
+        less_than: "должно быть меньше %{count}"
+        less_than_or_equal_to: "должно быть не более %{count}"
         odd: "должно быть нечетным"
         even: "должно быть четным"
-        record_invalid: "Проверка не удалась: {{errors}}"
+        record_invalid: "Проверка не удалась: %{errors}"
         content_type: "формат файла не поддерживается"
   activerecord: *activemodel

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

@@ -0,0 +1,26 @@
+tr:
+  activemodel: &activemodel
+    errors:
+      messages:
+        inclusion: "listede yok"
+        exclusion: "ayrılmış"
+        invalid: "geçerli değil"
+        confirmation: "onaylananla uyuşmuyor"
+        accepted: "kabul edilmeli"
+        empty: "boş olamaz"
+        blank: "boş bırakılamaz"
+        too_long: "uzun (en fazla %{count} karakter)"
+        too_short: "kısa (en az %{count} karakter)"
+        wrong_length: "yanlış uzunluk (%{count} karakter olmalı)"
+        taken: "zaten alınmış"
+        not_a_number: "sayı değil"
+        greater_than: "%{count}'den büyük olmalı"
+        greater_than_or_equal_to: "%{count}'den büyük veya eşit olmalı"
+        equal_to: "%{count}'e eşit olmalı"
+        less_than: "%{count}'den küçük olmalı"
+        less_than_or_equal_to: "%{count}'den küçük veya eşit olmalı"
+        odd: "tek olmalı"
+        even: "çift olmalı"
+        record_invalid: "Doğrulama gerçekleşmedi: %{errors}"
+        content_type: "Dosya biçimi desteklenmiyor"
+  activerecord: *activemodel

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

@@ -0,0 +1,26 @@
+uk:
+  activemodel: &activemodel
+    errors:
+      messages:
+        inclusion: "не входить у список"
+        exclusion: "зарезервовано"
+        invalid: "недійсний"
+        confirmation: "не збігається з підтвердженням"
+        accepted: "повинно бути прийняте"
+        empty: "не може бути порожнім"
+        blank: "не може бути порожнім"
+        too_long: "занадто довгий (максимум %{count} символів)"
+        too_short: "занадто короткий(мінімум %{count} символів)"
+        wrong_length: "неправильної довжини (повинно бути %{count} символів)"
+        taken: "вже зайнятий"
+        not_a_number: "не число"
+        greater_than: "повинно бути більше %{count}"
+        greater_than_or_equal_to: "повинно бути не менше %{count}"
+        equal_to: "повинно дорівнювати %{count}"
+        less_than: "повинно бути менше %{count}"
+        less_than_or_equal_to: "повинно бути не більше %{count}"
+        odd: "повинно бути непарним"
+        even: "повинно бути парним"
+        record_invalid: "Перевірка не вдалася: %{errors}"
+        content_type: "формат файлу не підтримується"
+  activerecord: *activemodel

data/lib/padrino-admin.rb

@@ -2,8 +2,8 @@ require 'padrino-core'
 require 'padrino-gen'
 require 'padrino-helpers'
 
-Dir[File.dirname(__FILE__) + '/padrino-admin/*.rb'].each { |file| require file }
-Dir[File.dirname(__FILE__) + '/padrino-admin/{helpers,utils}/*.rb'].each { |file| require file }
+FileSet.glob_require('padrino-admin/*.rb', __FILE__)
+FileSet.glob_require('padrino-admin/{helpers,utils}/*.rb', __FILE__)
 
 module Padrino
   ##
@@ -22,11 +22,6 @@ end
 #
 String.send(:include, Padrino::Admin::Utils::Crypt)
 
-##
-# We need to add to Padrino::Application a +access_control+ class
-#
-Padrino::Application.extend(Padrino::Admin::AccessControl::ClassMethods)
-
 ##
 # Load our Padrino::Admin locales
 #

data/padrino-admin.gemspec

@@ -1,135 +1,24 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
+require File.expand_path("../../padrino-core/lib/padrino-core/version.rb", __FILE__)
+require 'rubygems'
+require 'bundler'
 
 Gem::Specification.new do |s|
   s.name = %q{padrino-admin}
-  s.version = "0.9.10"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.rubyforge_project = %q{padrino-admin}
   s.authors = ["Padrino Team", "Nathan Esquenazi", "Davide D'Agostino", "Arthur Chiu"]
-  s.date = %q{2010-04-22}
-  s.description = %q{Admin View for Padrino applications}
   s.email = %q{padrinorb@gmail.com}
-  s.extra_rdoc_files = [
-    "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "lib/padrino-admin.rb",
-     "lib/padrino-admin/access_control.rb",
-     "lib/padrino-admin/generators/actions.rb",
-     "lib/padrino-admin/generators/admin_app.rb",
-     "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/mongoid.rb.tt",
-     "lib/padrino-admin/generators/templates/account/mongomapper.rb.tt",
-     "lib/padrino-admin/generators/templates/account/seeds.rb.tt",
-     "lib/padrino-admin/generators/templates/account/sequel.rb.tt",
-     "lib/padrino-admin/generators/templates/app/app.rb",
-     "lib/padrino-admin/generators/templates/app/controllers/base.rb",
-     "lib/padrino-admin/generators/templates/app/controllers/sessions.rb",
-     "lib/padrino-admin/generators/templates/assets/stylesheets/base.css",
-     "lib/padrino-admin/generators/templates/assets/stylesheets/themes/amro/style.css",
-     "lib/padrino-admin/generators/templates/assets/stylesheets/themes/bec-green/style.css",
-     "lib/padrino-admin/generators/templates/assets/stylesheets/themes/bec/style.css",
-     "lib/padrino-admin/generators/templates/assets/stylesheets/themes/blue/style.css",
-     "lib/padrino-admin/generators/templates/assets/stylesheets/themes/default/style.css",
-     "lib/padrino-admin/generators/templates/assets/stylesheets/themes/djime-cerulean/style.css",
-     "lib/padrino-admin/generators/templates/assets/stylesheets/themes/kathleene/style.css",
-     "lib/padrino-admin/generators/templates/assets/stylesheets/themes/olive/style.css",
-     "lib/padrino-admin/generators/templates/assets/stylesheets/themes/orange/style.css",
-     "lib/padrino-admin/generators/templates/assets/stylesheets/themes/reidb-greenish/style.css",
-     "lib/padrino-admin/generators/templates/assets/stylesheets/themes/ruby/style.css",
-     "lib/padrino-admin/generators/templates/assets/stylesheets/themes/warehouse/style.css",
-     "lib/padrino-admin/generators/templates/erb/app/base/_sidebar.erb.tt",
-     "lib/padrino-admin/generators/templates/erb/app/base/index.erb.tt",
-     "lib/padrino-admin/generators/templates/erb/app/layouts/application.erb.tt",
-     "lib/padrino-admin/generators/templates/erb/app/sessions/new.erb.tt",
-     "lib/padrino-admin/generators/templates/erb/page/_form.erb.tt",
-     "lib/padrino-admin/generators/templates/erb/page/edit.erb.tt",
-     "lib/padrino-admin/generators/templates/erb/page/index.erb.tt",
-     "lib/padrino-admin/generators/templates/erb/page/new.erb.tt",
-     "lib/padrino-admin/generators/templates/haml/app/base/_sidebar.haml.tt",
-     "lib/padrino-admin/generators/templates/haml/app/base/index.haml.tt",
-     "lib/padrino-admin/generators/templates/haml/app/layouts/application.haml.tt",
-     "lib/padrino-admin/generators/templates/haml/app/sessions/new.haml.tt",
-     "lib/padrino-admin/generators/templates/haml/page/_form.haml.tt",
-     "lib/padrino-admin/generators/templates/haml/page/edit.haml.tt",
-     "lib/padrino-admin/generators/templates/haml/page/index.haml.tt",
-     "lib/padrino-admin/generators/templates/haml/page/new.haml.tt",
-     "lib/padrino-admin/generators/templates/page/controller.rb.tt",
-     "lib/padrino-admin/helpers/authentication_helpers.rb",
-     "lib/padrino-admin/helpers/view_helpers.rb",
-     "lib/padrino-admin/locale/admin/da.yml",
-     "lib/padrino-admin/locale/admin/de.yml",
-     "lib/padrino-admin/locale/admin/en.yml",
-     "lib/padrino-admin/locale/admin/fr.yml",
-     "lib/padrino-admin/locale/admin/it.yml",
-     "lib/padrino-admin/locale/admin/pt_br.yml",
-     "lib/padrino-admin/locale/admin/ru.yml",
-     "lib/padrino-admin/locale/orm/da.yml",
-     "lib/padrino-admin/locale/orm/de.yml",
-     "lib/padrino-admin/locale/orm/en.yml",
-     "lib/padrino-admin/locale/orm/fr.yml",
-     "lib/padrino-admin/locale/orm/it.yml",
-     "lib/padrino-admin/locale/orm/pt_br.yml",
-     "lib/padrino-admin/locale/orm/ru.yml",
-     "lib/padrino-admin/utils/crypt.rb",
-     "padrino-admin.gemspec",
-     "test/fixtures/data_mapper.rb",
-     "test/generators/test_admin_app_generator.rb",
-     "test/generators/test_admin_page_generator.rb",
-     "test/helper.rb",
-     "test/test_admin_application.rb"
-  ]
+  s.summary = %q{Admin Dashboard for Padrino}
   s.homepage = %q{http://github.com/padrino/padrino-framework/tree/master/padrino-admin}
+  s.description = %q{Admin View for Padrino applications}
+  s.required_rubygems_version = ">= 1.3.6"
+  s.version = Padrino.version
+  s.date = Time.now.strftime("%Y-%m-%d")
+  s.extra_rdoc_files = Dir["*.rdoc"]
+  s.files = %w(.document .gitignore LICENSE README.rdoc Rakefile padrino-admin.gemspec) + Dir.glob("{bin,lib,test}/**/*")
   s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubyforge_project = %q{padrino-admin}
-  s.rubygems_version = %q{1.3.6}
-  s.summary = %q{Admin Dashboard for Padrino}
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<padrino-core>, ["= 0.9.10"])
-      s.add_runtime_dependency(%q<padrino-gen>, ["= 0.9.10"])
-      s.add_runtime_dependency(%q<padrino-helpers>, ["= 0.9.10"])
-      s.add_development_dependency(%q<haml>, [">= 2.2.1"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<mocha>, [">= 0.9.7"])
-      s.add_development_dependency(%q<rack-test>, [">= 0.5.0"])
-      s.add_development_dependency(%q<webrat>, [">= 0.5.1"])
-    else
-      s.add_dependency(%q<padrino-core>, ["= 0.9.10"])
-      s.add_dependency(%q<padrino-gen>, ["= 0.9.10"])
-      s.add_dependency(%q<padrino-helpers>, ["= 0.9.10"])
-      s.add_dependency(%q<haml>, [">= 2.2.1"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<mocha>, [">= 0.9.7"])
-      s.add_dependency(%q<rack-test>, [">= 0.5.0"])
-      s.add_dependency(%q<webrat>, [">= 0.5.1"])
-    end
-  else
-    s.add_dependency(%q<padrino-core>, ["= 0.9.10"])
-    s.add_dependency(%q<padrino-gen>, ["= 0.9.10"])
-    s.add_dependency(%q<padrino-helpers>, ["= 0.9.10"])
-    s.add_dependency(%q<haml>, [">= 2.2.1"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<mocha>, [">= 0.9.7"])
-    s.add_dependency(%q<rack-test>, [">= 0.5.0"])
-    s.add_dependency(%q<webrat>, [">= 0.5.1"])
-  end
-end
-
+  s.require_path = 'lib'
+  s.add_runtime_dependency(%q<padrino-core>, ["= #{Padrino.version}"])
+  s.add_runtime_dependency(%q<padrino-gen>, ["= #{Padrino.version}"])
+  s.add_runtime_dependency(%q<padrino-helpers>, ["= #{Padrino.version}"])
+  s.add_bundler_dependencies :development
+end

data/test/fixtures/data_mapper.rb

@@ -1,6 +1,8 @@
 require 'dm-core'
+require 'dm-migrations'
 require 'dm-validations'
 require 'dm-aggregates'
+require 'digest/sha1'
 
 DataMapper.setup(:default, 'sqlite3::memory:')
 
@@ -28,15 +30,15 @@ class Account
   property :role,             String
 
   # Validations
-  validates_present      :email, :role
-  validates_present      :password,                          :if => :password_required
-  validates_present      :password_confirmation,             :if => :password_required
-  validates_length       :password, :min => 4, :max => 40,   :if => :password_required
-  validates_is_confirmed :password,                          :if => :password_required
-  validates_length       :email,    :min => 3, :max => 100
-  validates_is_unique    :email,    :case_sensitive => false
-  validates_format       :email,    :with => :email_address
-  validates_format       :role,     :with => /[A-Za-z]/
+  validates_presence_of      :email, :role
+  validates_presence_of      :password,                          :if => :password_required
+  validates_presence_of      :password_confirmation,             :if => :password_required
+  validates_length_of        :password, :min => 4, :max => 40,   :if => :password_required
+  validates_confirmation_of  :password,                          :if => :password_required
+  validates_length_of        :email,    :min => 3, :max => 100
+  validates_uniqueness_of    :email,    :case_sensitive => false
+  validates_format_of        :email,    :with => :email_address
+  validates_format_of        :role,     :with => /[A-Za-z]/
 
   has n, :categories
   def self.admin;  first(:role => "admin");  end

data/test/generators/test_admin_app_generator.rb

@@ -25,7 +25,7 @@ class TestAdminAppGenerator < Test::Unit::TestCase
     end
 
     should 'correctyl generate a new padrino admin application with default renderer' do
-      assert_nothing_raised { silence_logger { generate(:project, 'sample_project', '--root=/tmp', '-d=activerecord') } }
+      assert_nothing_raised { silence_logger { generate(:project, 'sample_project', '--root=/tmp', '-d=activerecord', '-e=haml') } }
       assert_nothing_raised { silence_logger { generate(:admin_app, '--root=/tmp/sample_project') } }
       assert_file_exists('/tmp/sample_project')
       assert_file_exists('/tmp/sample_project/admin')

data/test/generators/test_admin_page_generator.rb

@@ -33,7 +33,7 @@ class TestAdminPageGenerator < Test::Unit::TestCase
     end
 
     should 'correctly generate a new padrino admin application default renderer' do
-      silence_logger { generate(:project, 'sample_project', '--root=/tmp', '-d=datamapper') }
+      silence_logger { generate(:project, 'sample_project', '--root=/tmp', '-d=datamapper','-e=haml') }
       silence_logger { generate(:admin_app, '--root=/tmp/sample_project') }
       silence_logger { generate(:model, 'person', "name:string", "age:integer", "email:string", '-root=/tmp/sample_project') }
       silence_logger { generate(:admin_page, 'person', '--root=/tmp/sample_project') }
@@ -67,7 +67,7 @@ class TestAdminPageGenerator < Test::Unit::TestCase
     end
 
     should 'correctly generate a new padrino admin application with multiple models' do
-      silence_logger { generate(:project, 'sample_project', '--root=/tmp', '-d=datamapper') }
+      silence_logger { generate(:project, 'sample_project', '--root=/tmp', '-d=datamapper','-e=haml') }
       silence_logger { generate(:admin_app, '--root=/tmp/sample_project') }
       silence_logger { generate(:model, 'person', "name:string", "age:integer", "email:string", '-root=/tmp/sample_project') }
       silence_logger { generate(:model, 'page', "name:string", "body:string", '-root=/tmp/sample_project') }

data/test/helper.rb

@@ -1,7 +1,7 @@
 ENV['PADRINO_ENV'] = 'test'
 PADRINO_ROOT = File.dirname(__FILE__) unless defined? PADRINO_ROOT
 
-require 'rubygems'
+require File.expand_path('../../../load_paths', __FILE__)
 require 'test/unit'
 require 'rack/test'
 require 'rack'
@@ -15,7 +15,7 @@ require 'thor/group'
   end
 end
 
-require 'padrino-core/support_lite'
+require 'padrino-core/support_lite' unless defined?(SupportLite)
 require 'padrino-admin'
 
 Padrino::Generators.load_components!
@@ -54,13 +54,13 @@ class Test::Unit::TestCase
   def mock_app(base=Padrino::Application, &block)
     @app = Sinatra.new(base, &block)
     @app.send :include, Test::Unit::Assertions
-    @app.use Rack::Session::Cookie if Sinatra::VERSION =~ /0\.9\.\d+/ # Need this because Sinatra 0.9.x have use Rack::Session::Cookie if sessions? && !test?
+    @app.register Padrino::Helpers
   end
 
   def app
     Rack::Lint.new(@app)
   end
-  
+
   # generate(:admin_app, '-r=/tmp/sample_project')
   def generate(name, *params)
     "Padrino::Generators::#{name.to_s.camelize}".constantize.start(params)

data/test/test_admin_application.rb

@@ -8,7 +8,7 @@ class TestAdminApplication < Test::Unit::TestCase
 
   should 'require correctly login' do
     mock_app do
-      enable :authentication
+      register Padrino::Admin::AccessControl
 
       # Do a simple mapping
       access_control.roles_for :any do |role|
@@ -35,7 +35,7 @@ class TestAdminApplication < Test::Unit::TestCase
   should 'set basic roles with store location and login page' do
     mock_app do
       set    :app_name, :basic_app
-      enable :authentication
+      register Padrino::Admin::AccessControl
       enable :store_location
       set    :login_page, "/login"
 
@@ -69,7 +69,7 @@ class TestAdminApplication < Test::Unit::TestCase
 
   should 'set advanced roles with store location and login page' do
     mock_app do
-      enable :authentication
+      register Padrino::Admin::AccessControl
 
       access_control.roles_for :any do |role|
         role.protect "/"
@@ -96,7 +96,7 @@ class TestAdminApplication < Test::Unit::TestCase
       assert access_control.allowed?(Account.editor, "/posts")
 
       # 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
@@ -106,7 +106,7 @@ class TestAdminApplication < Test::Unit::TestCase
       get "/posts"    do; "posts";    end
     end
 
-    get "/login/"
+    get "/login"
     assert_equal "logged as any", body
 
     get "/any"
@@ -145,7 +145,7 @@ class TestAdminApplication < Test::Unit::TestCase
 
   should 'emulate an ecommerce app' do
     mock_app do
-      enable :authentication
+      register Padrino::Admin::AccessControl
 
       access_control.roles_for :any do |role|
         role.protect "/cart"
@@ -195,7 +195,7 @@ class TestAdminApplication < Test::Unit::TestCase
 
   should 'check access control helper' do
     mock_app do
-      enable :authentication
+      register Padrino::Admin::AccessControl
 
       access_control.roles_for :any do |role|
         role.project_module :foo, "/foo"
@@ -243,4 +243,4 @@ class TestAdminApplication < Test::Unit::TestCase
     get "/modules"
     assert_equal "admin => /admin", body
   end
-end
+end unless RUBY_PLATFORM =~ /java/ # DM seems to have some problems on JRuby