padrino-admin 0.10.6 → 0.10.7

data/lib/padrino-admin/access_control.rb

@@ -145,9 +145,9 @@ module Padrino
         ##
         # Create a project module
         #
-        def project_module(name, path)
+        def project_module(name, path, options={})
           allow(path)
-          @project_modules << ProjectModule.new(name, path)
+          @project_modules << ProjectModule.new(name, path, options)
         end
       end # Authorization
 
@@ -155,10 +155,10 @@ module Padrino
       # Project Module class
       #
       class ProjectModule
-        attr_reader :name
+        attr_reader :name, :options
 
-        def initialize(name, path) # @private
-          @name, @path = name, path
+        def initialize(name, path, options={}) # @private
+          @name, @path, @options = name, path, options
         end
 
         ##

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

@@ -55,22 +55,27 @@ module Padrino
           self.behavior = :revoke if options[:destroy]
 
           empty_directory destination_root("admin")
+
+          # Setup Admin Model
+          @model_name     = options[:admin_model].classify
+          @model_singular = @model_name.underscore
+          @model_plural   = @model_singular.pluralize
+
           directory "templates/app",       destination_root("admin")
           directory "templates/assets",    destination_root("public", "admin")
           template  "templates/app.rb.tt", destination_root("admin/app.rb")
           append_file destination_root("config/apps.rb"),  "\nPadrino.mount(\"Admin\").to(\"/admin\")"
           insert_middleware 'ActiveRecord::ConnectionAdapters::ConnectionManagement', 'admin' if [:mini_record, :activerecord].include?(orm)
 
-          account_params = [
-            options[:admin_model].underscore, "name:string", "surname:string", "email:string", "crypted_password:string", "role:string",
+          params = [
+            @model_singular, "name:string", "surname:string", "email:string", "crypted_password:string", "role:string",
             "-a=#{options[:app]}",
             "-r=#{options[:root]}"
           ]
+          params << "-s" if options[:skip_migration]
+          params << "-d" if options[:destroy]
 
-          account_params << "-s" if options[:skip_migration]
-          account_params << "-d" if options[:destroy]
-
-          Padrino::Generators::Model.start(account_params)
+          Padrino::Generators::Model.start(params)
           column = Struct.new(:name, :type)
           columns = [:id, :name, :surname, :email].map { |col| column.new(col) }
           column_fields = [
@@ -82,11 +87,11 @@ module Padrino
             { :name => :role,                  :field_type => :text_field }
           ]
 
-          admin_app = Padrino::Generators::AdminPage.new([options[:admin_model].underscore], :root => options[:root], :destroy => options[:destroy])
-          admin_app.default_orm = Padrino::Admin::Generators::Orm.new(options[:admin_model].underscore, orm, columns, column_fields)
+          admin_app = Padrino::Generators::AdminPage.new([@model_singular], :root => options[:root], :destroy => options[:destroy])
+          admin_app.default_orm = Padrino::Admin::Generators::Orm.new(@model_singular, orm, columns, column_fields)
           admin_app.invoke_all
 
-          template "templates/account/#{orm}.rb.tt", destination_root(options[:app], "models", "#{options[:admin_model].underscore}.rb"), :force => true
+          template "templates/account/#{orm}.rb.tt", destination_root(options[:app], "models", "#{@model_singular}.rb"), :force => true
 
           if File.exist?(destination_root("db/seeds.rb"))
             run "mv #{destination_root('db/seeds.rb')} #{destination_root('db/seeds.old')}"
@@ -104,13 +109,14 @@ module Padrino
           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}")
 
-          model_singular = options[:admin_model].underscore
-          model_plural = model_singular.pluralize
-
-          add_project_module model_plural
+          add_project_module @model_plural
           require_dependencies('bcrypt-ruby', :require => 'bcrypt')
