padrino-admin 0.9.9 → 0.9.10

data/README.rdoc

@@ -4,7 +4,7 @@
 
 Padrino has a beautiful Admin management dashboard with these features:
 
-Orm Agnostic:: Data Adapters for Datamapper, Activerecord, Mongomapper, Mongoid
+Orm Agnostic:: Data Adapters for Datamapper, Activerecord, Sequel, Mongomapper, Mongoid, Couchrest
 Template Agnostic:: Erb and Haml Renderer
 Authentication:: Support for Account authentication, Account Permission managment
 Scaffold:: You can simply create a new "admin interface" by providing a Model
@@ -13,7 +13,7 @@ Access Control:: Supports authentication and role permissions for your applicati
 === Admin Dashboard Usage
 
 For a complete look at usage of the Admin dashboard functionality, be sure to check out the
-{Padrino Admin}[http://wiki.github.com/padrino/padrino-framework/padrino-admin] guide.
+{Padrino Admin}[http://www.padrinorb.com/guides/padrino-admin] guide.
 
 Create a new project:
 
@@ -63,7 +63,7 @@ In this example +if+ we visit urls that start with /+customer+/+orders+ or /+car
 to our :+login_page+ "/login". Once we are correctly logged in we can visit these pages.
 
 For a more complete look at using the Admin panel functionality and access features, be sure to check out the
-{Padrino Admin}[http://wiki.github.com/padrino/padrino-framework/padrino-admin] guide.
+{Padrino Admin}[http://www.padrinorb.com/guides/padrino-admin] guide.
 
 == Copyright
 

data/Rakefile

@@ -1,7 +1,6 @@
 require 'rubygems'
 require 'rake'
-
-GEM_VERSION = File.read(File.dirname(__FILE__) + '/VERSION')
+require File.expand_path("../../padrino-core/lib/padrino-core/version.rb", __FILE__)
 
 begin
   require 'jeweler'
@@ -13,9 +12,10 @@ begin
     gem.homepage = "http://github.com/padrino/padrino-framework/tree/master/padrino-admin"
     gem.authors = ["Padrino Team", "Nathan Esquenazi", "Davide D'Agostino", "Arthur Chiu"]
     gem.rubyforge_project = 'padrino-admin'
-    gem.add_runtime_dependency     "padrino-core",    "= #{GEM_VERSION}"
-    gem.add_runtime_dependency     "padrino-gen",     "= #{GEM_VERSION}"
-    gem.add_runtime_dependency     "padrino-helpers", "= #{GEM_VERSION}"
+    gem.version = Padrino.version
+    gem.add_runtime_dependency     "padrino-core",    "= #{Padrino.version}"
+    gem.add_runtime_dependency     "padrino-gen",     "= #{Padrino.version}"
+    gem.add_runtime_dependency     "padrino-helpers", "= #{Padrino.version}"
     gem.add_development_dependency "haml",            ">= 2.2.1"
     gem.add_development_dependency "shoulda",         ">= 0"
     gem.add_development_dependency "mocha",           ">= 0.9.7"
@@ -51,33 +51,4 @@ rescue LoadError
   end
 end
 
-# task :test => :check_dependencies
-
-task :default => :test
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "padrino-admin #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-
-spec = Gem::Specification.new do |s|
-  s.name              = "foo"
-  s.version           = "1.0.1"
-  s.author            = "Davide D'Agostino"
-  s.email             = "d.dagostino@lipsiasoft.com"
-  s.homepage          = "http://www.lipsiadmin.com"
-  s.rubyforge_project = "lipsiadmin"
-  s.platform          = Gem::Platform::RUBY
-  s.summary           = "Lipsiadmin is a new revolutionary admin for your projects.Lipsiadmin is based on Ext Js 2.0. framework (with prototype adapter) and is ready for Rails 2.0. This admin is for newbie developper but also for experts, is not entirely written in javascript because the aim of developper wose build in a agile way web/site apps so we use extjs in a new intelligent way a mixin of 'old' html and new ajax functions, for example ext manage the layout of page, grids, tree and errors, but form are in html code."
-  s.files             = FileList["CHANGELOG", "README.rdoc", "MIT-LICENSE", "Rakefile", "init.rb", "{lipsiadmin_generators,lib,resources,tasks}/**/*"].to_a
-  s.has_rdoc          = true
-  s.requirements << "ImageMagick"
-  s.add_dependency('haml')
-  s.add_dependency('rails', '>= 2.2.1')
-end
+task :default => :test

data/lib/padrino-admin/access_control.rb

@@ -11,6 +11,7 @@ module Padrino
       #
       def self.registered(app)
         app.set :session_id, "_padrino_#{File.basename(Padrino.root)}_#{app.app_name}".to_sym
+        app.enable :sessions
         app.helpers Padrino::Admin::Helpers::AuthenticationHelpers
         app.helpers Padrino::Admin::Helpers::ViewHelpers
         app.before { login_required }
@@ -149,7 +150,9 @@ module Padrino
         #   project_module.path("/admin")
         #
         def path(prefix=nil)
-          prefix ? File.join(prefix, @path) : @path
+          path = prefix ? File.join(prefix, @path) : @path
+          path = File.join(ENV['RACK_BASE_URI'].to_s, path) if ENV['RACK_BASE_URI']
+          path
         end
       end # ProjectModule
     end # AccessControl

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

@@ -14,7 +14,7 @@ module Padrino
         # Tell us for now wich orm we support
         #
         def supported_orm
-          [:datamapper, :activerecord, :mongomapper, :mongoid]
+          [:datamapper, :activerecord, :mongomapper, :mongoid, :couchrest, :sequel]
         end
 
         ##

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

@@ -46,7 +46,7 @@ module Padrino
           directory "templates/app",     destination_root("admin")
           directory "templates/assets",  destination_root("public", "admin")
 
-          Padrino::Generators::Model.dup.start([
+          Padrino::Generators::Model.start([
             "account", "name:string", "surname:string", "email:string", "crypted_password:string", "salt:string", "role:string",
             "-r=#{options[:root]}", "-s=#{options[:skip_migration]}", "-d=#{options[:destroy]}"
           ])

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

@@ -18,6 +18,7 @@ module Padrino
         end
 
         def field_type(type)
+          type = type.to_s.demodulize.downcase.to_sym unless type.is_a?(Symbol)
           case type
             when :integer, :float, :decimal   then :text_field
             when :string                      then :text_field
@@ -27,12 +28,16 @@ module Padrino
           end
         end
 
+        Column = Struct.new(:name, :type) # for compatibility
+
         def columns
           @columns ||= case orm
             when :activerecord then @klass.columns
             when :datamapper   then @klass.properties
+            when :couchrest    then @klass.properties
             when :mongoid      then @klass.fields.values
             when :mongomapper  then @klass.keys.values.reject { |key| key.name == "_id" } # On MongoMapper keys are an hash
+            when :sequel       then @klass.db_schema.map { |k,v| Column.new(k, v[:type]) }
             else raise OrmError, "Adapter #{orm} is not yet supported!"
           end
         end
@@ -53,7 +58,8 @@ module Padrino
         def find(params=nil)
           case orm
             when :activerecord, :mongomapper, :mongoid then "#{klass_name}.find(#{params})"
-            when :datamapper   then "#{klass_name}.get(#{params})"
+            when :datamapper, :couchrest   then "#{klass_name}.get(#{params})"
+            when :sequel then "#{klass_name}.filter(#{params}).first"
             else raise OrmError, "Adapter #{orm} is not yet supported!"
           end
         end
@@ -67,13 +73,17 @@ module Padrino
         end
 
         def save
-          "#{name_singular}.save"
+          case orm
+            when :sequel then "(@#{name_singular}.save rescue false)"
+            else "@#{name_singular}.save"
+          end
         end
 
         def update_attributes(params=nil)
           case orm
-            when :activerecord, :mongomapper, :mongoid then "#{name_singular}.update_attributes(#{params})"
-            when :datamapper   then "#{name_singular}.update(#{params})"
+            when :activerecord, :mongomapper, :mongoid, :couchrest then "@#{name_singular}.update_attributes(#{params})"
+            when :datamapper then "@#{name_singular}.update(#{params})"
+            when :sequel then "(@#{name_singular}.update(#{params}) rescue false)"
             else raise OrmError, "Adapter #{orm} is not yet supported!"
           end
         end

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

@@ -0,0 +1,73 @@
+class Account < CouchRest::ExtendedDocument
+  include CouchRest::Validation
+  use_database COUCHDB
+
+  attr_accessor :password, :password_confirmation
+
+  # Properties
+  property :name
+  property :surname
+  property :email
+  property :crypted_password
+  property :salt
+  property :role
+
+  view_by :email
+  view_by :id,
+    :map => "function(doc) {\n if ((doc['couchrest-type'] == 'Account') && doc['_id']) {\n emit(doc['_id'], null);\n }\n}\n"
+
+  # Validations
+  validates_presence_of     :email, :role
+  validates_presence_of     :password,                   :if => :password_required
+  validates_presence_of     :password_confirmation,      :if => :password_required
+  validates_length_of       :password, :within => 4..40, :if => :password_required
+  validates_confirmation_of :password,                   :if => :password_required
+  validates_length_of       :email,    :within => 3..100
+  validates_with_method     :email,    :method => :email_is_unique
+  validates_format_of       :email,    :with => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i
+  validates_format_of       :role,     :with => /[A-Za-z]/
+
+  # Callbacks
+  before_save :generate_password
+
+  ##
+  # This method is for authentication purpose
+  #
+  def self.authenticate(email, password)
+    email_array = self.by_email :key => email
+    account = email_array[0]
+    account && account.password_clean == password ? account : nil
+  end
+
+  ##
+  # This method is used for retrive the original password.
+  #
+  def password_clean
+    crypted_password.decrypt(salt)
+  end
+
+  ##
+  # This method is used for retrive the first record by id without raise errors if not found.
+  #
+  def self.find_by_id(id)
+    id_array = self.by_id :key => id
+    id_array[0]
+  end
+
+  private
+    def generate_password
+      return if password.blank?
+      self.salt = Digest::SHA1.hexdigest("--#{Time.now.to_s}--#{email}--") if new_record?
+      self.crypted_password = password.encrypt(self.salt)
+    end
+
+    def password_required
+      crypted_password.blank? || !password.blank?
+    end
+
+    def email_is_unique
+      Account.by_email(:key => self.email, :limit => 1).empty? ||
+        Account.by_email(:key => self.email, :limit => 1) == [self] ||
+        [false, "Email has already been taken"]
+    end
+end

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

@@ -0,0 +1,57 @@
+class Account < ::Sequel::Model
+
+  plugin :validation_helpers
+
+  attr_accessor :password, :password_confirmation
+
+  def validate
+    validates_presence     :email
+    validates_presence     :role
+    validates_presence     :password if password_required
+    validates_presence     :password_confirmation if password_required
+    validates_length_range 4..40, :password unless password.blank?
+    errors.add(:password_confirmation, 'must confirm password') if !password.blank? && password != password_confirmation
+    validates_length_range 3..100, :email unless email.blank?
+    validates_unique       :email unless email.blank?
+    validates_format       /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i, :email unless email.blank?
+    validates_format       /[A-Za-z]/, :role unless role.blank?
+  end
+
+  # Callbacks
+  def before_save
+    generate_password
+  end
+
+  ##
+  # This method is for authentication purpose
+  #
+  def self.authenticate(email, password)
+    account = filter(:email => email).first
+    account && account.password_clean == password ? account : nil
+  end
+
+  ##
+  # This method is used for retrive the original password.
+  #
+  def password_clean
+    crypted_password.decrypt(salt)
+  end
+
+  ##
+  # Replace AR method
+  #
+  def self.find_by_id(id)
+    filter(:id => id).first
+  end
+
+  private
+    def generate_password
+      return if password.blank?
+      self.salt = Digest::SHA1.hexdigest("--#{Time.now.to_s}--#{email}--") if new?
+      self.crypted_password = password.encrypt(self.salt)
+    end
+
+    def password_required
+      crypted_password.blank? || !password.blank?
+    end
+end

data/lib/padrino-admin/generators/templates/app/app.rb

@@ -5,13 +5,13 @@ class Admin < Padrino::Application
     #
     # set :raise_errors, true     # Show exceptions (default for development)
     # set :public, "foo/bar"      # Location for static assets (default root/public)
-    # set :sessions, false        # Enabled by default
     # set :reload, false          # Reload application files (default in development)
     # set :default_builder, "foo" # Set a custom form builder (default 'StandardFormBuilder')
     # set :locale_path, "bar"     # Set path for I18n translations (default your_app/locales)
+    # enable  :sessions           # Disabled by default
+    # disable :flash              # Disables rack-flash (enabled by default if sessions)
     # disable :padrino_helpers    # Disables padrino markup helpers (enabled by default if present)
     # disable :padrino_mailer     # Disables padrino mailer (enabled by default if present)
-    # disable :flash              # Disables rack-flash (enabled by default)
     # enable  :authentication     # Enable padrino-admin authentication (disabled by default)
     # layout  :my_layout          # Layout can be in views/layouts/foo.ext or views/foo.ext (default :application)
     #

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

@@ -3,7 +3,7 @@
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <title><%= options[:name] %></title>
-  <%%= stylesheet_link_tag :base, :override, "themes/<%= options[:theme] %>/style" %>
+  <%%= stylesheet_link_tag :base, "themes/<%= options[:theme] %>/style" %>
 </head>
 <body>
   <div id="container">

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

@@ -3,7 +3,7 @@
   %head
     %meta{:content => "text/html; charset=utf-8", "http-equiv" => "Content-Type"}
     %title <%= options[:name] %>
-    =stylesheet_link_tag :base, :override, "themes/<%= options[:theme] %>/style"
+    =stylesheet_link_tag :base, "themes/<%= options[:theme] %>/style"
   %body
     #container
       #box

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

@@ -12,7 +12,7 @@ Admin.controllers :<%= @orm.name_plural %> do
 
   post :create do
     @<%= @orm.name_singular %> = <%= @orm.build("params[:#{@orm.name_singular}]") %>
-    if @<%= @orm.save %>
+    if <%= @orm.save %>
       flash[:notice] = '<%= @orm.klass_name %> was successfully created.'
       redirect url(:<%= @orm.name_plural %>, :edit, :id => @<%= @orm.name_singular%>.id)
     else
@@ -27,7 +27,7 @@ Admin.controllers :<%= @orm.name_plural %> do
 
   put :update, :with => :id do
     @<%= @orm.name_singular %> = <%= @orm.find("params[:id]") %>
-    if @<%= @orm.update_attributes("params[:#{@orm.name_singular}]") %>
+    if <%= @orm.update_attributes("params[:#{@orm.name_singular}]") %>
       flash[:notice] = '<%= @orm.klass_name %> was successfully updated.'
       redirect url(:<%= @orm.name_plural %>, :edit, :id => @<%= @orm.name_singular %>.id)
     else

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

@@ -73,11 +73,8 @@ module Padrino
 
         private
           def access_denied
-            # If request a javascript we alert the user
-            if request.xhr? || content_type == :js
-              halt 401, "alert('Protected resource')"
             # If we have a login_page we redirect the user
-            elsif login_page
+            if login_page
               redirect(login_page)
             # If no match we halt with 401
             else
@@ -86,7 +83,10 @@ module Padrino
           end
 
           def login_page
-            settings.login_page rescue nil
+            login_page ||= settings.login_page rescue nil
+            return unless login_page
+            login_page = File.join(ENV['RACK_BASE_URI'].to_s, login_page) if ENV['RACK_BASE_URI']
+            login_page
           end
 
           def store_location

data/lib/padrino-admin/locale/admin/da.yml

@@ -0,0 +1,16 @@
+da:
+  padrino:
+    admin:
+      save: Gem
+      cancel: Annuller
+      list: Liste
+      edit: Rediger
+      new: Tilføj
+      show: Vis
+      delete: Slet
+      confirm: Er du sikker?
+      created_at: Oprettet
+      all: Alle
+      profile: Profil
+      settings: Indstillinger
+      logout: Log ud

data/lib/padrino-admin/locale/admin/en.yml

@@ -10,4 +10,7 @@ en:
       delete: Delete
       confirm: Are you sure?
       created_at: Created at
-      all: All
+      all: All
+      profile: Profile
+      settings: Settings
+      logout: Logout

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

@@ -0,0 +1,16 @@
+fr:
+  padrino:
+    admin:
+      save: Sauver
+      cancel: Annuler
+      list: Liste
+      edit: Editer
+      new: Nouveau
+      show: Voir
+      delete: Supprimmer
+      confirm: Etes-vous sur ?
+      created_at: Créé à
+      all: Tous
+      profile: Profile
+      settings: Paramètres
+      logout: Déconnexion

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

@@ -0,0 +1,16 @@
+pt_br:
+  padrino:
+    admin:
+      save: Salvar
+      cancel: Cancelar
+      list: Lista
+      edit: Editar
+      new: Novo
+      show: Exibir
+      delete: Excluir
+      confirm: Tem certeza?
+      created_at: Criado em
+      all: Todos
+      profile: Perfil
+      settings: Preferências
+      logout: Sair

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

@@ -0,0 +1,16 @@
+ru:
+  padrino:
+    admin:
+      save: Сохранить
+      cancel: Отмена
+      list: Список
+      edit: Изменить
+      new: Добавить
+      show: Показать
+      delete: Удалить
+      confirm: Вы уверены?
+      created_at: Добавлено
+      all: Все
+      profile: Профиль
+      settings: Настройки
+      logout: Выход

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

@@ -0,0 +1,26 @@
+da:
+  activemodel: &activemodel
+    errors:
+      messages:
+        inclusion: "findes ikke i listen"
+        exclusion: "er reserveret"
+        invalid: "er ikke gyldig"
+        confirmation: "matcher ikke gentagelse"
+        accepted: "skal accepteres"
+        empty: "må ikke være tom"
+        blank: "må ikke være blank"
+        too_long: "er for lang (maksimum er {{count}} tegn)"
+        too_short: "er for kort (minimum er {{count}} tegn)"
+        wrong_length: "har ikke den rigtige længde (skal være på {{count}} tegn)"
+        taken: "er allerede i brug"
+        not_a_number: "er ikke et tal"
+        greater_than: "skal være større end {{count}}"
+        greater_than_or_equal_to: "skal være større end eller lig {{count}}"
+        equal_to: "skal være lig {{count}}"
+        less_than: "skal være mindre end {{count}}"
+        less_than_or_equal_to: "skal være mindre end eller lig {{count}}"
+        odd: "skal være ulige"
+        even: "skal være lige"
+        record_invalid: "Valideringsfejl: {{errors}}"
+        content_type: "fileformatet er ikke understøttet"
+  activerecord: *activemodel

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

@@ -0,0 +1,26 @@
+fr:
+  activemodel: &activemodel
+    errors:
+      messages:
+        inclusion: "n'est pas inclue dans la liste"
+        exclusion: "est réservé"
+        invalid: "est invalide"
+        confirmation: "ne correspond pas a la confirmation"
+        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)"
+        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}}"
+        odd: "doit être impair"
+        even: "doit être pair"
+        record_invalid: "La validation a échoué: {{errors}}"
+        content_type: "format de fichier non pris en charge"
+  activerecord: *activemodel

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

@@ -0,0 +1,26 @@
+pt_br:
+  activemodel: &activemodel
+    errors:
+      messages:
+        inclusion: "não está incluído na lista"
+        exclusion: "está reservado"
+        invalid: "não é válido"
+        confirmation: "não coincide com a confirmação"
+        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)"
+        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}}"
+        odd: "deve ser ímpar"
+        even: "deve ser par"
+        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

