padrino-admin 0.11.3 → 0.11.4

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

@@ -16,8 +16,8 @@
     <div class="custom-error text-center">
       <div class="custom-error-body muted"><%%= yield %></div>
       <div class="custom-error-footer">
-        <%%= link_to tag_icon('arrow-left'),"#", :onclick => "history.go(-1);return false;", :class =>"custom-error-go-back btn pull-left", :title => "Go back" %>
+        <%%= link_to tag_icon('arrow-left'),"#", :onclick => "history.go(-1);return false;", :class =>"custom-error-go-back btn btn-default pull-left", :title => "Go back" %>
       </div>
     </div>
   </body>
-</html>
+</html>

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

@@ -20,15 +20,15 @@
 
         <%%= [:error, :warning, :success, :notice].map { |type| flash_tag(type, :class => "alert alert-#{type} fade in", :bootstrap => true) }.join.html_safe %>
 
-        <fieldset class="control-group">
-          <label for="email" class="login-input-label control-label"><%%= pat('login.email') %></label>
-          <div class="login-controls controls"><%%= email_field_tag :email, :value => params[:email], :autofocus => true %></div>
-        </fieldset>
+        <div class="form-group">
+          <label for="email" class="col-lg-2 control-label"><%%= pat('login.email') %></label>
+          <div class="col-lg-10"><%%= email_field_tag :email, :value => params[:email], :autofocus => true, :class => 'form-control' %></div>
+        </div>
 
-        <fieldset class="control-group">
-          <label for="password" class="login-input-label control-label"><%%= pat('login.password') %></label>
-          <div class="login-controls controls"><%%= password_field_tag :password, :value => params[:password] %></div>
-        </fieldset>
+        <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>
 
         <fieldset class="login-control-group-last control-group">
           <div class="login-controls controls">
@@ -41,4 +41,4 @@
     <%% end %>
     <%%= 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 %>
   </body>
-</html>
+</html>

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

@@ -3,7 +3,7 @@
 <fieldset class='control-group <%%= error ? 'has-error' : ''%>'>
   <%%= f.label :<%= column[:name] %>, :class => 'control-label' %>
   <div class='controls'>
-    <%%= f.<%= column[:field_type] %> :<%= column[:name] %>, :class => 'input-xlarge input-with-feedback'<%- if (index == 0) -%>, :autofocus => true<%- end -%> %>
+    <%%= f.<%= column[:field_type] %> :<%= column[:name] %>, :class => 'form-control input-xlarge input-with-feedback'<%- if (index == 0) -%>, :autofocus => true<%- end -%> %>
     <span class='help-inline'><%%= error ? f.error_message_on(:<%= column[:name] %>) : "Ex: a simple text" %></span>
   </div>
 </fieldset>
@@ -14,5 +14,5 @@
   &nbsp;
   <%%= f.submit pat(:save_and_continue), :class => 'btn btn-info', :name => 'save_and_continue' %>
   &nbsp;
-  <%%= link_to pat(:cancel), url(:<%= @orm.name_plural %>, :index), :class => 'btn' %>
-</div>
+  <%%= link_to pat(:cancel), url(:<%= @orm.name_plural %>, :index), :class => 'btn btn-default' %>
+</div>

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

@@ -28,7 +28,7 @@
                     <%% 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-small cancel'><%%= pat(:cancel) %></div>
+                      <div class='btn btn-default btn-small cancel'><%%= pat(:cancel) %></div>
                     <%% end %>
                   </div>
                 </div>
@@ -67,7 +67,7 @@
                  <div class=popover-content>
                    <%%- 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-small cancel"><%%= pat(:cancel) %></div>
+                     <div class="btn btn-default btn-small cancel"><%%= pat(:cancel) %></div>
                    <%% end %>
                </div>
              </div>
@@ -75,4 +75,4 @@
       <%% end %>
     </tbody>
   </table>
-</div>
+</div>

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

@@ -15,4 +15,4 @@
     .custom-error.text-center
       .custom-error-body.muted= yield
       .custom-error-footer
-        =link_to tag_icon('arrow-left'), "#", :onclick => "history.go(-1);return false;", :class =>"custom-error-go-back btn pull-left", :title => "Go back"
+        =link_to tag_icon('arrow-left'), "#", :onclick => "history.go(-1);return false;", :class =>"custom-error-go-back btn btn-default pull-left", :title => "Go back"

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

