padrino-admin 0.9.24 → 0.9.25

data/README.rdoc

@@ -5,7 +5,7 @@
 Padrino has a beautiful Admin management dashboard with these features:
 
 Orm Agnostic:: Data Adapters for Datamapper, Activerecord, Sequel, Mongomapper, Mongoid, Couchrest
-Template Agnostic:: Erb and Haml Renderer
+Template Agnostic:: Erb, Erubis and Haml Renderer
 Authentication:: Support for Account authentication, Account Permission managment
 Scaffold:: You can simply create a new "admin interface" by providing a Model
 Access Control:: Supports authentication and role permissions for your application

data/lib/padrino-admin/access_control.rb

@@ -52,7 +52,7 @@ module Padrino
         def project_modules(account)
           role = account.role.to_sym rescue :any
           authorizations = @authorizations.find_all { |auth| auth.roles.include?(role) }
-          authorizations.collect(&:project_modules).flatten.uniq
+          authorizations.map(&:project_modules).flatten.uniq
         end
 
         ##
@@ -62,15 +62,15 @@ module Padrino
           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
+          allowed_paths  = authorizations.map(&:allowed).flatten.uniq
+          denied_paths   = authorizations.map(&:denied).flatten.uniq
           if account
             denied_paths.clear
             authorizations = @authorizations.find_all { |auth| auth.roles.include?(role) }
-            allowed_paths += authorizations.collect(&:allowed).flatten.uniq
+            allowed_paths += authorizations.map(&:allowed).flatten.uniq
             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