@@ -0,0 +1,26 @@
+ru:
+  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/padrino-admin.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{padrino-admin}
-  s.version = "0.9.9"
+  s.version = "0.9.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Padrino Team", "Nathan Esquenazi", "Davide D'Agostino", "Arthur Chiu"]
-  s.date = %q{2010-03-29}
+  s.date = %q{2010-04-22}
   s.description = %q{Admin View for Padrino applications}
   s.email = %q{padrinorb@gmail.com}
   s.extra_rdoc_files = [
@@ -21,7 +21,6 @@ Gem::Specification.new do |s|
      "LICENSE",
      "README.rdoc",
      "Rakefile",
-     "VERSION",
      "lib/padrino-admin.rb",
      "lib/padrino-admin/access_control.rb",
      "lib/padrino-admin/generators/actions.rb",
@@ -29,10 +28,12 @@ Gem::Specification.new do |s|
      "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",
@@ -68,12 +69,20 @@ Gem::Specification.new do |s|
      "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",
@@ -94,18 +103,18 @@ Gem::Specification.new do |s|
     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.9"])
-      s.add_runtime_dependency(%q<padrino-gen>, ["= 0.9.9"])
-      s.add_runtime_dependency(%q<padrino-helpers>, ["= 0.9.9"])
+      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.9"])
-      s.add_dependency(%q<padrino-gen>, ["= 0.9.9"])
-      s.add_dependency(%q<padrino-helpers>, ["= 0.9.9"])
+      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"])
@@ -113,9 +122,9 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<webrat>, [">= 0.5.1"])
     end
   else