@@ -17,12 +17,14 @@
       .login-body.modal-body
         = [:error, :warning, :notice].map { |type| flash_tag(type, :class => "alert alert-#{type} fade in", :bootstrap => true) }.join.html_safe
 
-        %fieldset.control-group
-          %label.login-input-label.control-label{:for => :email}= pat('login.email')
-          .login-controls.controls=email_field_tag :email, :value => params[:email], :autofocus => true
-        %fieldset.control-group
-          %label.login-input-label.control-label{:for => :password}= pat('login.password')
-          .login-controls.controls=password_field_tag :password, :value => params[:password]
+        .form-group
+          %label.col-lg-2.control-label{:for => :email}= pat('login.email')
+          .col-lg-10=email_field_tag :email, :value => params[:email], :autofocus => true, :class =>'form-control'
+
+        .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'
+
         %fieldset.login-control-group-last.control-group
           .login-controls.controls
             %label.login-bypass-label.checkbox
@@ -32,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/_form.haml.tt

@@ -3,7 +3,7 @@
 %fieldset.control-group{:class => error ? 'has-error' : ''}
   =f.label :<%= column[:name] %>, :class => 'control-label'
   .controls
-    <% if column[:field_type] == :text_area %>~<% else %>=<% end %>f.<%= column[:field_type] %> :<%= column[:name] %>, :class => 'input-xlarge input-with-feedback'<%- if (index == 0) -%>, :autofocus => true<%- end -%>
+    <% if column[:field_type] == :text_area %>~<% else %>=<% end %>f.<%= column[:field_type] %> :<%= column[:name] %>, :class => 'form-control input-large input-with-feedback'<%- if (index == 0) -%>, :autofocus => true<%- end -%>
 
     %span.help-inline=error ? f.error_message_on(:<%= column[:name] %>, :class => 'text-error') : pat(:example)
 <%- end -%>
@@ -13,4 +13,4 @@
   &nbsp;
   =f.submit pat(:save_and_continue), :class => 'btn btn-info', :name => 'save_and_continue'
   &nbsp;
-  =link_to pat(:cancel), url(:<%= @orm.name_plural %>, :index), :class => 'btn'
+  =link_to pat(:cancel), url(:<%= @orm.name_plural %>, :index), :class => 'btn btn-default'

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

@@ -25,7 +25,7 @@
                     -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-small.cancel=pat(:cancel)
+                      .btn.btn-default.btn-small.cancel=pat(:cancel)
         <%- @orm.columns.each_with_index do |column, i| -%>
         %th.header= mat(:<%= @orm.name_singular %>, :<%= column.name %>)
         <%- end -%>
@@ -55,4 +55,4 @@
                 .popover-content
                   -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-small.cancel=pat(:cancel)
+                    .btn.btn-default.btn-small.cancel=pat(:cancel)

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

@@ -12,7 +12,7 @@
   end
 
   post :create do
-    @<%= @orm.name_singular %> = <%= @orm.build("params[:#{@orm.name_singular}]") %>
+    @<%= @orm.name_singular %> = <%= @orm.build("params[:#{@orm.name_param}]") %>
     if <%= @orm.save %>
       @title = pat(:create_title, :model => "<%= @orm.name_singular %> #{@<%= @orm.name_singular %>.id}")
       flash[:success] = pat(:create_success, :model => '<%= @orm.klass_name %>')
@@ -39,7 +39,7 @@
     @title = pat(:update_title, :model => "<%= @orm.name_singular %> #{params[:id]}")
     @<%= @orm.name_singular %> = <%= @orm.find("params[:id]") %>
     if @<%= @orm.name_singular %>
-      if <%= @orm.update_attributes("params[:#{@orm.name_singular}]") %>
+      if <%= @orm.update_attributes("params[:#{@orm.name_param}]") %>
         flash[:success] = pat(:update_success, :model => '<%= @orm.name_singular.capitalize %>', :id =>  "#{params[:id]}")
         params[:save_and_continue] ?
           redirect(url(:<%= @orm.name_plural %>, :index)) :
@@ -76,7 +76,7 @@
       flash[:error] = pat(:destroy_many_error, :model => '<%= @orm.name_singular %>')
       redirect(url(:<%= @orm.name_plural %>, :index))
     end
-    ids = params[:<%= @orm.name_singular %>_ids].split(',').map(&:strip)
+    ids = params[:<%= @orm.name_param %>_ids].split(',').map(&:strip)
     <%= @orm.name_plural %> = <%= @orm.find_by_ids("ids") %>
     <% if @orm.name_singular == @admin_model %>
     if <%= @orm.name_plural %>.include? current_account

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

