padrino-admin 0.11.4 → 0.12.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf3dcdd045be97a348167272e0164460b6df4162
-  data.tar.gz: bd4f782b57d442725eb6729d7a0fbc8681c008be
+  metadata.gz: 59d3555e8e56082baba626251a152c8663016484
+  data.tar.gz: 6cd5f67e229164a70c9d34dc0a335da06e904824
 SHA512:
-  metadata.gz: 6b5b0e6d13948f5cb6c90d25e0e9cab1f888f3da99124fe2c7138da8f47e20ec55db5e2ad6c998cf899b2b07e72da603d958516872f5ad16ac092dbacb848740
-  data.tar.gz: 75a724d82e3e3b787d4f441a88c9fc08fcc5885133df0996f67a4ae3c6c9f61b798e882e4b376dcdf270c32997dd987d12f84b6718af5d71bd051cee56df0808
+  metadata.gz: ec01231b86c0a2ebedd62a5bcfc7ceb82bacd0766ec933fa20e8ee8c95c908032252b4d8fccb50fcfff8fa655e05875262a4d082f63e51bed94437fd98ad326f
+  data.tar.gz: ed059febbc883daddac9d2d9c790a520e5cdbd14b1665d80d4abd69d54b4d417f90f1327f3fa539f6e44fe6fa39fbe9669195868a98d190c6d09442d22473c7f

data/lib/padrino-admin/access_control.rb

@@ -13,7 +13,7 @@ module Padrino
         # Method used by Padrino::Application when we register the extension.
         #
         def registered(app)
-          app.set :session_id, "_padrino_#{File.basename(Padrino.root)}_#{app.app_name}".to_sym
+          app.set :session_id, "_padrino_#{File.basename(Padrino.root)}_#{app.app_name}".to_sym unless app.respond_to?(:session_id)
           app.set :admin_model, 'Account' unless app.respond_to?(:admin_model)
           app.helpers Padrino::Admin::Helpers::AuthenticationHelpers
           app.helpers Padrino::Admin::Helpers::ViewHelpers

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