-    s.add_dependency(%q<padrino-core>, ["= 0.9.9"])
-    s.add_dependency(%q<padrino-gen>, ["= 0.9.9"])
-    s.add_dependency(%q<padrino-helpers>, ["= 0.9.9"])
+    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"])

data/test/generators/test_admin_app_generator.rb

@@ -1,43 +1,32 @@
 require File.expand_path(File.dirname(__FILE__) + '/../helper')
-require 'thor/group'
-require 'fakeweb'
-require 'padrino-gen/generators/actions'
-Dir[File.dirname(__FILE__) + '/generators/{components}/**/*.rb'].each { |lib| require lib }
 
 class TestAdminAppGenerator < Test::Unit::TestCase
 
   def setup
     `rm -rf /tmp/sample_project`
-    @project = Padrino::Generators::Project.dup
-    @admin   = Padrino::Generators::AdminApp.dup
   end
 
   context 'the admin app generator' do
 
     should 'fail outside app root' do
-      output = silence_logger { @admin.start(['-r=/tmp/sample_project']) }
+      output = silence_logger { generate(:admin_app, '-r=/tmp/sample_project') }
       assert_match(/not at the root/, output)
       assert_no_file_exists('/tmp/admin')
     end
 
     should 'fail if we don\'t an orm' do