@@ -16,4 +16,4 @@ html lang="en" xmlns="http://www.w3.org/1999/xhtml"
     div class="custom-error text-center"
       div class="custom-error-body muted" = yield
       div class="custom-error-footer"
-        = link_to tag_icon('arrow-left'),"#", :onclick => "history.go(-1);return false;", :class =>"custom-error-go-back btn pull-left", :title => "Go Back"
+        = link_to tag_icon('arrow-left'),"#", :onclick => "history.go(-1);return false;", :class =>"custom-error-go-back btn btn-default pull-left", :title => "Go Back"

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

@@ -18,12 +18,14 @@ html lang="en" xmlns="http://www.w3.org/1999/xhtml"
         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
 
-          fieldset class='control-group'
-            label for="email" class='login-input-label control-label' = pat('login.email')
-            div class='login-controls controls' = email_field_tag :email, :value => params[:email], :autofocus => true
-          fieldset class='control-group'
-            label for='password' class='login-input-label control-label' = pat('login.password')
-            div class='login-controls controls' = password_field_tag :password, :value => params[:password]
+          div class='form-group'
+            label for="email" class='col-lg-2 control-label' = pat('login.email')
+            div class='col-lg-10'  = email_field_tag :email, :value => params[:email], :autofocus => true, :class => 'form-control'
+
+          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'
+
           fieldset class='login-control-group-last control-group'
             div class='login-controls controls'
               label class="login-bypass-label checkbox"
@@ -32,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/_form.slim.tt

@@ -3,7 +3,7 @@
 fieldset class='control-group#{error ? ' has-error' : ''}'
   = f.label :<%= column[:name] %>, :class => 'control-label'
   div class='controls'
-    = f.<%= column[:field_type] %> :<%= column[:name] %>, :class => 'input-xlarge input-with-feedback'<%- if (index == 0) -%>, :autofocus => true<%- end -%>
+    = f.<%= column[:field_type] %> :<%= column[:name] %>, :class => 'form-control input-large input-with-feedback'<%- if (index == 0) -%>, :autofocus => true<%- end -%>
 
     span class='help-inline' = error ? f.error_message_on(:<%= column[:name] %>, :class => 'text-error') : pat(:example)
 <%- end -%>
@@ -13,4 +13,4 @@ div class="form-actions"
   |&nbsp;
   = f.submit pat(:save_and_continue), :class => 'btn btn-info', :name => 'save_and_continue'
   |&nbsp;
-  = link_to pat(:cancel), url(:<%= @orm.name_plural %>, :index), :class => 'btn'
+  = link_to pat(:cancel), url(:<%= @orm.name_plural %>, :index), :class => 'btn btn-default'

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

@@ -24,7 +24,7 @@ div class="tabs-content"
                     - 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-small cancel' = pat(:cancel)
+                      div class='btn btn-default btn-small cancel' = pat(:cancel)
         <%- @orm.columns.each_with_index do |column, i| -%>
         th class='header' = mat(:<%= @orm.name_singular %>, :<%= column.name %>)
         <%- end -%>
@@ -53,4 +53,4 @@ div class="tabs-content"
                 div class='popover-content'
                   - 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-small cancel' = pat(:cancel)
+                    div class='btn btn-default btn-small cancel' = pat(:cancel)

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

@@ -13,14 +13,14 @@ module Padrino
         end
 
         ##
-        # Returns the current_account, it's an instance of <tt>Account</tt> model
+        # Returns the current_account, it's an instance of Account model.
         #
         def current_account
           @current_account ||= login_from_session
         end
 
         ##
-        # Override the current_account, you must provide an instance of Account Model
+        # Override the current_account, you must provide an instance of Account model.
         #
         # @example
         #     set_current_account(Account.authenticate(params[:email], params[:password])
@@ -31,7 +31,7 @@ module Padrino
         end
 
         ##
-        # Returns true if the +current_account+ is allowed to see the requested path
+        # Returns true if the +current_account+ is allowed to see the requested path.
         #
         # For configure this role please refer to: +Padrino::Admin::AccessControl::Base+
         #
@@ -40,7 +40,7 @@ module Padrino
         end
 
         ##
-        # Returns project modules for the current account
+        # Returns project modules for the current account.
         #
         def project_modules
           access_control.project_modules(current_account)
@@ -60,7 +60,7 @@ module Padrino
         end
 
         ##