@@ -72,7 +72,7 @@ module Padrino
           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(\"#{@app_name}::Admin\", :app_file => File.expand_path('../../admin/app.rb', __FILE__)).to(\"/admin\")"
+          inject_into_file destination_root('config/apps.rb'),  "\nPadrino.mount(\"#{@app_name}::Admin\", :app_file => File.expand_path('../../admin/app.rb', __FILE__)).to(\"/admin\")\n", :before => /^Padrino.mount.*\.to\('\/'\)$/
           unless options[:destroy]
             insert_middleware 'ActiveRecord::ConnectionAdapters::ConnectionManagement', 'admin' if [:minirecord, :activerecord].include?(orm)
           end

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

@@ -28,11 +28,14 @@ class <%= @model_name %> < ActiveRecord::Base
   end
 
   private
-    def encrypt_password
-      self.crypted_password = ::BCrypt::Password.create(password)
-    end
 
-    def password_required
-      crypted_password.blank? || password.present?
-    end
+  def encrypt_password
+    value = ::BCrypt::Password.create(password)
+    value = value.force_encoding(Encoding::UTF_8) if value.encoding == Encoding::ASCII_8BIT
+    self.crypted_password = value
+  end
+
+  def password_required
+    crypted_password.blank? || password.present?
+  end
 end

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

@@ -44,23 +44,24 @@ class <%= @model_name %> < CouchRest::Model::Base
   end
 
   private
-    def encrypt_password
-      self.crypted_password = ::BCrypt::Password.create(password)
-    end
 
-    def password_required
-      crypted_password.blank? || password.present?
-    end
+  def encrypt_password
+    self.crypted_password = ::BCrypt::Password.create(password)
+  end
+
+  def password_required
+    crypted_password.blank? || password.present?
+  end
 
-    def unique_email_validator
-      account = self.class.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

@@ -45,11 +45,12 @@ class <%= @model_name %>
   end
 
   private
-    def password_required
-      crypted_password.blank? || 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 encrypt_password
+    self.crypted_password = ::BCrypt::Password.create(password) if password.present?
+  end
 end

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

@@ -31,11 +31,14 @@ class <%= @model_name %> < ActiveRecord::Base
   end
 
   private
-    def encrypt_password
-      self.crypted_password = ::BCrypt::Password.create(password)
-    end
 
-    def password_required
-      crypted_password.blank? || password.present?
-    end
+  def encrypt_password
+    value = ::BCrypt::Password.create(password)
+    value = value.force_encoding(Encoding::UTF_8) if value.encoding == Encoding::ASCII_8BIT
+    self.crypted_password = value
+  end
+
+  def password_required
+    crypted_password.blank? || password.present?
+  end
 end

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

@@ -43,11 +43,12 @@ class <%= @model_name %>
   end
 
   private
-    def encrypt_password
-      self.crypted_password = ::BCrypt::Password.create(self.password)
-    end
 
-    def password_required
-      crypted_password.blank? || self.password.present?
-    end
+  def encrypt_password
+    self.crypted_password = ::BCrypt::Password.create(self.password)
+  end
+
+  def password_required
+    crypted_password.blank? || self.password.present?
+  end
 end

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

@@ -36,11 +36,12 @@ class <%= @model_name %>
   end
 
   private
-    def encrypt_password
-      self.crypted_password = ::BCrypt::Password.create(password)
-    end
 
-    def password_required
-      crypted_password.blank? || password.present?
-    end
+  def encrypt_password
+    self.crypted_password = ::BCrypt::Password.create(password)
+  end
+
+  def password_required
+    crypted_password.blank? || password.present?
+  end
 end

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

@@ -59,11 +59,12 @@ class Account < Ohm::Model
   end
 
   private
-    def encrypt_password
-      self.crypted_password = ::BCrypt::Password.create(password)  if password_required
-    end
 
-    def password_required
-      crypted_password.blank? || password.present?
-    end
+  def encrypt_password
+    self.crypted_password = ::BCrypt::Password.create(password)  if password_required
+  end
+
+  def password_required
+    crypted_password.blank? || password.present?
+  end
 end

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

@@ -42,11 +42,12 @@ class <%= @model_name %> < Sequel::Model
   end
 
   private
-    def encrypt_password
-      self.crypted_password = ::BCrypt::Password.create(password) if password.present?
-    end
 
-    def password_required
-      self.crypted_password.blank? || password.present?
-    end
+  def encrypt_password
+    self.crypted_password = ::BCrypt::Password.create(password) if password.present?
+  end
+
+  def password_required
+    self.crypted_password.blank? || password.present?
+  end
 end

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

@@ -16,9 +16,9 @@
       set_current_account(account)
       redirect url(:base, :index)
     else
-      params[:email], params[:password] = h(params[:email]), h(params[:password])
-      flash[:error] = pat('login.error')
-      redirect url(:sessions, :new)
+      params[:email] = h(params[:email])
+      flash.now[:error] = pat('login.error')
+      render "/sessions/new", nil, :layout => false
     end
   end
 

data/lib/padrino-admin/generators/templates/assets/javascripts/application.js

@@ -112,6 +112,7 @@
     }
 
     // Autofocus first field with an error. (usability)
-    $('.has-error :input').first().focus();
+    var error_input;
+    if (error_input = $('.has-error :input').first()) { error_input.focus(); }
   });
 }(window.jQuery);

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

@@ -6,7 +6,7 @@
 
 <div class=base-icons>
   <div class=btn-group>
-    <div class="btn btn-primary" title="Adapters for datamapper, sequel, activerecord, mongomapper, mongoid, couchrest"><%%= tag_icon("cogs icon-2x", "Orm Agnostic") %></div>
+    <div class="btn btn-primary" title="Adapters for datamapper, sequel, activerecord, minirecord, mongomapper, mongoid, couchrest"><%%= tag_icon("cogs icon-2x", "Orm Agnostic") %></div>
     <div class="btn btn-success" title="User Authentication Support, User Authorization Management"><%%= tag_icon("group icon-2x", "Authentication") %></div>
     <div class="btn btn-info" title="Erb, Haml, Slim Rendering Support"><%%= tag_icon("tasks icon-2x", "Template Agnostic") %></div>
     <div class="btn btn-warning" title="English, German, Russian, Danish, French, Brazilian and Italian localizations and many more!.."><%%= tag_icon("flag icon-2x", "Multi Language") %></div>

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