-      assert_nothing_raised { silence_logger { @project.start(['sample_project', '--root=/tmp']) } }
-      assert_raise(SystemExit) { silence_logger { @admin.start(['-r=/tmp/sample_project']) } }
-    end
-
-    should 'fail if we don\'t a valid orm' do
-      assert_nothing_raised { silence_logger { @project.start(['sample_project', '--root=/tmp', '-d=sequel']) } }
-      assert_raise(SystemExit) { silence_logger { @admin.start(['-r=/tmp/sample_project']) } }
+      assert_nothing_raised { silence_logger { generate(:project, 'sample_project', '--root=/tmp') } }
+      assert_raise(SystemExit) { silence_logger { generate(:admin_app, '-r=/tmp/sample_project') } }
     end
 
     should 'fail if we don\'t a valid theme' do
-      assert_nothing_raised { silence_logger { @project.start(['sample_project', '--root=/tmp', '-d=activerecord']) } }
-      assert_raise(SystemExit) { silence_logger { @admin.start(['-r=/tmp/sample_project', '--theme=foo']) } }
+      assert_nothing_raised { silence_logger { generate(:project, 'sample_project', '--root=/tmp', '-d=activerecord') } }
+      assert_raise(SystemExit) { silence_logger { generate(:admin_app, '-r=/tmp/sample_project', '--theme=foo') } }
     end
 
     should 'correctyl generate a new padrino admin application with default renderer' do