+            denied_paths  += authorizations.map(&:allowed).flatten.uniq
+            denied_paths  += authorizations.map(&:denied).flatten.uniq
           end
           return true  if allowed_paths.any? { |p| path =~ /^#{p}/ }
           return false if denied_paths.any?  { |p| path =~ /^#{p}/ }

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

@@ -6,10 +6,17 @@ module Padrino
         # Tell us which orm we are using
         #
         def orm
-          fetch_component_choice(:orm).to_sym rescue :datamapper
+          fetch_component_choice(:orm).to_sym rescue :activerecord
         end
         alias :adapter :orm
 
+        ##
+        # Tell us which rendering engine you are using
+        #
+        def ext
+          fetch_component_choice(:admin_renderer).to_sym rescue :haml
+        end
+
         ##
         # Tell us for now wich orm we support
         #
@@ -17,11 +24,18 @@ module Padrino
           [:datamapper, :activerecord, :mongomapper, :mongoid, :couchrest, :sequel]
         end
 
+        ##
+        # Tell us for now wich rendering engine we support
+        #
+        def supported_ext
+          [:haml, :erb, :slim]
+        end
+
         ##
         # Add access_control permission in our app.rb
         #
         def add_project_module(controller)
-          permission = "      role.project_module :#{controller}, \"/#{controller}\"\n"
+          permission = "    role.project_module :#{controller}, \"/#{controller}\"\n"
           inject_into_file destination_root("/admin/app.rb"),  permission, :after => "access_control.roles_for :admin do |role|\n"
         end
       end # Actions

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

@@ -21,31 +21,36 @@ module Padrino
       class_option :skip_migration, :aliases => "-s", :default => false, :type => :boolean
       class_option :root, :desc => "The root destination", :aliases => '-r', :default => ".", :type => :string
       class_option :destroy, :aliases => '-d', :default => false, :type => :boolean
-      class_option :name, :desc => "The app name", :aliases => '-a', :default => "Padrino Admin", :type => :string
       class_option :theme, :desc => "Your admin theme: (#{self.themes.join(", ")})", :default => "default", :type => :string
+      class_option :renderer, :aliases => '-e', :desc => "Rendering engine (erb, haml)", :type => :string
 
       # Copies over the Padrino base admin application
       def create_admin
         self.destination_root = options[:root]
         if in_app_root?
-
           unless supported_orm.include?(orm)
-            say "<= At the moment, Padrino only supports #{supported_orm.join(" or ")}. Sorry!"
+            say "<= At the moment, Padrino only supports #{supported_orm.join(" or ")}. Sorry!", :yellow
             raise SystemExit
           end
 
           unless self.class.themes.include?(options[:theme])
-            say "<= You need to choose a theme from: #{self.class.themes.join(", ")}"
+            say "<= You need to choose a theme from: #{self.class.themes.join(", ")}", :yellow
             raise SystemExit
           end
 
-          self.behavior = :revoke if options[:destroy]
+          tmp_ext = options[:renderer] || fetch_component_choice(:renderer)
+          unless supported_ext.include?(tmp_ext.to_sym)
+            say "<= Your are using '#{tmp_ext}' and for admin we only support '#{supported_ext.join(', ')}'. Please use -e haml or -e erb or -e slim", :yellow
+            raise SystemExit
+          end
+          store_component_choice(:admin_renderer, tmp_ext)
 
-          ext = fetch_component_choice(:renderer)
+          self.behavior = :revoke if options[:destroy]
 
           empty_directory destination_root("admin")
-          directory "templates/app",     destination_root("admin")
-          directory "templates/assets",  destination_root("public", "admin")
+          directory "templates/app",       destination_root("admin")
+          directory "templates/assets",    destination_root("public", "admin")
+          template  "templates/app.rb.tt", destination_root("admin/app.rb")
 
           account_params = [
             "account", "name:string", "surname:string", "email:string", "crypted_password:string", "role:string",
@@ -56,9 +61,6 @@ module Padrino
           account_params << "-d" if options[:destroy]
 
           Padrino::Generators::Model.start(account_params)
-          # Can't add this through model generator as it does not have /admin loaded yet
-          # so run it and remove it and copy admin version over to admin path.
-          remove_file destination_root('app','models','account.rb')
           column = Struct.new(:name, :type)
           columns = [:id, :name, :surname, :email].map { |col| column.new(col) }
           column_fields = [
@@ -74,12 +76,12 @@ module Padrino
           admin_app.default_orm = Padrino::Admin::Generators::Orm.new(:account, orm, columns, column_fields)
           admin_app.invoke_all
 
-          template "templates/account/#{orm}.rb.tt",                     destination_root("admin", "models", "account.rb"), :force => true
+          template "templates/account/#{orm}.rb.tt", destination_root("app", "models", "account.rb"), :force => true
 
           if File.exist?(destination_root("db/seeds.rb"))
             append_file(destination_root("db/seeds.rb")) { "\n\n" + File.read(self.class.source_root+"/templates/account/seeds.rb.tt") }
           else
-            template "templates/account/seeds.rb.tt",                    destination_root("db/seeds.rb")
+            template "templates/account/seeds.rb.tt", destination_root("db/seeds.rb")
           end
 
           empty_directory destination_root("admin/controllers")

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

@@ -32,8 +32,6 @@ module Padrino
           models.each do |model|
             @orm = default_orm || Padrino::Admin::Generators::Orm.new(model, adapter)
             self.behavior = :revoke if options[:destroy]
-            ext = fetch_component_choice(:renderer)
-
             empty_directory destination_root("/admin/views/#{@orm.name_plural}")
 
             template "templates/page/controller.rb.tt",       destination_root("/admin/controllers/#{@orm.name_plural}.rb")

data/lib/padrino-admin/generators/templates/{app/app.rb → app.rb.tt}

@@ -6,16 +6,17 @@ class Admin < Padrino::Application
   ##
   # Application configuration options
   #
-  # set :raise_errors, true     # Show exceptions (default for development)
+  # set :raise_errors, true     # Raise exceptions (will stop application) (default true for development)
+  # set :show_exceptions, true  # Show a stack trace in browser (default is true)
   # set :public, "foo/bar"      # Location for static assets (default root/public)
   # 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 :sessions           # Enabled by default
   # disable :flash              # Disables rack-flash (enabled by default if sessions)
   # layout  :my_layout          # Layout can be in views/layouts/foo.ext or views/foo.ext (default :application)
   #
-
+  set :session_secret, "<%= '%x' % rand(2**255) %>"
   set :login_page, "/admin/sessions/new"
   disable :store_location
 

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

@@ -18,7 +18,7 @@ Admin.controllers :sessions do
     end
   end
 
-  get :destroy do
+  delete :destroy do
     set_current_account(nil)
     redirect url(:sessions, :new)
   end

data/lib/padrino-admin/generators/templates/assets/stylesheets/base.css

@@ -56,7 +56,7 @@ body{font-size:12px;font-family:sans-serif;}
 .table{width:100%;border-collapse:collapse;margin-bottom:15px;}
 .table th{padding:10px;font-weight:bold;text-align:left;}
 /*.table th.first{width:30px;}*/
-/*.table th.last{width:200px;}*/
+.table th.last{width:80px;}
 .table .checkbox{margin-left:10px;}
 .table td{padding:10px;}
 .table td.last{text-align:right;}
@@ -77,7 +77,8 @@ input.check_box{margin:0;padding:0;}
 .form a{color:red;font-size:14px;}
 .form input.text_field,.form input.password_field,.form textarea.text_area{width:100%;border-width:1px;border-style:solid;}
 .button_to{display:inline;}
-.button_to input{background:none;border:none;display:inline;font-size:12px;color:#A72D2E;cursor:pointer;}
+.button_to input{background:none;border:none;display:inline;font-size:12px;color:#A72D2E;cursor:pointer;font-family: helvetica, arial, sans-serif;}
+#user-navigation .button_to input{color:#FFFFFF;}
 /* lists */
 ul.list{margin:0;padding:0;list-style-type:none;}
 ul.list li{clear:left;padding-bottom:5px;}

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

@@ -2,17 +2,17 @@
 <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>
+  <title>Padrino Admin</title>
   <%%= stylesheet_link_tag :base, "themes/<%= options[:theme] %>/style" %>
 </head>
 <body>
   <div id="container">
     <div id="header">
-      <h1><%%= link_to "<%= options[:name] %>", url(:base_index) %></h1>
+      <h1><%%= link_to "Padrino Admin", url(:base_index) %></h1>
       <div id="user-navigation">
         <ul class="wat-cf">
           <li><%%= link_to pat(:profile), url(:accounts, :edit, :id => current_account.id) %></li>
-          <li><%%= link_to pat(:logout), url(:sessions, :destroy), :method => :delete %></li>
+          <li><%%= button_to pat(:logout), url(:sessions, :destroy), :method => :delete, :class => :button_to %></li>
         </ul>
       </div>
       <div id="main-navigation">

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

@@ -2,13 +2,13 @@
 <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>
+  <title>Padrino Admin</title>
   <%%= stylesheet_link_tag :base, "themes/<%= options[:theme] %>/style" %>
 </head>
 <body>
   <div id="container">
     <div id="box">
-      <h1><%= options[:name] %></h1>
+      <h1>Padrino Admin</h1>
       <div class="block" id="block-login">
         <h2>Login Box</h2>
         <div class="content login">

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

@@ -22,7 +22,7 @@
           <%- end -%>
           <td class="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 %>
+            <%%= button_to pat(:delete), url(:<%= @orm.name_plural %>, :destroy, :id => <%= @orm.name_singular %>.id), :method => :delete, :class => :button_to, :onsubmit => "return confirm('#{pat(:confirm)}')" %>
           </td>
         </tr>
         <%% end %>

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

@@ -2,16 +2,16 @@
 %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] %>
+    %title Padrino Admin
     =stylesheet_link_tag :base, "themes/<%= options[:theme] %>/style"
   %body
     #container
       #header
-        %h1=link_to "<%= options[:name] %>", url(:base_index)
+        %h1=link_to "Padrino Admin", 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
+            %li=button_to pat(:logout), url(:sessions, :destroy), :method => :delete, :class => :button_to
         #main-navigation
           %ul.wat-cf
             -project_modules.each do |project_module|

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

@@ -2,12 +2,12 @@
 %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] %>
+    %title Padrino Admin
     =stylesheet_link_tag :base, "themes/<%= options[:theme] %>/style"
   %body
     #container
       #box
-        %h1 <%= options[:name] %>
+        %h1 Padrino Admin
         #block-login.block
           %h2 Login Box
           .content.login

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

@@ -2,7 +2,7 @@
 .group
   =f.label :<%= column[:name] %>
   =f.error_message_on :<%= column[:name] %>
-  =f.<%= column[:field_type] %> :<%= column[:name] %>, :class => :<%= column[:field_type] %>
+  <% if column[:field_type] == :text_area %>~<% else %>=<% end %>f.<%= column[:field_type] %> :<%= column[:name] %>, :class => :<%= column[:field_type] %>
   %span.description Ex: a simple text
 
 <%- end -%>

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

@@ -22,7 +22,7 @@
             %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
+              =button_to pat(:delete), url(:<%= @orm.name_plural %>, :destroy, :id => <%= @orm.name_singular %>.id), :method => :delete, :class => :button_to, :onsubmit => "return confirm('#{pat(:confirm)}')"
       .actions-bar.wat-cf
         .actions="&nbsp;"
 

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

@@ -2,13 +2,13 @@
 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] %>
+    title Padrino Admin
     ==stylesheet_link_tag :base, "themes/<%= options[:theme] %>/style"
 
   body
     #container
       #header
-        h1==link_to "<%= options[:name] %>", url(:base_index)
+        h1==link_to "Padrino Admin", url(:base_index)
         #user-navigation
           ul.wat-cf
             li==link_to pat(:profile), url(:accounts, :edit, :id => current_account.id)

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

@@ -2,13 +2,13 @@
 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] %>
+    title Padrino Admin
     ==stylesheet_link_tag :base, "themes/<%= options[:theme] %>/style"
 
   body
     #container
       #box
-        h1 <%= options[:name] %>
+        h1 Padrino Admin
         #block-login.block
           h2 Login Box
           .content.login

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

@@ -23,7 +23,7 @@
             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
+              ==button_to pat(:delete), url(:<%= @orm.name_plural %>, :destroy, :id => <%= @orm.name_singular %>.id), :method => :delete, :class => :button_to, :onsubmit => "return confirm('#{pat(:confirm)}')"
       .actions-bar.wat-cf
         .actions=="&nbsp;"
 

data/test/generators/test_admin_app_generator.rb

@@ -52,12 +52,13 @@ class TestAdminAppGenerator < Test::Unit::TestCase
       assert_file_exists("#{@apptmp}/sample_project/admin/views/sessions/new.haml")
       assert_file_exists("#{@apptmp}/sample_project/public/admin")
       assert_file_exists("#{@apptmp}/sample_project/public/admin/stylesheets")
-      assert_file_exists("#{@apptmp}/sample_project/admin/models/account.rb")
+      assert_file_exists("#{@apptmp}/sample_project/app/models/account.rb")
       assert_file_exists("#{@apptmp}/sample_project/db/seeds.rb")
       assert_file_exists("#{@apptmp}/sample_project/db/migrate/001_create_accounts.rb")
       assert_match_in_file 'Padrino.mount("Admin").to("/admin")', "#{@apptmp}/sample_project/config/apps.rb"
       assert_match_in_file 'class Admin < Padrino::Application', "#{@apptmp}/sample_project/admin/app.rb"
       assert_match_in_file 'role.project_module :accounts, "/accounts"', "#{@apptmp}/sample_project/admin/app.rb"
+      assert_match_in_file 'set :session_secret, "', "#{@apptmp}/sample_project/admin/app.rb"
     end
 
     should 'correctly generate a new padrino admin application with erb renderer' do
@@ -83,12 +84,45 @@ class TestAdminAppGenerator < Test::Unit::TestCase
       assert_file_exists("#{@apptmp}/sample_project/admin/views/sessions/new.erb")
       assert_file_exists("#{@apptmp}/sample_project/public/admin")
       assert_file_exists("#{@apptmp}/sample_project/public/admin/stylesheets")
-      assert_file_exists("#{@apptmp}/sample_project/admin/models/account.rb")
+      assert_file_exists("#{@apptmp}/sample_project/app/models/account.rb")
       assert_file_exists("#{@apptmp}/sample_project/db/seeds.rb")
       assert_file_exists("#{@apptmp}/sample_project/db/migrate/001_create_accounts.rb")
       assert_match_in_file 'Padrino.mount("Admin").to("/admin")', "#{@apptmp}/sample_project/config/apps.rb"
       assert_match_in_file 'class Admin < Padrino::Application', "#{@apptmp}/sample_project/admin/app.rb"
       assert_match_in_file 'role.project_module :accounts, "/accounts"', "#{@apptmp}/sample_project/admin/app.rb"
+      assert_match_in_file 'set :session_secret, "', "#{@apptmp}/sample_project/admin/app.rb"
+    end
+
+    should 'correctly generate a new padrino admin application with slim renderer' do
+      assert_nothing_raised { silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=activerecord', '-e=slim') } }
+      assert_nothing_raised { silence_logger { generate(:admin_app, "--root=#{@apptmp}/sample_project") } }
+      assert_file_exists("#{@apptmp}/sample_project")
+      assert_file_exists("#{@apptmp}/sample_project/admin")
+      assert_file_exists("#{@apptmp}/sample_project/admin/app.rb")
+      assert_file_exists("#{@apptmp}/sample_project/admin/controllers")
+      assert_file_exists("#{@apptmp}/sample_project/admin/controllers/accounts.rb")
+      assert_file_exists("#{@apptmp}/sample_project/admin/controllers/base.rb")
+      assert_file_exists("#{@apptmp}/sample_project/admin/controllers/sessions.rb")
+      assert_file_exists("#{@apptmp}/sample_project/admin/views")
+      assert_file_exists("#{@apptmp}/sample_project/admin/views/accounts/_form.slim")
+      assert_file_exists("#{@apptmp}/sample_project/admin/views/accounts/edit.slim")
+      assert_file_exists("#{@apptmp}/sample_project/admin/views/accounts/index.slim")
+      assert_file_exists("#{@apptmp}/sample_project/admin/views/accounts/new.slim")
+      assert_file_exists("#{@apptmp}/sample_project/admin/views/base/index.slim")
+      assert_file_exists("#{@apptmp}/sample_project/admin/views/sessions/new.slim")
+      assert_file_exists("#{@apptmp}/sample_project/admin/views/base/_sidebar.slim")
+      assert_file_exists("#{@apptmp}/sample_project/admin/views/base/index.slim")
+      assert_file_exists("#{@apptmp}/sample_project/admin/views/layouts/application.slim")
+      assert_file_exists("#{@apptmp}/sample_project/admin/views/sessions/new.slim")
+      assert_file_exists("#{@apptmp}/sample_project/public/admin")
+      assert_file_exists("#{@apptmp}/sample_project/public/admin/stylesheets")
+      assert_file_exists("#{@apptmp}/sample_project/app/models/account.rb")
+      assert_file_exists("#{@apptmp}/sample_project/db/seeds.rb")
+      assert_file_exists("#{@apptmp}/sample_project/db/migrate/001_create_accounts.rb")
+      assert_match_in_file 'Padrino.mount("Admin").to("/admin")', "#{@apptmp}/sample_project/config/apps.rb"
+      assert_match_in_file 'class Admin < Padrino::Application', "#{@apptmp}/sample_project/admin/app.rb"
+      assert_match_in_file 'role.project_module :accounts, "/accounts"', "#{@apptmp}/sample_project/admin/app.rb"
+      assert_match_in_file 'set :session_secret, "', "#{@apptmp}/sample_project/admin/app.rb"
     end
 
     should 'not conflict with existing seeds file' do

data/test/generators/test_admin_page_generator.rb

@@ -75,6 +75,25 @@ class TestAdminPageGenerator < Test::Unit::TestCase
       assert_match_in_file "check_box_tag :bypass", "#{@apptmp}/sample_project/admin/views/sessions/new.erb"
     end
 
+    should 'correctly generate a new padrino admin application with slim renderer' do
+      silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=datamapper', '-e=slim') }
+      silence_logger { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
+      silence_logger { generate(:model, 'person', "name:string", "age:integer", "email:string", "-root=#{@apptmp}/sample_project") }
+      silence_logger { generate(:admin_page, 'person', "--root=#{@apptmp}/sample_project") }
+      assert_file_exists "#{@apptmp}/sample_project/admin/controllers/people.rb"
+      assert_file_exists "#{@apptmp}/sample_project/admin/views/people/_form.slim"
+      assert_file_exists "#{@apptmp}/sample_project/admin/views/people/edit.slim"
+      assert_file_exists "#{@apptmp}/sample_project/admin/views/people/index.slim"
+      assert_file_exists "#{@apptmp}/sample_project/admin/views/people/new.slim"
+      %w(name age email).each do |field|
+        assert_match_in_file "label :#{field}", "#{@apptmp}/sample_project/admin/views/people/_form.slim"
+        assert_match_in_file "text_field :#{field}", "#{@apptmp}/sample_project/admin/views/people/_form.slim"
+      end
+      assert_match_in_file 'role.project_module :people, "/people"', "#{@apptmp}/sample_project/admin/app.rb"
+      assert_match_in_file "elsif Padrino.env == :development && params[:bypass]", "#{@apptmp}/sample_project/admin/controllers/sessions.rb"
+      assert_match_in_file "check_box_tag :bypass", "#{@apptmp}/sample_project/admin/views/sessions/new.slim"
+    end
+
     should 'correctly generate a new padrino admin application with multiple models' do
       silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=datamapper','-e=haml') }
       silence_logger { generate(:admin_app, "--root=#{@apptmp}/sample_project") }

data/test/test_admin_application.rb

@@ -220,11 +220,11 @@ class TestAdminApplication < Test::Unit::TestCase
       end
 
       get "/modules" do
-        project_modules.collect { |pm| "#{pm.name} => #{pm.path}" }.join(", ")
+        project_modules.map { |pm| "#{pm.name} => #{pm.path}" }.join(", ")
       end
 
       get "/modules-prefixed" do
-        project_modules.collect { |pm| "#{pm.name} => #{pm.path("/admin")}" }.join(", ")
+        project_modules.map { |pm| "#{pm.name} => #{pm.path("/admin")}" }.join(", ")
       end
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-admin
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 0
   - 9
-  - 24
-  version: 0.9.24
+  - 25
+  version: 0.9.25
 platform: ruby
 authors: 
 - Padrino Team
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-28 00:00:00 +02:00
+date: 2011-04-27 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -29,12 +29,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 9
         segments: 
         - 0
         - 9
-        - 24
-        version: 0.9.24
+        - 25
+        version: 0.9.25
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -45,12 +45,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 9
         segments: 
         - 0
         - 9
-        - 24
-        version: 0.9.24
+        - 25
+        version: 0.9.25
   type: :runtime
   version_requirements: *id002
 description: Admin View for Padrino applications
@@ -80,9 +80,9 @@ files:
 - 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/app.rb.tt
 - 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/style.css