padrino-admin 0.9.1 → 0.9.2

data/README.rdoc

@@ -2,50 +2,53 @@
 
 === Overview
 
-Padrino has a beautiful Admin, with these fatures:
+Padrino has a beautiful Admin management dashboard with these features:
 
-Orm Agnostic:: Adapters for datamapper, activerecord, mongomapper, couchdb (now only: datamapper and activerecord)
+Orm Agnostic:: Data Adapters for Datamapper, Activerecord, Mongomapper, Mongoid
+Template Agnostic:: Erb and Haml Renderer
 Authentication:: Support for Account authentication, Account Permission managment
-Scaffold:: You can simply create a new "admin interface" simply providing a Model
+Scaffold:: You can simply create a new "admin interface" by providing a Model
+Access Control:: Supports authentication and role permissions for your application
 
-=== Admin Usage
+=== Admin Dashboard Usage
 
-Create a project:
+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-gen project fun-test
-  $ cd fun-test
+Create a new project:
 
-For create the admin application:
+  $ padrino-gen project demo
+  $ cd demo
 
-  fun-test$ padrino-gen admin
+Create the admin subapplication:
 
-Now follow admin instructions so:
+  demo$ padrino-gen admin
 
-* edit your config/database.rb
-* run padrino rake dm:migrate # or ar:migrate if you use activerecord
-* run padrino rake seed
+Next, follow the admin setup steps:
 
-Your admin now is "complete", you can start your server with <tt>padrino start</tt> and point your browser to /admin!
+* configure your <tt>config/database.rb</tt> to connect to the correct data.
+* run <tt>padrino rake dm:migrate</tt> # or ar:migrate if you use activerecord
+* run <tt>padrino rake seed</tt>
 
-For create a new "scaffold" you need to provide only a Model for them like:
+Your admin panel now is ready and you can start your server with <tt>padrino start</tt> and point your browser to <tt>/admin</tt>!
 
-  fun-test$ padrino-gen model post --skip-migration # edit your post.rb model and add some fields
-  fun-test$ padrino-gen rake dm:auto:migrate
-  fun-test$ padrino-gen admin_page post
-  fun-test$ padrino start # and go to http://localhost:3000/admin
+To create a new "scaffold" you need to provide only a Model name to the command:
+
+  demo$ padrino-gen model post --skip-migration # edit your post.rb model and add some fields
+  demo$ padrino-gen rake dm:auto:migrate
+  demo$ padrino-gen admin_page post
+  demo$ padrino start # and go to http://localhost:3000/admin
   
 That's all!!
 
-=== Admin Authentication
+=== Admin Access Control
 
 Padrino Admin use a model Account for manage role, membership and permissions.
 
+For an ecommerce website, usually certain actions require permissions and authentication. This is supported
+by the admin access control features:
 
-==== Scenario Ecommerce
-
-For an ecommerce we usually deny some controllers/actions like
-
-  class MyEcommerce < Padrino::Application
+  class EcommerceSite < Padrino::Application
     enable :authentication
     enable :store_location
     set    :login_page, "/login"
@@ -59,38 +62,8 @@ For an ecommerce we usually deny some controllers/actions like
 In this example +if+ we visit urls that start with /+customer+/+orders+ or /+cart/checkout+ we will be redirected
 to our :+login_page+ "/login". Once we are correctly logged in we can visit these pages.
 
-==== Scenario Admin
-
-Suppose that you need to some actions for +admin+ accounts and others for +editors+
-
-When you generate padrino-admin will be created for you an +Account+ model that have a +role+ attribute. So:
-
-  class Admin < Padrino::Application
-    enable :authentication
-    disable :store_location
-    set :login_page, "/admin/sessions/new"
-
-    access_control.roles_for :any do |role|
-      role.protect "/"
-      role.allow "/sessions"
-    end
-
-    access_control.roles_for :admin do |role|
-      role.project_module :settings, "/settings"
-    end
-
-    access_control.roles_for :editor do |role|
-      role.project_module :posts, "/posts"
-      role.project_module :categories, "/categories"
-    end
-  end
-
-In this case we +protect+ the entire admin (all paths that start with "/") except paths that start with /+sessions+ so
-an +unauthenticated+ user can login.
-
-If we login as +admin+ (account.role == 'admin') we have access *only* to paths that start with /+settings+.
-
-If we login as +editor+ (account.role == 'editor') we have access *only* to paths that start with /+posts+ and /+categories+
+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.
 
 == Copyright
 

data/Rakefile