-      assert_nothing_raised { silence_logger { @project.start(['sample_project', '--root=/tmp', '-d=activerecord']) } }
-      assert_nothing_raised { silence_logger { @admin.start(['--root=/tmp/sample_project']) } }
+      assert_nothing_raised { silence_logger { generate(:project, 'sample_project', '--root=/tmp', '-d=activerecord') } }
+      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')
       assert_file_exists('/tmp/sample_project/admin/app.rb')
@@ -66,8 +55,8 @@ class TestAdminAppGenerator < Test::Unit::TestCase
     end
 
     should 'correctyl generate a new padrino admin application with erb renderer' do
-      assert_nothing_raised { silence_logger { @project.start(['sample_project', '--root=/tmp', '-d=activerecord', '-e=erb']) } }
-      assert_nothing_raised { silence_logger { @admin.start(['--root=/tmp/sample_project']) } }
+      assert_nothing_raised { silence_logger { generate(:project, 'sample_project', '--root=/tmp', '-d=activerecord', '-e=erb') } }
+      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')
       assert_file_exists('/tmp/sample_project/admin/app.rb')
@@ -95,4 +84,4 @@ class TestAdminAppGenerator < Test::Unit::TestCase
       assert_match_in_file 'role.project_module :accounts, "/accounts"', '/tmp/sample_project/admin/app.rb'
     end
   end