@@ -16,7 +16,7 @@
     <div class="navbar navbar-fixed-top">
       <div class=navbar-inner>
         <div class=container>
-          <%%= link_to 'Padrino', url(:base_index), :class => 'navbar-brand', :title => 'Padrino Admin' %>
+          <%%= link_to 'Padrino', url(:base, :index), :class => 'navbar-brand', :title => 'Padrino Admin' %>
           <ul class="nav navbar-nav pull-right">
             <li class=navbar-edit-account><%%= link_to tag_icon(:user), url(:<%= @model_plural %>, :edit, :id => current_account.id), :title => pat(:profile), :class => 'navbar-nav-link' %></li>
             <li class=navbar-logout>
@@ -41,7 +41,7 @@
 
     <div class='container main'>
       <div class='main-wrapper'>
-        <%%= [:error, :warning, :success, :notice].map { |type| flash_tag(type, :class => "alert alert-#{type} fade in", :bootstrap => true) }.join.html_safe %>
+        <%%= {:error => 'danger', :warning => 'warning', :success => 'success', :notice => 'info'}.map { |type, class_name| flash_tag(type, :class => "alert alert-#{class_name} fade in", :bootstrap => true) }.join.html_safe %>
         <div class='row'><%%= yield %></div>
         <div class='main-wrapper-push'></div>
       </div>

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

@@ -18,7 +18,7 @@
       </div>
       <div class="login-body modal-body">
 
-        <%%= [:error, :warning, :success, :notice].map { |type| flash_tag(type, :class => "alert alert-#{type} fade in", :bootstrap => true) }.join.html_safe %>
+        <%%=  {:error => 'danger', :warning => 'warning', :success => 'success', :notice => 'info'}.map { |type, class_name| flash_tag(type, :class => "alert alert-#{class_name} fade in", :bootstrap => true) }.join.html_safe %>
 
         <div class="form-group">
           <label for="email" class="col-lg-2 control-label"><%%= pat('login.email') %></label>
@@ -27,7 +27,7 @@
 
         <div class="form-group">
           <label for="password" class="col-lg-2 control-label"><%%= pat('login.password') %></label>
-          <div class="col-lg-10"><%%= password_field_tag :password, :value => params[:password], :class => 'form-control' %></div>
+          <div class="col-lg-10"><%%= password_field_tag :password, :class => 'form-control' %></div>
         </div>
 
         <fieldset class="login-control-group-last control-group">

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

@@ -5,7 +5,7 @@
 
 .base-icons
   .btn-group
-    .btn.btn-primary{:title => "Adapters for datamapper, sequel, activerecord, mongomapper, mongoid, couchrest"}=tag_icon("cogs icon-2x", "Orm Agnostic")
+    .btn.btn-primary{:title => "Adapters for datamapper, sequel, activerecord, minirecord, mongomapper, mongoid, couchrest"}=tag_icon("cogs icon-2x", "Orm Agnostic")
     .btn.btn-success{:title => "User Authentication Support, User Authorization Management"}=tag_icon("group icon-2x", "Authentication")
     .btn.btn-info{:title => "Erb, Haml, Slim Rendering Support"}=tag_icon("tasks icon-2x", "Template Agnostic")
     .btn.btn-warning{:title => "English, German, Russian, Danish, French, Brazilian and Italian localizations and many more!.."}=tag_icon("flag icon-2x", "Multi Language")

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

@@ -16,7 +16,7 @@
     .navbar.navbar-fixed-top
       .navbar-inner
         .container