-          gsub_file destination_root("admin/views/#{model_plural}/_form.#{ext}"), "f.text_field :role, :class => :text_field", "f.select :role, :options => access_control.roles"
-          gsub_file destination_root("admin/controllers/#{model_plural}.rb"), "if #{model_singular}.destroy", "if #{model_singular} != current_account && #{model_singular}.destroy"
+
+          # A nicer select box
+          gsub_file destination_root("admin/views/#{@model_plural}/_form.#{ext}"), "f.text_field :role, :class => :text_field", "f.select :role, :options => access_control.roles"
+
+          # Destroy account only if not logged in
+          gsub_file destination_root("admin/controllers/#{@model_plural}.rb"), "if #{@model_singular}.destroy", "if #{@model_singular} != current_account && #{@model_singular}.destroy"
           return if self.behavior == :revoke
 
           instructions = []

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

@@ -1,4 +1,4 @@
-class <%= options[:admin_model].underscore.camelize %> < ActiveRecord::Base
+class <%= @model_name %> < ActiveRecord::Base
   attr_accessor :password, :password_confirmation
 
   # Validations
@@ -28,11 +28,11 @@ class <%= options[:admin_model].underscore.camelize %> < ActiveRecord::Base
   end
 
   private
-    def encrypt_password
-      self.crypted_password = ::BCrypt::Password.create(password)
-    end
+  def encrypt_password
+    self.crypted_password = ::BCrypt::Password.create(password)
+  end
 
-    def password_required
-      crypted_password.blank? || password.present?
-    end
+  def password_required
+    crypted_password.blank? || password.present?
+  end
 end

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

@@ -1,4 +1,4 @@
-class <%= options[:admin_model].underscore.camelize %> < CouchRest::Model::Base
+class <%= @model_name %> < CouchRest::Model::Base
   attr_accessor :password, :password_confirmation
 
   # Properties
@@ -44,23 +44,23 @@ class <%= options[:admin_model].underscore.camelize %> < CouchRest::Model::Base
   end
 
   private
-    def encrypt_password
-      self.crypted_password = ::BCrypt::Password.create(password)
-    end
+  def encrypt_password
+    self.crypted_password = ::BCrypt::Password.create(password)
+  end
 
-    def password_required
-      crypted_password.blank? || password.present?
-    end
+  def password_required
+    crypted_password.blank? || password.present?
+  end
 
-    def unique_email_validator
-      account = Account.find_by_email(email)
+  def unique_email_validator
+    account = self.class.find_by_email(email)
 
-      # didn't find email in the database
-      return if account.nil?
+    # didn't find email in the database
+    return if account.nil?
 
-      # account with same email in database is this account
-      return if has_key?('_id') && self['_id'] == account['_id']
+    # account with same email in database is this account
+    return if has_key?('_id') && self['_id'] == account['_id']
 
-      errors.add(:email, "is not unique")
-    end
+    errors.add(:email, "is not unique")
+  end
 end

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

@@ -1,4 +1,4 @@
-class <%= options[:admin_model].underscore.camelize %>
+class <%= @model_name %>
   include DataMapper::Resource
   include DataMapper::Validate
   attr_accessor :password, :password_confirmation
@@ -45,11 +45,11 @@ class <%= options[:admin_model].underscore.camelize %>
   end
 
   private
-    def password_required
-      crypted_password.blank? || password.present?
-    end
+  def password_required
+    crypted_password.blank? || password.present?
+  end
 
-    def encrypt_password
-      self.crypted_password = ::BCrypt::Password.create(password) if password.present?
-    end
+  def encrypt_password
+    self.crypted_password = ::BCrypt::Password.create(password) if password.present?
+  end
 end

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

@@ -1,4 +1,4 @@
-class <%= options[:admin_model].underscore.camelize %> < ActiveRecord::Base
+class <%= @model_name %> < ActiveRecord::Base
   attr_accessor :password, :password_confirmation
 
   # Fields
@@ -31,11 +31,11 @@ class <%= options[:admin_model].underscore.camelize %> < ActiveRecord::Base
   end
 
   private