-end
+end

data/test/generators/test_admin_page_generator.rb

@@ -1,8 +1,4 @@
 require File.expand_path(File.dirname(__FILE__) + '/../helper')
-require 'thor/group'
-require 'fakeweb'
-require 'padrino-gen/generators/actions'
-Dir[File.dirname(__FILE__) + '/generators/{components}/**/*.rb'].each { |lib| require lib }
 
 class Person
   def self.properties
@@ -20,31 +16,27 @@ class TestAdminPageGenerator < Test::Unit::TestCase
 
   def setup
     `rm -rf /tmp/sample_project`
-    @project = Padrino::Generators::Project.dup
-    @admin   = Padrino::Generators::AdminApp.dup
-    @page    = Padrino::Generators::AdminPage.dup
-    @model   = Padrino::Generators::Model.dup
   end
 
   context 'the admin page generator' do
 
     should 'fail outside app root' do
-      output = silence_logger { @page.start(['foo', '-r=/tmp/sample_project']) }
+      output = silence_logger { generate(:admin_page, 'foo', '-r=/tmp/sample_project') }
       assert_match(/not at the root/, output)
       assert_no_file_exists('/tmp/admin')
     end
 
     should 'fail without argument and model' do
-      silence_logger { @project.start(['sample_project', '--root=/tmp', '-d=activerecord']) }
-      silence_logger { @admin.start(['--root=/tmp/sample_project']) }
-      assert_raise(Padrino::Admin::Generators::OrmError) { @page.start(['foo', '-r=/tmp/sample_project']) }
+      silence_logger { generate(:project, 'sample_project', '--root=/tmp', '-d=activerecord') }
+      silence_logger { generate(:admin_app, '--root=/tmp/sample_project') }
+      assert_raise(Padrino::Admin::Generators::OrmError) { generate(:admin_page, 'foo', '-r=/tmp/sample_project') }
     end
 
     should 'correctly generate a new padrino admin application default renderer' do