-        # Store in session[:return_to] the env['REQUEST_URI']
+        # Store in session[:return_to] the env['REQUEST_URI'].
         #
         def store_location!
           session[:return_to] = env['REQUEST_URI']
@@ -68,7 +68,7 @@ module Padrino
 
         ##
         # Redirect the account to the page that requested an authentication or
-        # if the account is not allowed/logged return it to a default page
+        # if the account is not allowed/logged return it to a default page.
         #
         def redirect_back_or_default(default)
           return_to = session.delete(:return_to)
@@ -76,37 +76,37 @@ module Padrino
         end
 
         private
-          def access_denied
-            # If we have a login_page we redirect the user
-            if login_page
-              redirect(login_page)
-            # If no match we halt with 401
-            else
-              halt 401, "You don't have permission for this resource"
-            end
-          end
 
-          def login_page
-            login_page ||= settings.login_page rescue nil
-            return unless login_page
-            login_page = File.join(ENV['RACK_BASE_URI'].to_s, login_page) if ENV['RACK_BASE_URI']
-            login_page
+        def access_denied
+          # If we have a login_page we redirect the user
+          if login_page
+            redirect(login_page)
+          else
+            halt 401, "You don't have permission for this resource"
           end
+        end
 
-          def store_location
-            settings.store_location rescue nil
-          end
+        def login_page
+          login_page ||= settings.login_page rescue nil
+          return unless login_page
+          login_page = File.join(ENV['RACK_BASE_URI'].to_s, login_page) if ENV['RACK_BASE_URI']
+          login_page
+        end
 
-          def login_from_session
-            admin_model_obj.find_by_id(session[settings.session_id]) if admin_model_obj
-          end
+        def store_location
+          settings.store_location rescue nil
+        end
 
-          def admin_model_obj
-            @_admin_model_obj ||= settings.admin_model.constantize
-          rescue NameError => e
-            raise Padrino::Admin::AccessControlError, "You must define an #{settings.admin_model} Model!"
-          end
-      end # AuthenticationHelpers
-    end # Helpers
-  end # Admin
-end # Padrino
+        def login_from_session
+          admin_model_obj.find_by_id(session[settings.session_id]) if admin_model_obj
+        end
+
+        def admin_model_obj
+          @_admin_model_obj ||= settings.admin_model.constantize
+        rescue NameError
+          raise Padrino::Admin::AccessControlError, "You must define an #{settings.admin_model} Model!"
+        end
+      end
+    end
+  end
+end

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

@@ -1,34 +1,28 @@
 module Padrino
   module Admin
-    ##
-    # Contains all admin related helpers.
-    #
     module Helpers
-      ##
-      # Admin helpers
-      #
       module ViewHelpers
         ##
-        # Icon's Bootstrap helper
+        # Icon's Bootstrap helper.
         #
         # @param [Symbol] icon
-        #  The specified icon type
+        #  The specified icon type.
         #
         # @param [Symbol] tag
         #   The HTML tag.
         #
-        # @return [String] html tag with prepend icon
+        # @return [String] HTML tag with prepend icon
         #
         # @example
         #   tag_icon(:edit, :list)
         #
         def tag_icon(icon, tag = nil)
-          content = content_tag(:i, '', :class=> "icon-#{icon.to_s}")
-          content << " #{tag.to_s}"
+          content = content_tag(:i, '', :class=> "icon-#{icon}")
+          content << " #{tag}"
         end
 
         ##
-        # Translates a given word for padrino admin
+        # Translates a given word for padrino admin.
         #
         # @param [String] word
         #  The specified word to admin translate.
@@ -44,7 +38,7 @@ module Padrino
         #   # => t("padrino.admin.profile",  :default => "My Profile")
         #   pat(:profile, "My Profile")
         #
-        def padrino_admin_translate(word,*args)
+        def padrino_admin_translate(word, *args)
           options = args.extract_options!
           options[:default] ||= word.to_s.humanize
           t("padrino.admin.#{word}", options)
@@ -72,7 +66,7 @@ module Padrino
         alias :mat :t_attr
 
         ##
-        # Translates model name
+        # Translates model name.
         #
         # @param [Symbol] attribute
         #  The attribute name in the model to translate.
@@ -87,8 +81,7 @@ module Padrino
           t("models.#{model}.name", :default => model.to_s.humanize)
         end
         alias :mt :model_translate
-
-      end # ViewHelpers
-    end # Helpers
-  end # Admin
-end # Padrino
+      end
+    end
+  end
+end