-    def encrypt_password
-      self.crypted_password = ::BCrypt::Password.create(password)
-    end
+  def encrypt_password
+    self.crypted_password = ::BCrypt::Password.create(password)
+  end
 
-    def password_required
-      crypted_password.blank? || password.present?
-    end
+  def password_required
+    crypted_password.blank? || password.present?
+  end
 end

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

@@ -1,4 +1,4 @@
-class <%= options[:admin_model].underscore.camelize %>
+class <%= @model_name %>
   include Mongoid::Document
   attr_accessor :password, :password_confirmation
 
@@ -43,11 +43,11 @@ class <%= options[:admin_model].underscore.camelize %>
   end
 
   private
-    def encrypt_password
-      self.crypted_password = ::BCrypt::Password.create(self.password)
-    end
+  def encrypt_password
+    self.crypted_password = ::BCrypt::Password.create(self.password)
+  end
 
-    def password_required
-      crypted_password.blank? || self.password.present?
-    end
+  def password_required
+    crypted_password.blank? || self.password.present?
+  end
 end

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

@@ -1,4 +1,4 @@
-class <%= options[:admin_model].underscore.camelize %>
+class <%= @model_name %>
   include MongoMapper::Document
   attr_accessor :password, :password_confirmation
 
@@ -36,11 +36,11 @@ class <%= options[:admin_model].underscore.camelize %>
   end
 
   private
-    def encrypt_password
-      self.crypted_password = ::BCrypt::Password.create(password)
-    end
+  def encrypt_password
+    self.crypted_password = ::BCrypt::Password.create(password)
+  end
 
-    def password_required
-      crypted_password.blank? || password.present?
-    end
+  def password_required
+    crypted_password.blank? || password.present?
+  end
 end

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

@@ -10,11 +10,11 @@ password  = shell.ask "Tell me the password to use:"
 
 shell.say ""
 
-account = <%= options[:admin_model].underscore.camelize %>.create(:email => email, :name => "Foo", :surname => "Bar", :password => password, :password_confirmation => password, :role => "admin")
+account = <%= @model_name %>.create(:email => email, :name => "Foo", :surname => "Bar", :password => password, :password_confirmation => password, :role => "admin")
 
 if account.valid?
   shell.say "================================================================="
-  shell.say "<%= options[:admin_model].underscore.camelize %> has been successfully created, now you can login with:"
+  shell.say "<%= @model_name %> has been successfully created, now you can login with:"
   shell.say "================================================================="
   shell.say "   email: #{email}"
   shell.say "   password: #{password}"

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

@@ -1,4 +1,4 @@
-class <%= options[:admin_model].underscore.camelize %> < ::Sequel::Model
+class <%= @model_name %> < ::Sequel::Model
 
   plugin :validation_helpers
 
@@ -38,15 +38,15 @@ class <%= options[:admin_model].underscore.camelize %> < ::Sequel::Model
   end
 
   def has_password?(password)
-    ::BCrypt::Password.new(crypted_password) == password
+    ::BCrypt::Password.new(self.crypted_password) == password
   end
 
   private
-    def encrypt_password
-      self.crypted_password = ::BCrypt::Password.create(password) if password.present?
-    end
+  def encrypt_password
+    self.crypted_password = ::BCrypt::Password.create(password) if password.present?
+  end
 
-    def password_required
-      crypted_password.blank? || password.present?
-    end
+  def password_required
+    self.crypted_password.blank? || password.present?
+  end
 end

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

@@ -20,7 +20,7 @@ class Admin < Padrino::Application
   # layout  :my_layout              # Layout can be in views/layouts/foo.ext or views/foo.ext (default :application)
   #
 
-  set :admin_model, '<%= options[:admin_model] %>'
+  set :admin_model, '<%= @model_name %>'
   set :login_page, "/admin/sessions/new"
 
   enable  :sessions

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