-      silence_logger { @project.start(['sample_project', '--root=/tmp', '-d=datamapper']) }
-      silence_logger { @admin.start(['--root=/tmp/sample_project']) }
-      silence_logger { @model.start(['person', "name:string", "age:integer", "email:string", '-root=/tmp/sample_project']) }
-      silence_logger { @page.start(['person', '--root=/tmp/sample_project']) }
+      silence_logger { generate(:project, 'sample_project', '--root=/tmp', '-d=datamapper') }
+      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') }
       assert_file_exists '/tmp/sample_project/admin/controllers/people.rb'
       assert_file_exists '/tmp/sample_project/admin/views/people/_form.haml'
       assert_file_exists '/tmp/sample_project/admin/views/people/edit.haml'
@@ -58,10 +50,10 @@ class TestAdminPageGenerator < Test::Unit::TestCase
     end
 
     should 'correctly generate a new padrino admin application with erb renderer' do
-      silence_logger { @project.start(['sample_project', '--root=/tmp', '-d=datamapper', '-e=erb']) }
-      silence_logger { @admin.start(['--root=/tmp/sample_project']) }
-      silence_logger { @model.start(['person', "name:string", "age:integer", "email:string", '-root=/tmp/sample_project']) }
-      silence_logger { @page.start(['person', '--root=/tmp/sample_project']) }
+      silence_logger { generate(:project, 'sample_project', '--root=/tmp', '-d=datamapper', '-e=erb') }
+      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') }
       assert_file_exists '/tmp/sample_project/admin/controllers/people.rb'
       assert_file_exists '/tmp/sample_project/admin/views/people/_form.erb'
       assert_file_exists '/tmp/sample_project/admin/views/people/edit.erb'