@@ -14,7 +14,6 @@ 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     "json_pure",       ">= 1.2.0"
     gem.add_runtime_dependency     "padrino-core",    "= #{GEM_VERSION}"
     gem.add_runtime_dependency     "padrino-gen",     "= #{GEM_VERSION}"
     gem.add_runtime_dependency     "padrino-helpers", "= #{GEM_VERSION}"

data/VERSION

@@ -1 +1 @@
-0.9.1
+0.9.2

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,middleware,utils}/*.rb'].each {|file| require file }
+Dir[File.dirname(__FILE__) + '/padrino-admin/*.rb'].each { |file| require file }
+Dir[File.dirname(__FILE__) + '/padrino-admin/{helpers,utils}/*.rb'].each { |file| require file }
 
 module Padrino
   ##

data/lib/padrino-admin/access_control.rb

@@ -13,7 +13,6 @@ module Padrino
         app.set :session_id, "_padrino_#{File.basename(Padrino.root)}_#{app.app_name}".to_sym
         app.helpers Padrino::Admin::Helpers::AuthenticationHelpers
         app.helpers Padrino::Admin::Helpers::ViewHelpers
-        app.use Padrino::Admin::Middleware::FlashMiddleware, app.session_id  # make sure that is the same of session_name in helpers
         app.before { login_required }
       end
 
@@ -52,7 +51,7 @@ module Padrino
         # Return an array of project_modules
         # 
         def project_modules(account)
-          role = account ? account.role.to_sym : :any
+          role = account.role.to_sym rescue :any
           authorizations = @authorizations.find_all { |auth| auth.roles.include?(role) }
           authorizations.collect(&:project_modules).flatten.uniq
         end
@@ -62,14 +61,15 @@ module Padrino
         # 
         def allowed?(account=nil, path=nil)
           path = "/" if path.blank?
+          role = account.role.to_sym rescue nil
           authorizations = @authorizations.find_all { |auth| auth.roles.include?(:any) }
           allowed_paths  = authorizations.collect(&:allowed).flatten.uniq
           denied_paths   = authorizations.collect(&:denied).flatten.uniq
           if account
             denied_paths.clear
-            authorizations = @authorizations.find_all { |auth| auth.roles.include?(account.role.to_sym) }
+            authorizations = @authorizations.find_all { |auth| auth.roles.include?(role) }
             allowed_paths += authorizations.collect(&:allowed).flatten.uniq
-            authorizations = @authorizations.find_all { |auth| !auth.roles.include?(account.role.to_sym) && !auth.roles.include?(:any) }
+            authorizations = @authorizations.find_all { |auth| !auth.roles.include?(role) && !auth.roles.include?(:any) }
             denied_paths  += authorizations.collect(&:allowed).flatten.uniq
             denied_paths  += authorizations.collect(&:denied).flatten.uniq
           end

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]
+          [:datamapper, :activerecord, :mongomapper, :mongoid]
         end
 
         ##

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

@@ -41,6 +41,8 @@ module Padrino
 
           self.behavior = :revoke if options[:destroy]
 
+          ext = fetch_component_choice(:renderer)
+
           directory "templates/app",     destination_root("admin")
           directory "templates/assets",  destination_root("public", "admin")
 
@@ -64,16 +66,16 @@ module Padrino
           admin_app.orm = Padrino::Admin::Generators::Orm.new(:account, orm, columns, column_fields)
           admin_app.invoke
 
-          template "templates/account/#{orm}.rb.tt",               destination_root("app", "models", "account.rb"), :force => true
-          template "templates/account/seeds.rb.tt",                destination_root("db/seeds.rb")
-          template "templates/erb/app/base/_sidebar.erb.tt",       destination_root("admin/views/base/_sidebar.erb")
-          template "templates/erb/app/base/index.erb.tt",          destination_root("admin/views/base/index.erb")
-          template "templates/erb/app/layouts/application.erb.tt", destination_root("admin/views/layouts/application.erb")
-          template "templates/erb/app/sessions/new.erb.tt",        destination_root("admin/views/sessions/new.erb")
+          template "templates/account/#{orm}.rb.tt",                     destination_root("app", "models", "account.rb"), :force => true
+          template "templates/account/seeds.rb.tt",                      destination_root("db/seeds.rb")
+          template "templates/#{ext}/app/base/_sidebar.#{ext}.tt",       destination_root("admin/views/base/_sidebar.#{ext}")
+          template "templates/#{ext}/app/base/index.#{ext}.tt",          destination_root("admin/views/base/index.#{ext}")
+          template "templates/#{ext}/app/layouts/application.#{ext}.tt", destination_root("admin/views/layouts/application.#{ext}")
+          template "templates/#{ext}/app/sessions/new.#{ext}.tt",        destination_root("admin/views/sessions/new.#{ext}")
 
           add_project_module :accounts
           append_file destination_root("config/apps.rb"),  "\nPadrino.mount(\"Admin\").to(\"/admin\")"
-          gsub_file destination_root("admin/views/accounts/_form.erb"), "f.text_field :role, :class => :text_field", "f.select :role, :options => access_control.roles"
+          gsub_file destination_root("admin/views/accounts/_form.#{ext}"), "f.text_field :role, :class => :text_field", "f.select :role, :options => access_control.roles"
 
           return if self.behavior == :revoke
           say (<<-TEXT).gsub(/ {10}/,'')

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

@@ -31,12 +31,13 @@ module Padrino
         if in_app_root?
           @orm ||= Padrino::Admin::Generators::Orm.new(model, adapter)
           self.behavior = :revoke if options[:destroy]
+          ext = fetch_component_choice(:renderer)
 
-          template "templates/page/controller.rb.tt",    destination_root("/admin/controllers/#{@orm.name_plural}.rb")
-          template "templates/erb/page/_form.erb.tt",    destination_root("/admin/views/#{@orm.name_plural}/_form.erb")
-          template "templates/erb/page/edit.erb.tt",     destination_root("/admin/views/#{@orm.name_plural}/edit.erb")
-          template "templates/erb/page/index.erb.tt",    destination_root("/admin/views/#{@orm.name_plural}/index.erb")
-          template "templates/erb/page/new.erb.tt",      destination_root("/admin/views/#{@orm.name_plural}/new.erb")
+          template "templates/page/controller.rb.tt",       destination_root("/admin/controllers/#{@orm.name_plural}.rb")
+          template "templates/#{ext}/page/_form.#{ext}.tt", destination_root("/admin/views/#{@orm.name_plural}/_form.#{ext}")
+          template "templates/#{ext}/page/edit.#{ext}.tt",  destination_root("/admin/views/#{@orm.name_plural}/edit.#{ext}")
+          template "templates/#{ext}/page/index.#{ext}.tt", destination_root("/admin/views/#{@orm.name_plural}/index.#{ext}")
+          template "templates/#{ext}/page/new.#{ext}.tt",   destination_root("/admin/views/#{@orm.name_plural}/new.#{ext}")
 
           add_project_module(@orm.name_plural)
         else

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

@@ -31,6 +31,8 @@ module Padrino
           @columns ||= case orm
             when :activerecord then @klass.columns
             when :datamapper   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
             else raise OrmError, "Adapter #{orm} not yet supported!"
           end
         end
@@ -50,7 +52,7 @@ module Padrino
 
         def find(params=nil)
           case orm
-            when :activerecord then "#{klass_name}.find(#{params})"
+            when :activerecord, :mongomapper, :mongoid then "#{klass_name}.find(#{params})"
             when :datamapper   then "#{klass_name}.get(#{params})"
             else raise OrmError, "Adapter #{orm} not yet supported!"
           end
@@ -70,7 +72,7 @@ module Padrino
 
         def update_attributes(params=nil)
           case orm
-            when :activerecord then "#{name_singular}.update_attributes(#{params})"
+            when :activerecord, :mongomapper, :mongoid then "#{name_singular}.update_attributes(#{params})"
             when :datamapper   then "#{name_singular}.update(#{params})"
             else raise OrmError, "Adapter #{orm} not yet supported!"
           end

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

@@ -16,7 +16,7 @@ class Account < ActiveRecord::Base
   before_save :generate_password
 
   ##
-  # This method it's for authentication purpose
+  # This method is for authentication purpose
   # 
   def self.authenticate(email, password)
     account = first(:conditions => { :email => email }) if email.present?
@@ -24,7 +24,7 @@ class Account < ActiveRecord::Base
   end
 
   ##
-  # This method it's used for retrive the original password.
+  # This method is used for retrive the original password.
   # 
   def password_clean
     crypted_password.decrypt(salt)

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

@@ -27,7 +27,7 @@ class Account
   before :save, :generate_password
 
   ##
-  # This method it's for authentication purpose
+  # This method is for authentication purpose
   # 
   def self.authenticate(email, password)
     account = first(:conditions => { :email => email }) if email.present?
@@ -35,7 +35,14 @@ class Account
   end
 
   ##
-  # This method it's used for retrive the original password.
+  # This method is used from AuthenticationHelper
+  #
+  def self.find_by_id(id)
+    get(id) rescue nil
+  end
+
+  ##
+  # This method is used for retrive the original password.
   # 
   def password_clean
     crypted_password.decrypt(salt)

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

@@ -0,0 +1,59 @@
+class Account
+  include Mongoid::Document
+  attr_accessor :password
+
+  # Fields
+  field :name,             :type => String
+  field :surname,          :type => String
+  field :email,            :type => String
+  field :crypted_password, :type => String
+  field :salt,             :type => String
+  field :role,             :type => String
+
+  # 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_uniqueness_of   :email
+  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)
+    account = first(:conditions => { :email => email }) if email.present?
+    account && account.password_clean == password ? account : nil
+  end
+
+  ##
+  # This method is used from AuthenticationHelper
+  #
+  def self.find_by_id(id)
+    find(id) rescue nil
+  end
+
+  ##
+  # This method is used for retrive the original password.
+  # 
+  def password_clean
+    crypted_password.decrypt(salt)
+  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
+end

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

@@ -0,0 +1,52 @@
+class Account
+  include MongoMapper::Document
+  attr_accessor :password
+
+  # Keys
+  key :name,             String
+  key :surname,          String
+  key :email,            String
+  key :crypted_password, String
+  key :salt,             String
+  key :role,             String
+
+  # 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_uniqueness_of   :email,    :case_sensitive => false
+  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)
+    account = first(:email => email) if email.present?
+    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
+
+  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
+end

data/lib/padrino-admin/generators/templates/erb/app/base/_sidebar.erb.tt

@@ -7,7 +7,7 @@
 <div class="block">
   <h3>Links</h3>
   <ul class="navigation">
-    <li><a href="#">Link 1</a></li>
-    <li><a href="#">Link 2</a></li>
+    <li><%%= link_to "Link 1" %></li>
+    <li><%%= link_to "Link 1" %></li>
   </ul>
 </div>

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

@@ -1,9 +1,9 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
 <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" %>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <title><%= options[:name] %></title>
+  <%%= stylesheet_link_tag :base, :override, "themes/<%= options[:theme] %>/style" %>
 </head>
 <body>
   <div id="container">

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

@@ -34,7 +34,7 @@
             </div>
             <div class="group navform wat-cf">
               <div class="right">
-                <input type="submit" class="button" value="Sign in" />
+                <%%= submit_tag "Sign in", :class => :button %>
               </div>
             </div>            
           <%% end %>

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

@@ -7,5 +7,5 @@
 <% end %>
 <div class="group navform wat-cf">
   <%%= f.submit pat(:save), :class => :button %>
-  <%%= f.submit pat(:cancel), :onclick => "window.location='#{url(:accounts, :index)}';return false", :class => :button %>
+  <%%= f.submit pat(:cancel), :onclick => "window.location='#{url(:<%= @orm.name_plural %>, :index)}';return false", :class => :button %>
 </div>

data/lib/padrino-admin/generators/templates/haml/app/base/_sidebar.haml.tt

@@ -0,0 +1,11 @@
+.block
+  %h3 Simple Block
+  .content
+    %p
+      Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. 
+      Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
+.block
+  %h3 Links
+  %ul.navigation
+    %li=link_to "Link 1"
+    %li=link_to "Link 2"

data/lib/padrino-admin/generators/templates/haml/app/base/index.haml.tt

@@ -0,0 +1,25 @@
+#block-text.block
+  .content
+    %h2.title Dashboard
+    .inner
+      %p.first
+        Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. 
+        Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. 
+        Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
+        %span.hightlight
+          Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+      %p
+        %span.small
+          Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore
+      %p
+        %span.gray
+          Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore
+      %hr
+      %p
+        Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. 
+        Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. 
+        Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
+        %span.hightlight
+          Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+
+-content_for :sidebar, partial("base/sidebar")

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

@@ -0,0 +1,31 @@
+!!! Strict
+%html{:lang => "en", :xmlns => "http://www.w3.org/1999/xhtml"}
+  %head
+    %meta{:content => "text/html; charset=utf-8", "http-equiv" => "Content-Type"}
+    %title <%= options[:name] %>
+    =stylesheet_link_tag :base, :override, "themes/<%= options[:theme] %>/style"
+  %body
+    #container
+      #header
+        %h1=link_to "<%= options[:name] %>", url(:base_index)
+        #user-navigation
+          %ul.wat-cf
+            %li=link_to pat(:profile), url(:accounts, :edit, :id => current_account.id)
+            %li=link_to pat(:logout), url(:sessions, :destroy), :method => :delete
+        #main-navigation
+          %ul.wat-cf
+            -project_modules.each do |project_module|
+              %li{:class => ("active" if request.path_info =~ /^#{project_module.path}/)}
+                =link_to project_module.human_name, project_module.path("/admin")
+      #wrapper.wat-cf
+        .flash=[:error, :warning, :notice].map { |type| flash_tag(type, :class => "message #{type}") }.join
+        #main
+          =yield
+          #footer
+            .block
+              %p
+                Copyright © 
+                =Time.now.year
+                Your Site - Powered by
+                =link_to "Padrino v.#{Padrino.version}", "http://padrino.github.com", :target => :_blank
+        #sidebar=yield_content :sidebar

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

@@ -0,0 +1,25 @@
+!!! Strict
+%html{:lang => "en", :xmlns => "http://www.w3.org/1999/xhtml"}
+  %head
+    %meta{:content => "text/html; charset=utf-8", "http-equiv" => "Content-Type"}
+    %title <%= options[:name] %>
+    =stylesheet_link_tag :base, :override, "themes/<%= options[:theme] %>/style"
+  %body
+    #container
+      #box
+        %h1 <%= options[:name] %>
+        #block-login.block
+          %h2 Login Box
+          .content.login
+            .flash=[:error, :warning, :notice].map { |type| flash_tag(type, :class => "message #{type}") }.join
+            -form_tag(url(:sessions, :create), :class => 'form login') do
+              .group.wat-cf
+                .left
+                  %label.label.right Login
+                .right=text_field_tag :email, :value => params[:email], :class => :text_field
+              .group.wat-cf
+                .left
+                  %label.label.right Password
+                .right=password_field_tag :password, :value => params[:password], :class => :text_field
+              .group.navform.wat-cf
+                .right=submit_tag('Sign In', :class => :button)

data/lib/padrino-admin/generators/templates/haml/page/_form.haml.tt

@@ -0,0 +1,12 @@
+<%- @orm.column_fields.each do |column| -%>
+.group
+  =f.label :<%= column[:name] %>
+  =f.error_message_on :<%= column[:name] %>
+  =f.<%= column[:field_type] %> :<%= column[:name] %>, :class => :<%= column[:field_type] %>
+  %span.description Ex: a simple text
+
+<%- end -%>
+
+.group.navform.wat-cf
+  =f.submit pat(:save), :class => :button
+  =f.submit pat(:cancel), :onclick => "window.location='#{url(:<%= @orm.name_plural %>, :index)}';return false", :class => :button

data/lib/padrino-admin/generators/templates/haml/page/edit.haml.tt

@@ -0,0 +1,15 @@
+.block
+  .secondary-navigation
+    %ul.wat-cf
+      %li.first=link_to pat(:list), url(:<%= @orm.name_plural %>, :index)
+      %li=link_to pat(:new), url(:<%= @orm.name_plural %>, :new)
+      %li.active=link_to pat(:edit), url(:<%= @orm.name_plural %>, :edit, :id => @<%= @orm.name_singular %>.id)
+  .content
+    %h2.title
+      =pat(:edit)
+      =mt(:<%= @orm.name_singular %>)
+    .inner
+      -form_for :<%= @orm.name_singular %>, url(:<%= @orm.name_plural %>, :update, :id => @<%= @orm.name_singular %>.id), :method => :put, :class => :form do |f|
+        =partial "<%= @orm.name_plural %>/form", :locals => { :f => f }
+
+-content_for :sidebar, partial("base/sidebar")

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

@@ -0,0 +1,29 @@
+.block
+  .secondary-navigation
+    %ul.wat-cf
+      %li.first.active=link_to pat(:list), url(:<%= @orm.name_plural %>, :index)
+      %li=link_to pat(:new), url(:<%= @orm.name_plural %>, :new)
+  .content
+    %h2.title
+      =pat(:all)
+      =mt(:<%= @orm.name_singular %>)
+    .inner
+      %table.table
+        %tr
+          <%- @orm.columns.each_with_index do |column, i| -%>
+          %th<%= ".first" if i==0 %>=mat(:<%= @orm.name_singular %>, :<%= column.name %>)
+          <%- end -%>
+          %th.last="&nbsp;"
+        -@<%= @orm.name_plural %>.each do |<%= @orm.name_singular %>|
+          %tr
+            <%- @orm.columns.each_with_index do |column, i| -%>
+            %td<%= ".first" if i==0 %>=link_to <%= @orm.name_singular %>.<%= column.name %>, url(:<%= @orm.name_plural %>, :edit, :id => <%= @orm.name_singular %>.id)
+            <%- end -%>
+            %td.last
+              =button_to pat(:edit), url(:<%= @orm.name_plural %>, :edit, :id => <%= @orm.name_singular %>.id), :method => :get, :class => :button_to 
+              ="|"
+              =button_to pat(:delete), url(:<%= @orm.name_plural %>, :destroy, :id => <%= @orm.name_singular %>.id), :method => :delete, :class => :button_to
+      .actions-bar.wat-cf
+        .actions="&nbsp;"
+
+-content_for :sidebar, partial("base/sidebar")

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

@@ -0,0 +1,14 @@
+.block
+  .secondary-navigation
+    %ul.wat-cf
+      %li.first=link_to pat(:list), url(:<%= @orm.name_plural %>, :index)
+      %li.active=link_to pat(:new), url(:<%= @orm.name_plural %>, :new)
+  .content
+    %h2.title
+      =pat(:new)
+      =mt(:<%= @orm.name_singular %>)
+    .inner
+      -form_for :<%= @orm.name_singular %>, url(:<%= @orm.name_plural %>, :create), :class => :form do |f|
+        =partial "<%= @orm.name_plural %>/form", :locals => { :f => f }
+
+-content_for :sidebar, partial("base/sidebar")

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

@@ -94,7 +94,7 @@ module Padrino
           end
 
           def login_from_session
-            Account.first(:conditions => { :id => session[options.session_id] }) if defined?(Account)
+            Account.find_by_id(session[options.session_id]) if defined?(Account)
           end
       end # AuthenticationHelpers
     end # Helpers

data/padrino-admin.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{padrino-admin}
-  s.version = "0.9.1"
+  s.version = "0.9.2"
 
   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-02-23}
+  s.date = %q{2010-03-01}
   s.description = %q{Admin View for Padrino applications}
   s.email = %q{padrinorb@gmail.com}
   s.extra_rdoc_files = [
@@ -30,6 +30,8 @@ Gem::Specification.new do |s|
      "lib/padrino-admin/generators/orm.rb",
      "lib/padrino-admin/generators/templates/account/activerecord.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/app/app.rb",
      "lib/padrino-admin/generators/templates/app/controllers/base.rb",
@@ -55,6 +57,14 @@ Gem::Specification.new do |s|
      "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",
@@ -64,7 +74,6 @@ Gem::Specification.new do |s|
      "lib/padrino-admin/locale/orm/de.yml",
      "lib/padrino-admin/locale/orm/en.yml",
      "lib/padrino-admin/locale/orm/it.yml",
-     "lib/padrino-admin/middleware/flash_middleware.rb",
      "lib/padrino-admin/utils/crypt.rb",
      "padrino-admin.gemspec",
      "test/fixtures/data_mapper.rb",
@@ -77,7 +86,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{padrino-admin}
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{Admin Dashboard for Padrino}
 
   if s.respond_to? :specification_version then
@@ -85,20 +94,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<json_pure>, [">= 1.2.0"])
-      s.add_runtime_dependency(%q<padrino-core>, ["= 0.9.1"])
-      s.add_runtime_dependency(%q<padrino-gen>, ["= 0.9.1"])
-      s.add_runtime_dependency(%q<padrino-helpers>, ["= 0.9.1"])
+      s.add_runtime_dependency(%q<padrino-core>, ["= 0.9.2"])
+      s.add_runtime_dependency(%q<padrino-gen>, ["= 0.9.2"])
+      s.add_runtime_dependency(%q<padrino-helpers>, ["= 0.9.2"])
       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<json_pure>, [">= 1.2.0"])
-      s.add_dependency(%q<padrino-core>, ["= 0.9.1"])
-      s.add_dependency(%q<padrino-gen>, ["= 0.9.1"])
-      s.add_dependency(%q<padrino-helpers>, ["= 0.9.1"])
+      s.add_dependency(%q<padrino-core>, ["= 0.9.2"])
+      s.add_dependency(%q<padrino-gen>, ["= 0.9.2"])
+      s.add_dependency(%q<padrino-helpers>, ["= 0.9.2"])
       s.add_dependency(%q<haml>, [">= 2.2.1"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<mocha>, [">= 0.9.7"])
@@ -106,10 +113,9 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<webrat>, [">= 0.5.1"])
     end
   else
-    s.add_dependency(%q<json_pure>, [">= 1.2.0"])
-    s.add_dependency(%q<padrino-core>, ["= 0.9.1"])
-    s.add_dependency(%q<padrino-gen>, ["= 0.9.1"])
-    s.add_dependency(%q<padrino-helpers>, ["= 0.9.1"])
+    s.add_dependency(%q<padrino-core>, ["= 0.9.2"])
+    s.add_dependency(%q<padrino-gen>, ["= 0.9.2"])
+    s.add_dependency(%q<padrino-helpers>, ["= 0.9.2"])
     s.add_dependency(%q<haml>, [">= 2.2.1"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<mocha>, [">= 0.9.7"])

data/test/fixtures/data_mapper.rb

@@ -53,6 +53,13 @@ class Account
     account && account.password_clean == password ? account : nil
   end
 
+  ##
+  # This method is used from AuthenticationHelper
+  #
+  def self.find_by_id(id)
+    get(id)
+  end
+
   ##
   # This method it's used for retrive the original password.
   # 

data/test/generators/test_admin_app_generator.rb

@@ -35,7 +35,7 @@ class TestAdminAppGenerator < Test::Unit::TestCase
       assert_raise(SystemExit) { silence_logger { @admin.start(['-r=/tmp/sample_project', '--theme=foo']) } }
     end
 
-    should 'correctyl generate a new padrino admin application' do
+    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_file_exists('/tmp/sample_project')
@@ -46,6 +46,36 @@ class TestAdminAppGenerator < Test::Unit::TestCase
       assert_file_exists('/tmp/sample_project/admin/controllers/base.rb')
       assert_file_exists('/tmp/sample_project/admin/controllers/sessions.rb')
       assert_file_exists('/tmp/sample_project/admin/views')
+      assert_file_exists('/tmp/sample_project/admin/views/accounts/_form.haml')
+      assert_file_exists('/tmp/sample_project/admin/views/accounts/edit.haml')
+      assert_file_exists('/tmp/sample_project/admin/views/accounts/index.haml')
+      assert_file_exists('/tmp/sample_project/admin/views/accounts/new.haml')
+      assert_file_exists('/tmp/sample_project/admin/views/base/index.haml')
+      assert_file_exists('/tmp/sample_project/admin/views/sessions/new.haml')
+      assert_file_exists('/tmp/sample_project/admin/views/base/_sidebar.haml')
+      assert_file_exists('/tmp/sample_project/admin/views/base/index.haml')
+      assert_file_exists('/tmp/sample_project/admin/views/layouts/application.haml')
+      assert_file_exists('/tmp/sample_project/admin/views/sessions/new.haml')
+      assert_file_exists('/tmp/sample_project/public/admin')
+      assert_file_exists('/tmp/sample_project/public/admin/stylesheets')
+      assert_file_exists('/tmp/sample_project/app/models/account.rb')
+      assert_file_exists('/tmp/sample_project/db/seeds.rb')
+      assert_match_in_file 'Padrino.mount("Admin").to("/admin")', '/tmp/sample_project/config/apps.rb'
+      assert_match_in_file 'class Admin < Padrino::Application', '/tmp/sample_project/admin/app.rb'
+      assert_match_in_file 'role.project_module :accounts, "/accounts"', '/tmp/sample_project/admin/app.rb'
+    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_file_exists('/tmp/sample_project')
+      assert_file_exists('/tmp/sample_project/admin')
+      assert_file_exists('/tmp/sample_project/admin/app.rb')
+      assert_file_exists('/tmp/sample_project/admin/controllers')
+      assert_file_exists('/tmp/sample_project/admin/controllers/accounts.rb')
+      assert_file_exists('/tmp/sample_project/admin/controllers/base.rb')
+      assert_file_exists('/tmp/sample_project/admin/controllers/sessions.rb')
+      assert_file_exists('/tmp/sample_project/admin/views')
       assert_file_exists('/tmp/sample_project/admin/views/accounts/_form.erb')
       assert_file_exists('/tmp/sample_project/admin/views/accounts/edit.erb')
       assert_file_exists('/tmp/sample_project/admin/views/accounts/index.erb')

data/test/generators/test_admin_page_generator.rb

@@ -34,13 +34,31 @@ class TestAdminPageGenerator < Test::Unit::TestCase
       assert_raise(Padrino::Admin::Generators::OrmError) { @page.start(['foo', '-r=/tmp/sample_project']) }
     end
 
-    should 'correctyl generate a new padrino admin application' do
+    should 'correctyl generate a new padrino admin application default renderer' do
       'Person'.classify.constantize
       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']) }
       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'
+      assert_file_exists '/tmp/sample_project/admin/views/people/index.haml'
+      assert_file_exists '/tmp/sample_project/admin/views/people/new.haml'
+      %w(name age email).each do |field|
+        assert_match_in_file "label :#{field}", '/tmp/sample_project/admin/views/people/_form.haml'
+        assert_match_in_file "text_field :#{field}", '/tmp/sample_project/admin/views/people/_form.haml'
+      end
+      assert_match_in_file 'role.project_module :people, "/people"', '/tmp/sample_project/admin/app.rb'
+    end
+
+    should 'correctyl generate a new padrino admin application with erb renderer' do
+      'Person'.classify.constantize
+      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']) }
+      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'
       assert_file_exists '/tmp/sample_project/admin/views/people/index.erb'

data/test/helper.rb

@@ -19,7 +19,7 @@ end
 require 'padrino-core/support_lite'
 require 'padrino-admin'
 
-Padrino::Generators.lockup!
+Padrino::Generators.load_components!
 
 module Kernel
   # Silences the output by redirecting to stringIO

data/test/test_admin_application.rb

@@ -246,28 +246,4 @@ class TestAdminApplication < Test::Unit::TestCase
     get "/modules"
     assert_equal "admin => /admin", body
   end
-
-  should 'use correclty flash middleware' do
-    mock_app do
-      use Padrino::Admin::Middleware::FlashMiddleware, :session_id
-
-      get "/set_session_id" do
-        params[:session_id]
-      end
-
-      get "/get_session_id" do
-        session[:session_id]
-      end
-    end
-
-    get "/set_session_id", { :session_id => 24 }, 'HTTP_USER_AGENT' => 'Adobe Flash'
-    assert_equal "24", body
-
-    # TODO: inspect why this fail on Ruby 1.9.1
-    unless RUBY_VERSION >= '1.9'
-      get "/get_session_id"
-      assert_equal "24", body
-    end
-  end
-
 end

metadata

@@ -1,12 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-admin
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 9
-  - 1
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors: 
 - Padrino Team
@@ -17,133 +12,89 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-23 00:00:00 -08:00
+date: 2010-03-01 00:00:00 +01:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: json_pure
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 2
-        - 0
-        version: 1.2.0
-  type: :runtime
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: padrino-core
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        - 1
-        version: 0.9.1
-  type: :runtime
-  version_requirements: *id002
+        version: 0.9.2
+    version: 
 - !ruby/object:Gem::Dependency 
   name: padrino-gen
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        - 1
-        version: 0.9.1
-  type: :runtime
-  version_requirements: *id003
+        version: 0.9.2
+    version: 
 - !ruby/object:Gem::Dependency 
   name: padrino-helpers
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        - 1
-        version: 0.9.1
-  type: :runtime
-  version_requirements: *id004
+        version: 0.9.2
+    version: 
 - !ruby/object:Gem::Dependency 
   name: haml
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 2
-        - 1
         version: 2.2.1
-  type: :development
-  version_requirements: *id005
+    version: 
 - !ruby/object:Gem::Dependency 
   name: shoulda
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
-  type: :development
-  version_requirements: *id006
+    version: 
 - !ruby/object:Gem::Dependency 
   name: mocha
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        - 7
         version: 0.9.7
-  type: :development
-  version_requirements: *id007
+    version: 
 - !ruby/object:Gem::Dependency 
   name: rack-test
-  prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 5
-        - 0
         version: 0.5.0
-  type: :development
-  version_requirements: *id008
+    version: 
 - !ruby/object:Gem::Dependency 
   name: webrat
-  prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 5
-        - 1
         version: 0.5.1
-  type: :development
-  version_requirements: *id009
+    version: 
 description: Admin View for Padrino applications
 email: padrinorb@gmail.com
 executables: []
@@ -167,6 +118,8 @@ files:
 - lib/padrino-admin/generators/orm.rb
 - lib/padrino-admin/generators/templates/account/activerecord.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/app/app.rb
 - lib/padrino-admin/generators/templates/app/controllers/base.rb
@@ -192,6 +145,14 @@ files:
 - 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
@@ -201,7 +162,6 @@ files:
 - lib/padrino-admin/locale/orm/de.yml
 - lib/padrino-admin/locale/orm/en.yml
 - lib/padrino-admin/locale/orm/it.yml
-- lib/padrino-admin/middleware/flash_middleware.rb
 - lib/padrino-admin/utils/crypt.rb
 - padrino-admin.gemspec
 - test/fixtures/data_mapper.rb
@@ -222,20 +182,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 requirements: []
 
 rubyforge_project: padrino-admin
-rubygems_version: 1.3.6
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Admin Dashboard for Padrino

data/lib/padrino-admin/middleware/flash_middleware.rb

@@ -1,30 +0,0 @@
-require 'rack/utils'
-
-module Padrino
-  module Admin
-    module Middleware
-      ##
-      # FlashMiddleware help you passing your session in the URI, when it should be in the cookie.
-      # 
-      # This code it's only performed when:
-      # 
-      #   env['HTTP_USER_AGENT'] =~ /^(Adobe|Shockwave) Flash/
-      # 
-      class FlashMiddleware
-        def initialize(app, session_key = 'session_id')
-          @app = app
-          @session_key = session_key.to_s
-        end
-
-        def call(env)
-          if env['HTTP_USER_AGENT'] =~ /^(Adobe|Shockwave) Flash/
-            params = ::Rack::Request.new(env).params
-            env['rack.session'] ||= {}
-            env['rack.session'][@session_key.to_sym] = params[@session_key] if params[@session_key].present?
-          end
-          @app.call(env)
-        end
-      end
-    end
-  end
-end