@@ -5,11 +5,11 @@ Admin.controllers :sessions do
   end
 
   post :create do
-    if account = <%= options[:admin_model] %>.authenticate(params[:email], params[:password])
+    if account = <%= @model_name %>.authenticate(params[:email], params[:password])
       set_current_account(account)
       redirect url(:base, :index)
     elsif Padrino.env == :development && params[:bypass]
-      account = <%= options[:admin_model] %>.first
+      account = <%= @model_name %>.first
       set_current_account(account)
       redirect url(:base, :index)
     else

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

@@ -11,7 +11,7 @@
       <h1><%%= link_to "Padrino Admin", url(:base_index) %></h1>
       <div id="user-navigation">
         <ul class="wat-cf">
-          <li><%%= link_to pat(:profile), url(:<%= options[:admin_model].underscore.pluralize %>, :edit, :id => current_account.id) %></li>
+          <li><%%= link_to pat(:profile), url(:<%= @model_plural %>, :edit, :id => current_account.id) %></li>
           <li><%%= button_to pat(:logout), url(:sessions, :destroy), :method => :delete, :class => :button_to %></li>
         </ul>
       </div>
@@ -31,7 +31,7 @@
         <%%= yield %>
         <div id="footer">
           <div class="block">
-            <p>Copyright &copy; <%%= Time.now.year %> Your Site - Powered by <a href="https://github.com/padrino/padrino-framework" target="_blank">Padrino v.<%%= Padrino.version %>.</a></p>
+            <p>Copyright &copy; <%%= Time.now.year %> Your Site - Powered by <a href="http://www.padrinorb.com" target="_blank">Padrino v.<%%= Padrino.version %>.</a></p>
           </div>
         </div>
       </div>

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

@@ -10,7 +10,7 @@
         %h1=link_to "Padrino Admin", url(:base_index)
         #user-navigation
           %ul.wat-cf
-            %li=link_to pat(:profile), url(:<%= options[:admin_model].underscore.pluralize %>, :edit, :id => current_account.id)
+            %li=link_to pat(:profile), url(:<%= @model_plural %>, :edit, :id => current_account.id)
             %li=button_to pat(:logout), url(:sessions, :destroy), :method => :delete, :class => :button_to
         #main-navigation
           %ul.wat-cf
@@ -27,5 +27,5 @@
                 Copyright &copy;
                 =Time.now.year
                 Your Site - Powered by
-                =link_to "Padrino v.#{Padrino.version}", "http://padrino.github.com", :target => :_blank
+                =link_to "Padrino v.#{Padrino.version}", "http://www.padrinorb.com", :target => :_blank
         #sidebar=yield_content :sidebar

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

@@ -7,5 +7,5 @@
 .block
   h3 Links
   ul.navigation
-    li==link_to "Link 1"
-    li==link_to "Link 2"
+    li == link_to 'Link 1'
+    li == link_to 'Link 2'

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

@@ -22,4 +22,4 @@
         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")
+- content_for :sidebar, partial("base/sidebar")

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

@@ -1,30 +1,31 @@
 doctype html
-html lang="en" xmlns="http://www.w3.org/1999/xhtml"
+html lang='en' xmlns='http://www.w3.org/1999/xhtml'
   head
-    meta content="text/html; charset=utf-8" http-equiv="Content-Type"
+    meta content='text/html; charset=utf-8' http-equiv='Content-Type'
     title Padrino Admin
-    ==stylesheet_link_tag :base, "themes/<%= options[:theme] %>/style"
+    == stylesheet_link_tag 'base', 'themes/<%= options[:theme] %>/style'
 
   body
     #container
       #header
-        h1==link_to "Padrino Admin", url(:base_index)
+        h1 == link_to 'Padrino Admin', url(:base_index)
         #user-navigation
           ul.wat-cf