-          =link_to 'Padrino', url(:base_index), :class => 'navbar-brand', :title => 'Padrino Admin'
+          =link_to 'Padrino', url(:base, :index), :class => 'navbar-brand', :title => 'Padrino Admin'
           %ul.nav.navbar-nav.pull-right
             %li.navbar-edit-account=link_to tag_icon(:user), url(:accounts, :edit, :id => current_account.id), :title => pat(:profile), :class => 'navbar-nav-link'
             %li.navbar-logout
@@ -30,7 +30,7 @@
 
     .container.main
       .main-wrapper
-        =[:error, :warning, :success, :notice].map { |type| flash_tag(type, :class => "alert alert-#{type} fade in", :bootstrap => true) }.join.html_safe
+        ={:error => 'danger', :warning => 'warning', :success => 'success', :notice => 'info'}.map { |type, class_name| flash_tag(type, :class => "alert alert-#{class_name} fade in", :bootstrap => true) }.join.html_safe
         .row=yield
         .main-wrapper-push
 

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

@@ -11,11 +11,11 @@
     =favicon_tag 'favicon.ico'
     =stylesheet_link_tag 'bootstrap', 'application'
   %body
-    - form_tag url(:sessions, :create), :class=>'login form-horizontal' do
+    = form_tag url(:sessions, :create), :class=>'login form-horizontal' do
       .login-header.modal-header
         .login-logo=image_tag('logo.png', :alt => "Padrino's logo", :height => 250, :width => 193)
       .login-body.modal-body
-        = [:error, :warning, :notice].map { |type| flash_tag(type, :class => "alert alert-#{type} fade in", :bootstrap => true) }.join.html_safe
+        =  {:error => 'danger', :warning => 'warning', :success => 'success', :notice => 'info'}.map { |type, class_name| flash_tag(type, :class => "alert alert-#{class_name} fade in", :bootstrap => true) }.join.html_safe
 
         .form-group
           %label.col-lg-2.control-label{:for => :email}= pat('login.email')
@@ -23,7 +23,7 @@
 
         .form-group
           %label.col-lg-2.control-label{:for => :password}= pat('login.password')
-          .col-lg-10=password_field_tag :password, :value => params[:password], :class =>'form-control'
+          .col-lg-10=password_field_tag :password, :class =>'form-control'
 
         %fieldset.login-control-group-last.control-group
           .login-controls.controls
@@ -34,4 +34,4 @@
       .login-footer.modal-footer
         =submit_tag(pat('login.sign_in'), :class => 'btn btn-primary pull-right')
 
-        =javascript_include_tag 'jquery-1.9.0.min', (Padrino.env == :production ? 'bootstrap/bootstrap.min' : %w[bootstrap/affix bootstrap/alert bootstrap/button bootstrap/carousel bootstrap/collapse bootstrap/dropdown  bootstrap/tooltip bootstrap/transition  bootstrap/modal bootstrap/popover bootstrap/scrollspy bootstrap/tab]), :application
+        =javascript_include_tag 'jquery-1.9.0.min', (Padrino.env == :production ? 'bootstrap/bootstrap.min' : %w[bootstrap/affix bootstrap/alert bootstrap/button bootstrap/carousel bootstrap/collapse bootstrap/dropdown  bootstrap/tooltip bootstrap/transition  bootstrap/modal bootstrap/popover bootstrap/scrollspy bootstrap/tab]), :application

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

@@ -4,5 +4,5 @@
   %li.active=link_to tag_icon(:edit, pat(:edit)), url(:<%= @orm.name_plural %>, :edit, :id => @<%= @orm.name_singular %>.id)
 
 .tabs-content
-  -form_for :<%= @orm.name_singular %>, url(:<%= @orm.name_plural %>, :update, :id => @<%= @orm.name_singular %>.id), :method => :put, :class => 'form-horizontal' do |f|
+  = form_for :<%= @orm.name_singular %>, url(:<%= @orm.name_plural %>, :update, :id => @<%= @orm.name_singular %>.id), :method => :put, :class => 'form-horizontal' do |f|
     =partial '<%= @orm.name_plural %>/form', :locals => { :f => f }

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