@@ -75,11 +67,11 @@ class TestAdminPageGenerator < Test::Unit::TestCase
     end
 
     should 'correctly generate a new padrino admin application with multiple models' do
-      silence_logger { @project.start(['sample_project', '--root=/tmp', '-d=datamapper']) }
-      silence_logger { @admin.start(['--root=/tmp/sample_project']) }
-      silence_logger { @model.start(['person', "name:string", "age:integer", "email:string", '-root=/tmp/sample_project']) }
-      silence_logger { @model.start(['page', "name:string", "body:string", '-root=/tmp/sample_project']) }
-      silence_logger { @page.start(['person', 'page', '--root=/tmp/sample_project']) }
+      silence_logger { generate(:project, 'sample_project', '--root=/tmp', '-d=datamapper') }
+      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') }
+      silence_logger { generate(:admin_page, 'person', 'page', '--root=/tmp/sample_project') }
       # For Person
       assert_file_exists '/tmp/sample_project/admin/controllers/people.rb'
       assert_file_exists '/tmp/sample_project/admin/views/people/_form.haml'

data/test/helper.rb

@@ -60,6 +60,11 @@ class Test::Unit::TestCase
   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)
+  end
 
   # Asserts that a file matches the pattern
   def assert_match_in_file(pattern, file)

data/test/test_admin_application.rb

@@ -15,7 +15,7 @@ class TestAdminApplication < Test::Unit::TestCase
         role.protect  "/foo"
       end
 
-      get "/foo", :respond_to => [:html, :js] do
+      get "/foo", :provides => [:html, :js] do
         "foo"
       end
 
@@ -28,9 +28,6 @@ class TestAdminApplication < Test::Unit::TestCase
     get "/foo"
     assert_equal "You don't have permission for this resource", body
 
-    get "/foo.js"
-    assert_equal "alert('Protected resource')", body
-
     get "/unauthenticated"
     assert_equal "unauthenticated", body
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 9
-  version: 0.9.9
+  - 10
+  version: 0.9.10
 platform: ruby
 authors: 
 - Padrino Team
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-29 00:00:00 -07:00
+date: 2010-04-22 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,8 +30,8 @@ dependencies:
         segments: 
         - 0
         - 9
-        - 9
-        version: 0.9.9
+        - 10
+        version: 0.9.10
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -44,8 +44,8 @@ dependencies:
         segments: 
         - 0
         - 9
-        - 9
-        version: 0.9.9
+        - 10
+        version: 0.9.10
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -58,8 +58,8 @@ dependencies:
         segments: 
         - 0
         - 9
-        - 9
-        version: 0.9.9
+        - 10
+        version: 0.9.10
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -144,7 +144,6 @@ files:
 - LICENSE
 - README.rdoc
 - Rakefile
-- VERSION
 - lib/padrino-admin.rb
 - lib/padrino-admin/access_control.rb
 - lib/padrino-admin/generators/actions.rb
@@ -152,10 +151,12 @@ files:
 - lib/padrino-admin/generators/admin_page.rb
 - lib/padrino-admin/generators/orm.rb
 - lib/padrino-admin/generators/templates/account/activerecord.rb.tt
+- lib/padrino-admin/generators/templates/account/couchrest.rb.tt
 - lib/padrino-admin/generators/templates/account/datamapper.rb.tt
 - lib/padrino-admin/generators/templates/account/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
@@ -191,12 +192,20 @@ files:
 - 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

data/VERSION

@@ -1 +0,0 @@
-0.9.9