-            li==link_to pat(:profile), url(:<%= options[:admin_model].underscore.pluralize  %>, :edit, :id => current_account.id)
-            li==button_to pat(:logout), url(:sessions, :destroy), :method => :delete, :class => :button_to
+            li == link_to pat(:profile), url(:<%= @model_plural %>, :edit, :id => current_account.id)
+            li == button_to pat(:logout), url(:sessions, :destroy), :method => :delete, :class => :button_to
         #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")
+            - 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
+        .flash == [:error, :warning, :notice].map { |type| flash_tag(type, :class => "message #{type}") }.join
         #main
-          ==yield
+          == yield
           #footer
             .block
               p
                 ' Copyright &copy; #{Time.now.year} Your Site - Powered by
-                ==link_to "Padrino v.#{Padrino.version}", "http://padrino.github.com", :target => :_blank
-        #sidebar==yield_content :sidebar
+                == link_to "Padrino v.#{Padrino.version}", 'http://www.padrinorb.com', :target => :_blank
+        #sidebar
+          == yield_content :sidebar

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

@@ -1,9 +1,9 @@
 doctype html
-html lang="en" xmlns="http://www.w3.org/1999/xhtml"
+html lang='en' xmlns='http://www.w3.org/1999/xhtml'
   head
-    meta content="text/html; charset=utf-8" http-equiv="Content-Type"
+    meta content='text/html; charset=utf-8' http-equiv='Content-Type'
     title Padrino Admin
-    ==stylesheet_link_tag :base, "themes/<%= options[:theme] %>/style"
+    == stylesheet_link_tag 'base', 'themes/<%= options[:theme] %>/style'
 
   body
     #container
@@ -12,20 +12,20 @@ html lang="en" xmlns="http://www.w3.org/1999/xhtml"
         #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
+            .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
+                .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
-              -if Padrino.env == :development
+                .right == password_field_tag :password, :value => params[:password], :class => :text_field
+              - if Padrino.env == :development
                 .group.wat-cf
                   .left
                      label.label.right Bypass login?
-                  .right==check_box_tag :bypass
+                  .right == check_box_tag :bypass
               .group.navform.wat-cf
-                .right==submit_tag('Sign In', :class => :button)
+                .right == submit_tag 'Sign In', :class => :button

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

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

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

@@ -1,16 +1,16 @@
 .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)
+      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)
-      =="&nbsp;"
-      =mt(:<%= @orm.name_singular %>)
+      = pat(:edit)
+      == "&nbsp;"
+      = 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 }
+      == 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")
+- content_for :sidebar, partial("base/sidebar")

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

@@ -1,30 +1,30 @@
 .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)
+      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)
-      =="&nbsp;"
-      ==mt(:<%= @orm.name_plural %>)
+      == pat(:all)
+      == '&nbsp;'
+      == mt(:<%= @orm.name_plural %>)
     .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 %>|
+          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 %>=<%= @orm.name_singular %>.<%= column.name %>
             <%- 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, :onsubmit => "return confirm('#{pat(:confirm)}')"
+              == 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, :onsubmit => "return confirm('#{pat(:confirm)}')"
       .actions-bar.wat-cf
-        .actions=="&nbsp;"
+        .actions == '&nbsp;'
 
 -content_for :sidebar, partial("base/sidebar")

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

@@ -1,15 +1,15 @@
 .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)
+      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)
-      =="&nbsp;"
-      =mt(:<%= @orm.name_singular %>)
+      = pat(:new)
+      == '&nbsp;'
+      = 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 }
+      - 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")
+- content_for :sidebar, partial("base/sidebar")

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

@@ -0,0 +1,16 @@
+ro:
+  padrino:
+    admin:
+      save: Salvează
+      cancel: Anulează
+      list: Listă
+      edit: Editează
+      new: Crează
+      show: Afișează
+      delete: Șterge
+      confirm: Ești sigur?
+      created_at: Creat la
+      all: Toate
+      profile: Profil
+      settings: Setări
+      logout: Delogare

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