data/lib/padrino-admin/utils/crypt.rb

@@ -7,13 +7,13 @@ module Padrino
     #
     module Utils
       ##
-      # This util it's used for encrypt/decrypt password.
+      # This Util it's used for encrypt/decrypt password.
       # We want password decryptable because generally for our sites we have: password_lost.
       # We prefer send original password instead reset them.
       #
       module Crypt
         ##
-        # Decrypts the current string using the current key specified
+        # Decrypts the current string using the current key specified.
         #
         def decrypt(password)
           cipher = build_cipher(:decrypt, password)
@@ -21,20 +21,21 @@ module Padrino
         end
 
         ##
-        # Encrypts the current string using the current key and algorithm specified
+        # Encrypts the current string using the current key and algorithm specified.
         #
         def encrypt(password)
           cipher = build_cipher(:encrypt, password)
           [cipher.update(self) + cipher.final].pack('m').chomp
         end
 
-      private
-        def build_cipher(type, password) # @private
+        private
+
+        def build_cipher(type, password)
           cipher = OpenSSL::Cipher::Cipher.new("DES-EDE3-CBC").send(type)
           cipher.pkcs5_keyivgen(password)
           cipher
         end
-      end # Crypt
-    end # Utils
-  end # Admin
-end # Padrino
+      end
+    end
+  end
+end

data/lib/padrino-admin.rb

@@ -1,22 +1,22 @@
+require 'active_support/core_ext/array/conversions'
 require 'padrino-core'
 require 'padrino-helpers'
-require 'active_support/core_ext/array/conversions'
 
 FileSet.glob_require('padrino-admin/*.rb', __FILE__)
 FileSet.glob_require('padrino-admin/{helpers,utils}/*.rb', __FILE__)
 
 
 ##
-# Load our Padrino::Admin locales
+# Load our Padrino::Admin locales.
 #
 # I18n.load_path = Dir["#{File.dirname(__FILE__)}/padrino-admin/locale/*.yml"]
 
 module Padrino
   ##
-  # Padrino::Admin is beautiful Ajax Admin, with these fatures:
+  # Padrino::Admin is beautiful Ajax Admin, with these features:
   #
   # Orm Agnostic:: Adapters for datamapper, activerecord, mongomapper, couchdb (now only: datamapper and activerecord), ohm
-  # Authentication:: Support for Account authentication, Account Permission managment
+  # Authentication:: Support for Account authentication, Account Permission management
   # Scaffold:: You can simply create a new "admin interface" simply providing a Model
   # Ajax Uploads:: You can upload file, manage them and attach them to any model in a quick and simple way (coming soon)
   #
@@ -40,5 +40,4 @@ begin
   require 'padrino-gen'
   Padrino::Generators.load_paths << Dir[File.dirname(__FILE__) + '/padrino-admin/generators/{actions,orm,admin_app,admin_page}.rb']
 rescue LoadError
-  # Fail silently
 end

data/test/fixtures/data_mapper.rb

@@ -67,15 +67,16 @@ class Account
   end
 
   private
-    def generate_password
-      return if password.blank?
-      self.salt = Digest::SHA1.hexdigest("--#{Time.now.to_s}--#{email}--") if new?
-      self.crypted_password = password.encrypt(self.salt)
-    end
-
-    def password_required
-      crypted_password.blank? || !password.blank?
-    end
+
+  def generate_password
+    return if password.blank?
+    self.salt = Digest::SHA1.hexdigest("--#{Time.now}--#{email}--") if new?
+    self.crypted_password = password.encrypt(self.salt)
+  end
+
+  def password_required
+    crypted_password.blank? || !password.blank?
+  end
 end
 
 DataMapper.auto_migrate!

data/test/generators/test_account_model_generator.rb

@@ -17,7 +17,7 @@ describe "AccountModelGenerator" do
       @model = "#{@apptmp}/sample_project/models/account.rb"
     end
 
-    it 'should be a activerecord model instance' do
+    it 'should be an activerecord model instance' do
       assert_match_in_file(/class Account < ActiveRecord::Base/m, @model)
     end
   end
@@ -29,7 +29,7 @@ describe "AccountModelGenerator" do
       @model = "#{@apptmp}/sample_project/models/account.rb"
     end
 
-    it 'should be a activerecord model instance' do
+    it 'should be an activerecord model instance' do
       assert_match_in_file(/class Account < ActiveRecord::Base/m, @model)
     end
   end