@@ -22,7 +22,7 @@
                   .arrow
                   %h3.popover-title=pat(:delete_selected_title)
                   .popover-content
-                    -form_tag url(:<%= @orm.name_plural %>, :destroy_many), :method => :delete do
+                    = form_tag url(:<%= @orm.name_plural %>, :destroy_many), :method => :delete do
                       =hidden_field_tag :<%= @orm.name_singular %>_ids, :'data-delete-many-ids' => true
                       =submit_tag pat(:delete), :class =>'list-menu-popover-delete-selected-btn btn btn-danger btn-small'
                       .btn.btn-default.btn-small.cancel=pat(:cancel)
@@ -53,6 +53,6 @@
                 .arrow
                 %h3.popover-title=pat(:delete, :model => "<%= @orm.name_singular %>")
                 .popover-content
-                  -form_tag url(:<%= @orm.name_plural %>, :destroy, :id => <%= @orm.name_singular %>.id), :method => :delete do
+                  = form_tag url(:<%= @orm.name_plural %>, :destroy, :id => <%= @orm.name_singular %>.id), :method => :delete do
                     =submit_tag pat(:delete), :class =>'list-row-action-popover-delete-one-btn btn btn-danger btn-small'
-                    .btn.btn-default.btn-small.cancel=pat(:cancel)
+                    .btn.btn-default.btn-small.cancel=pat(:cancel)

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

@@ -3,5 +3,5 @@
   %li.active=link_to tag_icon(:plus, pat(:new)), url(:<%= @orm.name_plural %>, :new)
 
 .tabs-content
-  -form_for :<%= @orm.name_singular %>, url(:<%= @orm.name_plural %>, :create), :class => 'form-horizontal' do |f|
+  = form_for :<%= @orm.name_singular %>, url(:<%= @orm.name_plural %>, :create), :class => 'form-horizontal' do |f|
     =partial '<%= @orm.name_plural %>/form', :locals => { :f => f }

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

@@ -5,7 +5,7 @@ div class="base-text"
 
 div class="base-icons"
   div class="btn-group"
-    div class="btn btn-primary" title="Adapters for datamapper, sequel, activerecord, mongomapper, mongoid, couchrest" = tag_icon("cogs icon-2x", "Orm Agnostic")
+    div class="btn btn-primary" title="Adapters for datamapper, sequel, activerecord, minirecord, mongomapper, mongoid, couchrest" = tag_icon("cogs icon-2x", "Orm Agnostic")
     div class="btn btn-success" title="User Authentication Support, User Authorization Management" = tag_icon("group icon-2x", "Authentication")
     div class="btn btn-info" title="Erb, Haml, Slim Rendering Support" = tag_icon("tasks icon-2x", "Template Agnostic")
     div class="btn btn-warning" title="English, German, Russian, Danish, French, Brazilian and Italian localizations" = tag_icon("flag icon-2x", "Multi Language")

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

@@ -16,7 +16,7 @@ html lang='en'
     div class='navbar navbar-fixed-top'
       div class='navbar-inner'
         div class='container'
-          = link_to 'Padrino', url(:base_index), :class => 'navbar-brand', :title => 'Padrino Admin'
+          = link_to 'Padrino', url(:base, :index), :class => 'navbar-brand', :title => 'Padrino Admin'
 
           ul class='nav navbar-nav pull-right'
             li class='navbar-edit-account' = link_to tag_icon(:user), url(:<%= @model_plural %>, :edit, :id => current_account.id), :title => pat(:profile), :class => 'navbar-nav-link'
@@ -30,7 +30,7 @@ html lang='en'
 
     div class='container main'
       div class='main-wrapper'
-        = [:error, :warning, :success, :notice].map { |type| flash_tag(type, :class => "alert alert-#{type} fade in", :bootstrap => true) }.join.html_safe
+        =  {:error => 'danger', :warning => 'warning', :success => 'success', :notice => 'info'}.map { |type, class_name| flash_tag(type, :class => "alert alert-#{class_name} fade in", :bootstrap => true) }.join.html_safe
         div class='row' = yield
         div class='main-wrapper-push'
 

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

