padrino-admin 0.16.0.pre3 → 0.16.0

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

@@ -16,12 +16,12 @@ 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'
+            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 class='navbar-logout'
-              = button_to pat(:logout), url(:sessions, :destroy), :method => :delete, :class => 'navbar-nav-form', :submit_options => { :type => :submit, :title => pat(:logout), :class => 'navbar-nav-form-link' } do
+              = button_to pat(:logout), url(:sessions, :destroy), method: :delete, class: 'navbar-nav-form', submit_options: { type: :submit, title: pat(:logout), class: 'navbar-nav-form-link' } do
                 = tag_icon(:'power-off')
 
           ul class='nav navbar-nav pull-left'
@@ -31,7 +31,7 @@ html lang='en'
 
     div class='container main'
       div class='main-wrapper'
-        =  {: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
+        = { 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'
 
@@ -41,9 +41,9 @@ html lang='en'
           ' Copyright &copy; #{Time.now.year} Your Site -
           b Powered by Padrino v.#{Padrino.version}
         ul class='pull-right footer-links'
-          li = link_to tag_icon(:home, 'web'), 'http://www.padrinorb.com', :target => :_blank, :class => 'footer-links-link'
-          li = link_to tag_icon(:heart, 'blog'), 'http://www.padrinorb.com/blog', :target => :_blank, :class => 'footer-links-link'
-          li = link_to tag_icon(:github, 'code'), 'https://github.com/padrino/padrino-framework', :target => :_blank, :class => 'footer-links-link'
-          li = link_to tag_icon(:twitter, 'twitter'), 'http://twitter.com/padrinorb', :target => :_blank, :class => 'footer-links-link'
+          li = link_to tag_icon(:home, 'web'), 'http://www.padrinorb.com', target: :_blank, class: 'footer-links-link'
+          li = link_to tag_icon(:heart, 'blog'), 'http://www.padrinorb.com/blog', target: :_blank, class: 'footer-links-link'
+          li = link_to tag_icon(:github, 'code'), 'https://github.com/padrino/padrino-framework', target: :_blank, class: 'footer-links-link'
+          li = link_to tag_icon(:twitter, 'twitter'), 'http://twitter.com/padrinorb', target: :_blank, class: 'footer-links-link'
 
-    =javascript_include_tag 'jquery-1.11.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.11.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/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 btn-default 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

@@ -12,19 +12,19 @@ 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-logo" = image_tag('logo.png', alt: "Padrino's logo", height: 250, width: 193)
         div class="login-body modal-body"
-          = {: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
+          = { 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')
-            div class='col-lg-10'  = email_field_tag :email, :id => :email, :value => params[:email], :autofocus => true, :class => 'form-control'
+            div class='col-lg-10' = email_field_tag :email, id: :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, :id => :password, :class => 'form-control'
+            div class='col-lg-10' = password_field_tag :password, id: :password, class: 'form-control'
 
           fieldset class='login-control-group-last control-group'
             div class='login-controls controls'
@@ -33,5 +33,5 @@ html lang="en" xmlns="http://www.w3.org/1999/xhtml"
                 | #{pat('login.bypass')}
 
         div class="login-footer modal-footer"
-          = submit_tag(pat('login.sign_in'), :class => 'btn btn-primary pull-right')
+          = submit_tag(pat('login.sign_in'), class: 'btn btn-primary pull-right')
     = javascript_include_tag 'jquery-1.11.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

@@ -1,16 +1,16 @@
 <%- @orm.column_fields.each_with_index do |column, index| -%>
 - error = <%= @orm.has_error(column[:name]) %>
 fieldset class='control-group#{error ? ' has-error' : ''}'
-  = f.label :<%= column[:name] %>, :class => 'control-label'
+  = f.label :<%= column[:name] %>, class: 'control-label'
   div class='controls'
-    = f.<%= column[:field_type] %> :<%= column[:name] %>, :class => 'form-control input-large 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)
+    span class='help-inline' = error ? f.error_message_on(:<%= column[:name] %>, class: 'text-error') : pat(:example)
 <%- end -%>
 
 div class="form-actions"
-  = f.submit pat(:save), :class => 'btn btn-primary'
+  = f.submit pat(:save), class: 'btn btn-primary'
   |&nbsp;
-  = f.submit pat(:save_and_continue), :class => 'btn btn-info', :name => 'save_and_continue'
+  = 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 btn-default'
+  = link_to pat(:cancel), url(:<%= @orm.name_plural %>, :index), class: 'btn btn-default'

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

@@ -1,8 +1,8 @@
 ul class="nav nav-tabs"
   li = link_to tag_icon(:list, pat(:list)), url(:<%= @orm.name_plural %>, :index)
   li = link_to tag_icon(:plus, pat(:new)), url(:<%= @orm.name_plural %>, :new)
-  li class="active" = link_to tag_icon(:edit, pat(:edit)), url(:<%= @orm.name_plural %>, :edit, :id => @<%= @orm.name_singular %>.id)
+  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|
-    = 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-horizontal' do |f|
+    = partial '<%= @orm.name_plural %>/form', locals: { f: f }

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

@@ -12,18 +12,18 @@ div class="tabs-content"
               = tag_icon :magic
               span class='caret'
             ul class='list-menu dropdown-menu' role='dropdown'
-              li class='list-menu-wrapper' = link_to tag_icon('check-square-o', pat(:select_all)), '#', :id => 'select-all', :class => 'list-menu-link'
-              li class='list-menu-wrapper list-menu-wrapper-disabled' = link_to tag_icon('square-o', pat(:deselect_all)), '#', :id => 'deselect-all', :class => 'list-menu-link list-menu-link-disabled'
+              li class='list-menu-wrapper' = link_to tag_icon('check-square-o', pat(:select_all)), '#', id: 'select-all', class: 'list-menu-link'
+              li class='list-menu-wrapper list-menu-wrapper-disabled' = link_to tag_icon('square-o', pat(:deselect_all)), '#', id: 'deselect-all', class: 'list-menu-link list-menu-link-disabled'
               li class='list-menu-divider divider'
               li class='list-menu-wrapper list-menu-wrapper-disabled'
-                = link_to tag_icon('trash-o', pat(:delete_selected)), '#', :id => 'delete-selected', :class => 'list-menu-link list-menu-link-disabled'
+                = link_to tag_icon('trash-o', pat(:delete_selected)), '#', id: 'delete-selected', class: 'list-menu-link list-menu-link-disabled'
                 div class='list-menu-popover-delete-selected popover right'
                   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
-                      = 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'
+                    = 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)
         <%- @orm.columns.each_with_index do |column, i| -%>
         th class='header' = mat(:<%= @orm.name_singular %>, :<%= column.name %>)
@@ -33,7 +33,7 @@ div class="tabs-content"
     tbody
       -@<%= @orm.name_plural %>.each do |<%= @orm.name_singular %>|
         tr class='list-row'
-          td class='list-column list-selectable' = check_box_tag '<%= @orm.name_singular %>_ids[]', :value => <%= @orm.name_singular %>.id, :class => 'list-selectable-checkbox'
+          td class='list-column list-selectable' = check_box_tag '<%= @orm.name_singular %>_ids[]', value: <%= @orm.name_singular %>.id, class: 'list-selectable-checkbox'
           <%- @orm.columns.each_with_index do |column, i| -%>
           <%- if column.name == 'created_at' || column.name == 'updated_at' -%>
           td class='list-column' = time_ago_in_words <%= @orm.name_singular %>.<%= column.name %>
@@ -45,12 +45,12 @@ div class="tabs-content"
           <%- end -%>
           td class='list-column list-row-action'
             div class='list-row-action-wrapper'
-              = link_to tag_icon(:edit), :href => url(:<%= @orm.name_plural %>, :edit, :id => <%= @orm.name_singular %>.id), :rel => :tooltip, :title => "#{pat(:edit)} <%= @orm.name_singular %>", :class => 'list-row-action-wrapper-link'
-              = link_to tag_icon('trash-o'), :rel => :tooltip, :title => "#{pat(:delete)} <%= @orm.name_singular %>", :class => 'list-row-action-delete-one list-row-action-wrapper-link'
+              = link_to tag_icon(:edit), url(:<%= @orm.name_plural %>, :edit, id: <%= @orm.name_singular %>.id), rel: :tooltip, title: "#{pat(:edit)} <%= @orm.name_singular %>", class: 'list-row-action-wrapper-link'
+              = link_to tag_icon('trash-o'), rel: :tooltip, title: "#{pat(:delete)} <%= @orm.name_singular %>", class: 'list-row-action-delete-one list-row-action-wrapper-link'
               div class='popover list-row-action-popover-delete-one left'
                 div class='arrow'
-                h3 class='popover-title' = pat(:delete, :model => "<%= @orm.name_singular %>")
+                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
-                    = submit_tag pat(:delete), :class =>'list-row-action-popover-delete-one-btn btn btn-danger btn-small'
+                  = 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)

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|
-    = partial '<%= @orm.name_plural %>/form', :locals => { :f => 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

@@ -25,8 +25,8 @@ module Padrino
         # @example
         #     set_current_account(Account.authenticate(params[:email], params[:password])
         #
-        def set_current_account(account=nil)
-          session[settings.session_id] = account ? account.id : nil
+        def set_current_account(account = nil)
+          session[settings.session_id] = account&.id
           @current_account = account
         end
 
@@ -53,10 +53,10 @@ module Padrino
         # By default this method is used in Admin Apps.
         #
         def login_required
-          unless allowed?
-            store_location! if store_location
-            access_denied
-          end
+          return if allowed?
+
+          store_location! if store_location
+          access_denied
         end
 
         ##
@@ -94,7 +94,7 @@ module Padrino
         end
 
         def login_from_session
-          admin_model_obj.find_by_id(session[settings.session_id]) if admin_model_obj
+          admin_model_obj&.find_by_id(session[settings.session_id])
         end
 
         def admin_model_obj

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

@@ -17,7 +17,7 @@ module Padrino
         #   tag_icon(:edit, :list)
         #
         def tag_icon(icon, tag = nil)
-          content = content_tag(:i, '', :class=> "fa fa-#{icon}")
+          content = content_tag(:i, '', class: "fa fa-#{icon}")
           content << " #{tag}"
         end
 
@@ -32,10 +32,10 @@ module Padrino
         # @return [String] The translated word for the current locale.
         #
         # @example
-        #   # => t("padrino.admin.profile",  :default => "Profile")
+        #   # => t('padrino.admin.profile', default: 'Profile')
         #   pat(:profile)
         #
-        #   # => t("padrino.admin.profile",  :default => "My Profile")
+        #   # => t('padrino.admin.profile', default: 'My Profile')
         #   pat(:profile, "My Profile")
         #
         def padrino_admin_translate(word, *args)
@@ -43,7 +43,7 @@ module Padrino
           options[:default] ||= word.to_s.humanize
           t("padrino.admin.#{word}", options)
         end
-        alias :pat :padrino_admin_translate
+        alias pat padrino_admin_translate
 
         ##
         # Translates attribute name for the given model.
@@ -56,14 +56,14 @@ module Padrino
         # @return [String] The translated attribute name for the current locale.
         #
         # @example
-        #   # => t("models.account.attributes.email", :default => "Email")
+        #   # => t('models.account.attributes.email', default: 'Email')
         #   mat(:account, :email)
         #
         def model_attribute_translate(model, attribute)
-          t("models.#{model}.attributes.#{attribute}", :default => attribute.to_s.humanize)
+          t("models.#{model}.attributes.#{attribute}", default: attribute.to_s.humanize)
         end
-        alias :t_attr :model_attribute_translate
-        alias :mat :t_attr
+        alias t_attr model_attribute_translate
+        alias mat t_attr
 
         ##
         # Translates model name.
@@ -74,13 +74,13 @@ module Padrino
         # @return [String] The translated model name for the current locale.
         #
         # @example
-        #   # => t("models.account.name", :default => "Account")
+        #   # => t('models.account.name', default: 'Account')
         #   mt(:account)
         #
         def model_translate(model)
-          t("models.#{model}.name", :default => model.to_s.humanize)
+          t("models.#{model}.name", default: model.to_s.humanize)
         end
-        alias :mt :model_translate
+        alias mt model_translate
       end
     end
   end

data/lib/padrino-admin.rb

@@ -17,9 +17,9 @@ module Padrino
     class << self
       def registered(app)
         # Load Padrino::Admin locales
-        I18n.load_path += Dir["#{File.dirname(__FILE__)}/padrino-admin/locale/**/*.yml"]
+        I18n.load_path += Dir["#{__dir__}/padrino-admin/locale/**/*.yml"]
       end
-      alias :included :registered
+      alias included registered
     end
   end
 end
@@ -29,6 +29,7 @@ end
 #
 begin
   require 'padrino-gen'
-  Padrino::Generators.load_paths << Dir[File.dirname(__FILE__) + '/padrino-admin/generators/{actions,orm,admin_app,admin_page}.rb']
+  Padrino::Generators.load_paths << Dir["#{__dir__}/padrino-admin/generators/{actions,orm,admin_app,admin_page}.rb"]
 rescue LoadError
+  # do nothing if padrino-gen is not available
 end

data/padrino-admin.gemspec

@@ -1,29 +1,29 @@
 #!/usr/bin/env gem build
 # encoding: utf-8
 
-require File.expand_path("../../padrino-core/lib/padrino-core/version.rb", __FILE__)
+require File.expand_path('../padrino-core/lib/padrino-core/version.rb', __dir__)
 
 Gem::Specification.new do |s|
-  s.name = "padrino-admin"
-  s.authors = ["Padrino Team", "Nathan Esquenazi", "Davide D'Agostino", "Arthur Chiu"]
-  s.email = "padrinorb@gmail.com"
-  s.summary = "Admin Dashboard for Padrino"
-  s.homepage = "http://www.padrinorb.com"
-  s.description = "Admin View for Padrino applications"
-  s.required_rubygems_version = ">= 1.3.6"
+  s.name = 'padrino-admin'
+  s.authors = ['Padrino Team', 'Nathan Esquenazi', "Davide D'Agostino", 'Arthur Chiu']
+  s.email = 'padrinorb@gmail.com'
+  s.summary = 'Admin Dashboard for Padrino'
+  s.homepage = 'http://www.padrinorb.com'
+  s.description = 'Admin View for Padrino applications'
+  s.required_rubygems_version = '>= 1.3.6'
   s.version = Padrino.version
-  s.date = Time.now.strftime("%Y-%m-%d")
-  s.license = "MIT"
+  s.date = Time.now.strftime('%Y-%m-%d')
+  s.license = 'MIT'
 
-  s.extra_rdoc_files = Dir["*.rdoc"]
+  s.extra_rdoc_files = Dir['*.rdoc']
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
-  s.rdoc_options  = ["--charset=UTF-8"]
+  s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
+  s.require_paths = ['lib']
+  s.rdoc_options  = ['--charset=UTF-8']
 
-  s.add_dependency("padrino-core", Padrino.version)
-  s.add_dependency("padrino-helpers", Padrino.version)
-  s.add_development_dependency("therubyracer", "~> 0.11.1")
-  s.add_development_dependency("less", "~> 2.2.2")
+  s.add_dependency('padrino-core', Padrino.version)
+  s.add_dependency('padrino-helpers', Padrino.version)
+  s.add_development_dependency('therubyracer', '~> 0.11.1')
+  s.add_development_dependency('less', '~> 2.2.2')
 end

data/test/fixtures/sequel.rb

@@ -2,13 +2,13 @@ require 'digest/sha1'
 require 'sequel'
 require 'sequel/extensions/migration'
 
-Sequel::Model.db = 
+Sequel::Model.db =
   if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
-    require 'jdbc/sqlite3' 
-    Sequel.connect("jdbc:sqlite::memory:")
+    require 'jdbc/sqlite3'
+    Sequel.connect('jdbc:sqlite::memory:')
   else
     require 'sqlite3'
-    Sequel.sqlite(":memory:")
+    Sequel.sqlite(':memory:')
   end
 
 migration = Sequel.migration do
@@ -66,8 +66,8 @@ class Account < Sequel::Model
 
   one_to_many :sections
 
-  def self.admin;  first(:role => "admin");  end
-  def self.editor; first(:role => "editor"); end
+  def self.admin;  first(role: 'admin');  end
+  def self.editor; first(role: 'editor'); end
 
   ##
   # Replace ActiveRecord method.
@@ -78,12 +78,12 @@ class Account < Sequel::Model
 end
 
 # We build some fake accounts
-admin  = Account.create(:name => "DAddYE", :role => "admin",  :email => "d.dagostino@lipsiasoft.com",
-                        :password => "some", :password_confirmation => "some")
-editor = Account.create(:name => "Dexter", :role => "editor", :email => "editor@lipsiasoft.com",
-                        :password => "some", :password_confirmation => "some")
-
-%w(News Press HowTo).each do |c|
-  admin.add_section(:name => c)
-  editor.add_section(:name => c)
+admin  = Account.create(name: 'DAddYE', role: 'admin',  email: 'd.dagostino@lipsiasoft.com',
+                        password: 'some', password_confirmation: 'some')
+editor = Account.create(name: 'Dexter', role: 'editor', email: 'editor@lipsiasoft.com',
+                        password: 'some', password_confirmation: 'some')
+
+%w[News Press HowTo].each do |c|
+  admin.add_section(name: c)
+  editor.add_section(name: c)
 end

data/test/generators/test_account_model_generator.rb

@@ -1,13 +1,13 @@
-require File.expand_path(File.dirname(__FILE__) + '/../helper')
+require_relative '../helper'
 
-describe "AccountModelGenerator" do
+describe 'AccountModelGenerator' do
   before do
     @apptmp = "#{Dir.tmpdir}/padrino-tests/#{SecureRandom.hex}"
-    %x[mkdir -p #{@apptmp}]
+    `mkdir -p #{@apptmp}`
   end
 
   after do
-    %[rm -rf #{@apptmp}]
+    %(rm -rf #{@apptmp})
   end
 
   describe 'activerecord' do

data/test/generators/test_admin_app_generator.rb

@@ -1,6 +1,6 @@
-require File.expand_path(File.dirname(__FILE__) + '/../helper')
+require_relative '../helper'
 
-describe "AdminAppGenerator" do
+describe 'AdminAppGenerator' do
   before do
     @apptmp = "#{Dir.tmpdir}/padrino-tests/#{SecureRandom.hex}"
     `mkdir -p #{@apptmp}`
@@ -18,7 +18,7 @@ describe "AdminAppGenerator" do
     end
 
     it 'should fail outside app root' do
-      out, err = capture_io { generate(:admin_app, "-r=#{@apptmp}") }
+      out, = capture_io { generate(:admin_app, "-r=#{@apptmp}") }
       assert_match(/not at the root/, out)
       assert_no_file_exists("#{@apptmp}/admin")
     end
@@ -28,12 +28,12 @@ describe "AdminAppGenerator" do
       assert_raises(SystemExit) { @out, @err = capture_io { generate(:admin_app, "-r=#{@apptmp}/sample_project") } }
     end
 
-    it "should store and apply session_secret" do
-      capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=datamapper','-e=haml') }
+    it 'should store and apply session_secret' do
+      capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=datamapper', '-e=haml') }
       assert_match_in_file(/set :session_secret, '[0-9A-z]*'/, "#{@apptmp}/sample_project/config/apps.rb")
     end
 
-    it "should generate the admin app" do
+    it 'should generate the admin app' do
       capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=activerecord') }
       capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
       assert_dir_exists("#{@apptmp}/sample_project")
@@ -53,20 +53,20 @@ describe "AdminAppGenerator" do
       assert_file_exists("#{@apptmp}/sample_project/models/account.rb")
       assert_file_exists("#{@apptmp}/sample_project/db/seeds.rb")
       assert_file_exists("#{@apptmp}/sample_project/db/migrate/001_create_accounts.rb")
-      assert_match_in_file 'Padrino.mount("SampleProject::Admin", :app_file => Padrino.root(\'admin/app.rb\')).to("/admin")', "#{@apptmp}/sample_project/config/apps.rb"
+      assert_match_in_file %(Padrino.mount('SampleProject::Admin', app_file: Padrino.root('admin/app.rb')).to('/admin')), "#{@apptmp}/sample_project/config/apps.rb"
       assert_match_in_file 'module SampleProject', "#{@apptmp}/sample_project/admin/app.rb"
       assert_match_in_file 'class Admin < Padrino::Application', "#{@apptmp}/sample_project/admin/app.rb"
-      assert_match_in_file 'role.project_module :accounts, \'/accounts\'', "#{@apptmp}/sample_project/admin/app.rb"
+      assert_match_in_file "role.project_module :accounts, '/accounts'", "#{@apptmp}/sample_project/admin/app.rb"
     end
 
-    it "should generate the master app" do
+    it 'should generate the master app' do
       capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=activerecord') }
       capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project", '--admin-name=master') }
       assert_file_exists("#{@apptmp}/sample_project/master/app.rb")
     end
 
     # users can override certain templates from a generators/templates folder in the destination_root
-    it "should use custom generator templates from the project root, if they exist" do
+    it 'should use custom generator templates from the project root, if they exist' do
       capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=activerecord') }
       custom_template_path = "#{@apptmp}/sample_project/generators/templates/slim/app/layouts/"
       `mkdir -p #{custom_template_path} && echo "h1 = 'Hello, custom generator' " > #{custom_template_path}application.slim.tt`
@@ -74,12 +74,12 @@ describe "AdminAppGenerator" do
       assert_match_in_file(/Hello, custom generator/, "#{@apptmp}/sample_project/admin/views/layouts/application.slim")
     end
 
-    it "should generate the admin app under a different folder" do
-      # TODO FIXME Implement option --admin_root or something. See https://github.com/padrino/padrino-framework/issues/854#issuecomment-14749356
+    it 'should generate the admin app under a different folder' do
+      # TODO: FIXME Implement option --admin_root or something. See https://github.com/padrino/padrino-framework/issues/854#issuecomment-14749356
       skip
     end
 
-    describe "renderers" do
+    describe 'renderers' do
       it 'should correctly generate a new padrino admin application with haml renderer (default)' do
         capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=activerecord', '-e=haml') }
         capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
@@ -143,11 +143,11 @@ describe "AdminAppGenerator" do
       assert_match_in_file(/User/, "#{@apptmp}/sample_project/models/user.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 'role.project_module :users, \'/users\'', "#{@apptmp}/sample_project/admin/app.rb"
+      assert_match_in_file "role.project_module :users, '/users'", "#{@apptmp}/sample_project/admin/app.rb"
     end
 
     it 'should correctly generate a new padrino admin application with model in non-default application path' do
-      # TODO FIXME What's the use case here? Clarify.
+      # TODO: FIXME What's the use case here? Clarify.
       # Remember that --root/-r in the admin_app generator refers to the project's location, not the admin's location
       # inside it. See https://github.com/padrino/padrino-framework/issues/854#issuecomment-14749356
       skip
@@ -179,7 +179,7 @@ describe "AdminAppGenerator" do
       # assert_match_in_file 'role.project_module :accounts, \'/accounts\'', "#{@apptmp}/sample_project/admin/app.rb"
     end
 
-    describe "activerecord middleware" do
+    describe 'activerecord middleware' do
       it 'should add it for #activerecord' do
         capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=activerecord', '-e=haml') }
         capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
@@ -199,7 +199,7 @@ describe "AdminAppGenerator" do
       end
     end
 
-    describe "datamapper middleware" do
+    describe 'datamapper middleware' do
       it 'should add it for #datamapper' do
         capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=datamapper', '-e=haml') }
         capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
@@ -217,13 +217,13 @@ describe "AdminAppGenerator" do
       capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=activerecord', '-e=erb') }
 
       # Add seeds file
-      FileUtils.mkdir_p @apptmp + '/sample_project/db' unless File.exist?(@apptmp + '/sample_project/db')
-      File.open(@apptmp + '/sample_project/db/seeds.rb', 'w+') do |seeds_rb|
-        seeds_rb.puts "# Old Seeds Content"
+      FileUtils.mkdir_p "#{@apptmp}/sample_project/db" unless File.exist?("#{@apptmp}/sample_project/db")
+      File.open("#{@apptmp}/sample_project/db/seeds.rb", 'w+') do |seeds_rb|
+        seeds_rb.puts '# Old Seeds Content'
       end
 
-      out, err = capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
-      refute_match /Overwrite\s.*?\/db\/seeds.rb/, out
+      out, = capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
+      refute_match(%r{Overwrite\s.*?/db/seeds.rb}, out)
 
       assert_file_exists "#{@apptmp}/sample_project/db/seeds.old"
       assert_match_in_file 'Account.new(', "#{@apptmp}/sample_project/db/seeds.rb"