@@ -0,0 +1,16 @@
+sv:
+  padrino:
+    admin:
+      save: Spara
+      cancel: Avbryt
+      list: Lista
+      edit: Redigera
+      new: Ny
+      show: Visa
+      delete: Radera
+      confirm: Är du säker?
+      created_at: Skapad
+      all: Alla
+      profile: Profil
+      settings: Inställningar
+      logout: Logga ut

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

@@ -0,0 +1,26 @@
+ro:
+  activemodel: &activemodel
+    errors:
+      messages:
+        inclusion: "nu este inclus în listă"
+        exclusion: "este rezervat"
+        invalid: "nu este valid"
+        confirmation: "nu corespunde cu confirmarea"
+        accepted: "trebuie să fie acceptat"
+        empty: "nu poate fi gol"
+        blank: "nu poate fi gol"
+        too_long: "este prea lung (maximul este %{count} caractere)"
+        too_short: "este prea scurt (minimul este %{count} caractere)"
+        wrong_length: "are lungime necorespunzătoare (trebuie să fie de %{count} caractere)"
+        taken: "este deja utilizat"
+        not_a_number: "nu este un număr"
+        greater_than: "trebuie să fie mai mare de %{count}"
+        greater_than_or_equal_to: "trebuie să fie mai mare sau egal cu %{count}"
+        equal_to: "trebuie să fie egal cu %{count}"
+        less_than: "trebuie să fie mai mic de %{count}"
+        less_than_or_equal_to: "trebuie să fie mai mic sau egal cu %{count}"
+        odd: "trebuie să fie impar"
+        even: "trebuie să fie par"
+        record_invalid: "Eroare la validare: %{errors}"
+        content_type: "format de fișier neacceptat"
+  activerecord: *activemodel

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

@@ -0,0 +1,26 @@
+sv:
+  activemodel: &activemodel
+    errors:
+      messages:
+        inclusion: "är inte inkluderad i listan"
+        exclusion: "är reserverad"
+        invalid: "är ogiltig"
+        confirmation: "matchar inte konfirmeringen"
+        accepted: "måste accepteras"
+        empty: "kan inte vara tomt"
+        blank: "kan inte vara blankt"
+        too_long: "är för långt (max %{count} tecken)"
+        too_short: "är för kort (minst %{count} tecken)"
+        wrong_length: "är fel längd (borde vara %{count} tecken)"
+        taken: "är redan upptaget"
+        not_a_number: "är inte ett tal"
+        greater_than: "måste vara större än %{count}"
+        greater_than_or_equal_to: "måste vara större än eller lika med %{count}"
+        equal_to: "måste vara lika med %{count}"
+        less_than: "måste vara mindre än %{count}"
+        less_than_or_equal_to: "måste vara mindre än eller lika med %{count}"
+        odd: "måste vara udda"
+        even: "måste vara jämnt"
+        record_invalid: "Validering misslyckades: %{errors}"
+        content_type: "filformatet stöds ej"
+  activerecord: *activemodel

data/test/fixtures/data_mapper.rb

@@ -1,3 +1,4 @@
+require 'jdbc/sqlite3' if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
 require 'dm-core'
 require 'dm-migrations'
 require 'dm-validations'

data/test/generators/test_admin_app_generator.rb

@@ -125,6 +125,45 @@ describe "AdminAppGenerator" do
       assert_match_in_file 'button_to pat(:logout)', "#{@apptmp}/sample_project/admin/views/layouts/application.slim"
     end
 