@@ -12,11 +12,11 @@ html lang="en" xmlns="http://www.w3.org/1999/xhtml"
     = stylesheet_link_tag 'bootstrap', 'application'
 
   body
-    - form_tag url(:sessions, :create), :class=>'login form-horizontal' do
+    = form_tag url(:sessions, :create), :class=>'login form-horizontal' do
         div class="login-header modal-header"
           div class="login-logo" = image_tag('logo.png', :alt => "Padrino's logo", :height => 250, :width => 193)
         div class="login-body modal-body"
-          = [:error, :warning, :notice].map { |type| flash_tag(type, :class => "alert alert-#{type} fade in", :bootstrap => true) }.join.html_safe
+          = {:error => 'danger', :warning => 'warning', :success => 'success', :notice => 'info'}.map { |type, class_name| flash_tag(type, :class => "alert alert-#{class_name} fade in", :bootstrap => true) }.join.html_safe
 
           div class='form-group'
             label for="email" class='col-lg-2 control-label' = pat('login.email')
@@ -24,7 +24,7 @@ html lang="en" xmlns="http://www.w3.org/1999/xhtml"
 
           div class='form-group'
             label for="password" class='col-lg-2 control-label' = pat('login.password')
-            div class='col-lg-10'  = password_field_tag :password, :value => params[:password], :class => 'form-control'
+            div class='col-lg-10'  = password_field_tag :password, :class => 'form-control'
 
           fieldset class='login-control-group-last control-group'
             div class='login-controls controls'
@@ -34,4 +34,4 @@ html lang="en" xmlns="http://www.w3.org/1999/xhtml"
 
         div class="login-footer modal-footer"
           = submit_tag(pat('login.sign_in'), :class => 'btn btn-primary pull-right')
-    = javascript_include_tag 'jquery-1.9.0.min', (Padrino.env == :production ? 'bootstrap/bootstrap.min' : %w[bootstrap/affix bootstrap/alert bootstrap/button bootstrap/carousel bootstrap/collapse bootstrap/dropdown  bootstrap/tooltip bootstrap/transition  bootstrap/modal bootstrap/popover bootstrap/scrollspy bootstrap/tab]), :application
+    = javascript_include_tag 'jquery-1.9.0.min', (Padrino.env == :production ? 'bootstrap/bootstrap.min' : %w[bootstrap/affix bootstrap/alert bootstrap/button bootstrap/carousel bootstrap/collapse bootstrap/dropdown  bootstrap/tooltip bootstrap/transition  bootstrap/modal bootstrap/popover bootstrap/scrollspy bootstrap/tab]), :application

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

@@ -4,5 +4,5 @@ ul class="nav nav-tabs"
   li class="active" = link_to tag_icon(:edit, pat(:edit)), url(:<%= @orm.name_plural %>, :edit, :id => @<%= @orm.name_singular %>.id)
 
 div class="tabs-content"
-  - form_for :<%= @orm.name_singular %>, url(:<%= @orm.name_plural %>, :update, :id => @<%= @orm.name_singular %>.id), :method => :put, :class => 'form-horizontal' do |f|
+  = form_for :<%= @orm.name_singular %>, url(:<%= @orm.name_plural %>, :update, :id => @<%= @orm.name_singular %>.id), :method => :put, :class => 'form-horizontal' do |f|
     = partial '<%= @orm.name_plural %>/form', :locals => { :f => f }

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

@@ -21,7 +21,7 @@ div class="tabs-content"
                   div class='arrow'
                   h3 class='popover-title' = pat(:delete_selected_title)
                   div class='popover-content'
-                    - form_tag url(:<%= @orm.name_plural %>, :destroy_many), :method => :delete do
+                    = form_tag url(:<%= @orm.name_plural %>, :destroy_many), :method => :delete do
                       = hidden_field_tag :<%= @orm.name_singular %>_ids, :'data-delete-many-ids' => true
                       = submit_tag  pat(:delete), :class =>'list-menu-popover-delete-selected-btn btn btn-danger btn-small'
                       div class='btn btn-default btn-small cancel' = pat(:cancel)
@@ -51,6 +51,6 @@ div class="tabs-content"
                 div class='arrow'
                 h3 class='popover-title' = pat(:delete, :model => "<%= @orm.name_singular %>")
                 div class='popover-content'
-                  - form_tag url(:<%= @orm.name_plural %>, :destroy, :id => <%= @orm.name_singular %>.id), :method => :delete do
+                  = form_tag url(:<%= @orm.name_plural %>, :destroy, :id => <%= @orm.name_singular %>.id), :method => :delete do
                     = submit_tag pat(:delete), :class =>'list-row-action-popover-delete-one-btn btn btn-danger btn-small'
-                    div class='btn btn-default btn-small cancel' = pat(:cancel)
+                    div class='btn btn-default btn-small cancel' = pat(:cancel)

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

@@ -3,5 +3,5 @@ ul class="nav nav-tabs"
   li class="active" = link_to tag_icon(:plus, pat(:new)), url(:<%= @orm.name_plural %>, :new)
 
 div class="tabs-content"
-  - form_for :<%= @orm.name_singular %>, url(:<%= @orm.name_plural %>, :create), :class => 'form-horizontal' do |f|
+  = form_for :<%= @orm.name_singular %>, url(:<%= @orm.name_plural %>, :create), :class => 'form-horizontal' do |f|
     = partial '<%= @orm.name_plural %>/form', :locals => { :f => f }

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

@@ -63,7 +63,7 @@ module Padrino
         # Store in session[:return_to] the env['REQUEST_URI'].
         #
         def store_location!
-          session[:return_to] = env['REQUEST_URI']
+          session[:return_to] = "#{ENV['RACK_BASE_URI']}#{env['REQUEST_URI']}" if env['REQUEST_URI']
         end
 
         ##

data/padrino-admin.gemspec

@@ -14,6 +14,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = ">= 1.3.6"
   s.version = Padrino.version
   s.date = Time.now.strftime("%Y-%m-%d")
+  s.license = "MIT"
 
   s.extra_rdoc_files = Dir["*.rdoc"]
   s.files         = `git ls-files`.split("\n")

data/test/test_admin_application.rb

@@ -6,6 +6,26 @@ describe "AdminApplication" do
     load_fixture 'data_mapper'
   end
 
+  describe "session id setting" do
+    it "should provide it if it doesn't exist" do
+      mock_app do
+        register Padrino::Admin::AccessControl
+      end
+
+      assert_equal @app.session_id, "_padrino_#{File.basename(Padrino.root)}_#{@app.app_name}".to_sym
+    end
+
+    # it "should preserve it if it already existed" do
+    #   Padrino.configure_apps { enable :sessions; set :session_id, "foo" }
+
+    #   mock_app do
+    #     register Padrino::Admin::AccessControl
+    #   end
+
+    #   assert_equal @app.session_id, "foo"
+    # end
+  end
+
   it 'should require correctly login' do
     mock_app do
       register Padrino::Admin::AccessControl

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-admin
 version: !ruby/object:Gem::Version
-  version: 0.11.4
+  version: 0.12.0.rc1
 platform: ruby
 authors:
 - Padrino Team
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-24 00:00:00.000000000 Z
+date: 2013-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: padrino-core
@@ -19,28 +19,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.4
+        version: 0.12.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.4
+        version: 0.12.0.rc1
 - !ruby/object:Gem::Dependency
   name: padrino-helpers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.4
+        version: 0.12.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.4
+        version: 0.12.0.rc1
 - !ruby/object:Gem::Dependency
   name: therubyracer
   requirement: !ruby/object:Gem::Requirement
@@ -265,7 +265,8 @@ files:
 - test/test_admin_application.rb
 - test/test_locale.rb
 homepage: http://www.padrinorb.com
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options:
@@ -279,9 +280,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: 1.3.6
+      version: 1.3.1
 requirements: []
 rubyforge_project: padrino-admin
 rubygems_version: 2.0.6