+    should 'correctly generate a new padrino admin application with a custom model' do
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=activerecord', '-e=slim') }
+      capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project", '-m=User') }
+      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/users.rb")
+      assert_no_match_in_file(/[^_]account/i, "#{@apptmp}/sample_project/admin/controllers/users.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/users/_form.slim")
+      assert_no_match_in_file(/[^_]account/i, "#{@apptmp}/sample_project/admin/views/users/_form.slim")
+      assert_file_exists("#{@apptmp}/sample_project/admin/views/users/edit.slim")
+      assert_no_match_in_file(/[^_]account/i, "#{@apptmp}/sample_project/admin/views/users/edit.slim")
+      assert_file_exists("#{@apptmp}/sample_project/admin/views/users/index.slim")
+      assert_no_match_in_file(/[^_]account/i, "#{@apptmp}/sample_project/admin/views/users/index.slim")
+      assert_file_exists("#{@apptmp}/sample_project/admin/views/users/new.slim")
+      assert_no_match_in_file(/[^_]account/i, "#{@apptmp}/sample_project/admin/views/users/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/models/user.rb")
+      assert_no_match_in_file(/Account/, "#{@apptmp}/sample_project/models/user.rb")
+      assert_file_exists("#{@apptmp}/sample_project/db/seeds.rb")
+      assert_file_exists("#{@apptmp}/sample_project/db/migrate/001_create_users.rb")
+      assert_no_match_in_file(/[^_]account/i, "#{@apptmp}/sample_project/db/migrate/001_create_users.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 :users, \'/users\'', "#{@apptmp}/sample_project/admin/app.rb"
+      assert_match_in_file 'button_to pat(:logout)', "#{@apptmp}/sample_project/admin/views/layouts/application.slim"
+    end
+
     should 'correctly generate a new padrino admin application with model in non-default application path' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=activerecord', '-e=haml') }
       capture_io { generate(:admin_app,"-a=/admin", "--root=#{@apptmp}/sample_project") }

metadata

@@ -1,10 +1,10 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: padrino-admin
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.10.7
   prerelease: 
-  version: 0.10.6
 platform: ruby
-authors: 
+authors:
 - Padrino Team
 - Nathan Esquenazi
 - Davide D'Agostino
@@ -12,40 +12,47 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-03-15 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-06-20 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: padrino-core
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 0.10.6
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.10.7
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: padrino-helpers
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.10.7
+- !ruby/object:Gem::Dependency
+  name: padrino-helpers
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 0.10.6
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.10.7
   type: :runtime
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.10.7
 description: Admin View for Padrino applications
 email: padrinorb@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
+files:
 - .document
 - .gitignore
 - .yardopts
@@ -123,7 +130,9 @@ files:
 - lib/padrino-admin/locale/admin/no.yml
 - lib/padrino-admin/locale/admin/pl.yml
 - lib/padrino-admin/locale/admin/pt_br.yml
+- lib/padrino-admin/locale/admin/ro.yml
 - lib/padrino-admin/locale/admin/ru.yml
+- lib/padrino-admin/locale/admin/sv.yml
 - lib/padrino-admin/locale/admin/tr.yml
 - lib/padrino-admin/locale/admin/uk.yml
 - lib/padrino-admin/locale/admin/zh_cn.yml
@@ -142,7 +151,9 @@ files:
 - lib/padrino-admin/locale/orm/no.yml
 - lib/padrino-admin/locale/orm/pl.yml
 - lib/padrino-admin/locale/orm/pt_br.yml
+- lib/padrino-admin/locale/orm/ro.yml
 - lib/padrino-admin/locale/orm/ru.yml
+- lib/padrino-admin/locale/orm/sv.yml
 - lib/padrino-admin/locale/orm/tr.yml
 - lib/padrino-admin/locale/orm/uk.yml
 - lib/padrino-admin/locale/orm/zh_cn.yml
@@ -158,32 +169,30 @@ files:
 - test/test_locale.rb
 homepage: http://www.padrinorb.com
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: padrino-admin
-rubygems_version: 1.8.19
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Admin Dashboard for Padrino
-test_files: 
+test_files:
 - test/fixtures/data_mapper.rb
 - test/generators/test_account_model_generator.rb
 - test/generators/test_admin_app_generator.rb
@@ -191,3 +200,4 @@ test_files:
 - test/helper.rb
 - test/test_admin_application.rb
 - test/test_locale.rb
+has_rdoc: