fesplugas-typus 0.9.15 → 0.9.16

data/VERSION

@@ -1 +1 @@
-0.9.15
+0.9.16

data/app/controllers/admin/master_controller.rb

@@ -1,5 +1,7 @@
 class Admin::MasterController < ApplicationController
 
+  unloadable
+
   layout 'admin'
 
   include Typus::Authentication
@@ -106,7 +108,7 @@ class Admin::MasterController < ApplicationController
 
   def edit
     item_params = params.dup
-    %w( action controller model model_id back_to id resource resource_id ).each { |p| item_params.delete(p) }
+    %w( action controller model model_id back_to id resource resource_id page ).each { |p| item_params.delete(p) }
     # We assign the params passed trough the url
     @item.attributes = item_params
     @previous, @next = @item.previous_and_next(item_params)
@@ -263,7 +265,7 @@ private
 
   def check_ownership_of_items
 
-    # If current_user is a root user, by-pass.
+    # By-pass if current_user is root.
     return if @current_user.is_root?
 
     # If current user is not root and @resource has a foreign_key which 
@@ -337,7 +339,7 @@ private
     end
 
     flash[:success] = message || _("{{model_a}} successfully assigned to {{model_b}}.", 
-                                 :model_a => @item.class, 
+                                 :model_a => @item.class.typus_human_name, 
                                  :model_b => resource_class.name)
     redirect_to path || params[:back_to]
 

data/app/controllers/typus_controller.rb

@@ -1,5 +1,7 @@
 class TypusController < ApplicationController
 
+  unloadable
+
   layout :select_layout
 
   include Typus::Authentication
@@ -83,8 +85,7 @@ class TypusController < ApplicationController
         session[:typus_user_id] = @user.id
         redirect_to admin_dashboard_path
       else
-        flash[:error] = _("Passwords don't match.")
-        redirect_to admin_reset_password_path(:token => params[:token])
+        render :action => 'reset_password'
       end
     end
   end
@@ -121,7 +122,7 @@ private
   end
 
   def select_layout
-    [ 'sign_up', 'sign_in', 'sign_out', 'recover_password', 'reset_password' ].include?(action_name) ? 'typus' : 'admin'
+    %w( sign_up sign_in sign_out recover_password reset_password ).include?(action_name) ? 'typus' : 'admin'
   end
 
 end

data/app/helpers/admin/form_helper.rb

@@ -243,16 +243,26 @@ module Admin::FormHelper
                     { Typus.user_fk => @current_user }
                   end
 
-      items = @resource[:class].find(params[:id]).send(field).find(:all, :order => model_to_relate.typus_order_by, :conditions => conditions)
+      options = { :order => model_to_relate.typus_order_by, :conditions => conditions }
+      items_count = @resource[:class].find(params[:id]).send(field).count(:conditions => conditions)
+      items_per_page = model_to_relate.typus_options_for(:per_page).to_i
 
-      unless items.empty?
+      @pager = ::Paginator.new(items_count, items_per_page) do |offset, per_page|
+        options.merge!({:limit => per_page, :offset => offset})
+        items = @resource[:class].find(params[:id]).send(field).find(:all, options)
+      end
+
+      @items = @pager.page(params[:page])
+
+      unless @items.empty?
         options = { :back_to => "#{@back_to}##{field}", :resource => @resource[:self], :resource_id => @item.id }
         html << build_list(model_to_relate, 
                            model_to_relate.typus_fields_for(:relationship), 
-                           items, 
+                           @items, 
                            model_to_relate_as_resource, 
                            options, 
                            association)
+        html << pagination(:anchor => model_to_relate.name.tableize) unless pagination.nil?
       else
         html << <<-HTML
   <div id="flash" class="notice"><p>#{_("There are no {{records}}.", :records => model_to_relate.typus_human_name.pluralize.downcase)}</p></div>

data/app/helpers/admin/master_helper.rb

@@ -65,6 +65,11 @@ module Admin::MasterHelper
 
   end
 
+  def pagination(*args)
+    @options = args.extract_options!
+    render 'admin/shared/pagination' if @items.prev || @items.next
+  end
+
   ##
   # Simple and clean pagination links
   #

data/app/helpers/typus_helper.rb

@@ -22,17 +22,22 @@ module TypusHelper
         HTML
 
         available.compact.each do |model|
-          description = Typus.module_description(model)
-          admin_items_path = { :controller => "admin/#{model.tableize}" }
-          new_admin_item_path = { :controller => "admin/#{model.tableize}", :action => 'new'}
+
+          klass = model.constantize
+          klass_resource = klass.name.tableize
+
+          admin_items_path = { :controller => "admin/#{klass_resource}" }
+          new_admin_item_path = { :controller => "admin/#{klass_resource}", :action => 'new'}
+
           html << <<-HTML
 <tr class="#{cycle('even', 'odd')}">
-<td>#{link_to model.constantize.typus_human_name.pluralize, admin_items_path}<br /><small>#{description}</small></td>
+<td>#{link_to klass.typus_human_name.pluralize, admin_items_path}<br /><small>#{klass.typus_description}</small></td>
 <td class="right"><small>
-#{link_to _("Add"), new_admin_item_path if @current_user.can_perform?(model, 'create')}
+#{link_to _("Add"), new_admin_item_path if @current_user.can_perform?(klass, 'create')}
 </small></td>
 </tr>
           HTML
+
         end
 
         html << <<-HTML
@@ -142,10 +147,12 @@ module TypusHelper
                                    :action => 'edit', 
                                    :id => user.id }
 
+    message = _("Are you sure you want to sign out and end your session?")
+
     <<-HTML
 <ul>
   <li>#{_("Logged as")} #{link_to user.name, admin_edit_typus_user_path, :title => "#{user.email} (#{user.role})"}</li>
-  <li>#{link_to _("Sign out"), admin_sign_out_path }</li>
+  <li>#{link_to _("Sign out"), admin_sign_out_path, { :confirm => message } }</li>
 </ul>
     HTML
 

data/app/views/admin/resources/index.html.erb

@@ -11,7 +11,7 @@
 
 <% unless @items.count.zero? -%>
   <%= build_list(@resource[:class], @fields, @items) %>
-  <%= render :partial => 'admin/shared/pagination' if @items.prev || @items.next %>
+  <%= pagination %>
 <% else %>
   <div id="flash" class="notice">
     <% if @resource[:class].count.zero? %>

data/app/views/admin/shared/_pagination.html.erb

@@ -1,7 +1,7 @@
 <div class="pagination">
 
   <% if @items.prev? %>
-    <%= link_to _("&larr; Previous"), params.merge(:page => @items.prev.number) %>
+    <%= link_to _("&larr; Previous"), params.merge(:page => @items.prev.number, :anchor => @options[:anchor]) %>
   <% else %>
     <span class="disabled"><%= _("&larr; Previous") %></span>
   <% end %>
@@ -13,14 +13,14 @@
       <span class="current"><%= n %></span>
     <% else -%>
       <%= "..." if last_page + 1 < n %>
-      <%= link_to n, params.merge(:page => n) %>
+      <%= link_to n, params.merge(:page => n, :anchor => @options[:anchor]) %>
     <% end -%>
     <% last_page = n -%>
 
   <% end -%>
 
   <% if @items.next? %>
-    <%= link_to _("Next &rarr;"), params.merge(:page => @items.next.number) %>
+    <%= link_to _("Next &rarr;"), params.merge(:page => @items.next.number, :anchor => @options[:anchor]) %>
   <% else %>
     <span class="disabled"><%= _("Next &rarr;") %></span>
   <% end %>

data/app/views/typus/reset_password.html.erb

@@ -2,6 +2,8 @@
 
   <%= hidden_field_tag :token, @user.token %>
 
+  <%= error_messages_for :user, :header_message => nil, :message => nil %>
+
   <ul>
   <li><label for="password"><%= _("Password") %></label>
   <%= password_field :user, :password, :size => 20, :class => 'text' %></li>

data/config/locales/typus/es.yml

@@ -12,7 +12,6 @@ es:
   "That doesn't seem like a valid email address": "Eso no parecia una dirección válida de correo electrónico."
   "I remember my password": "Recuerdo mi contraseña"
   "Password recovery link sent to your email": "Enlace de recuperación de contraseña enviado a tu correo electrónico."
-  "Passwords don't match": "Las Contraseñas no coinciden."
   "A valid token is required": "Se requiere un token válido."
   "The email and/or password you entered is invalid": "El correo y/o la contraseña proporcionadas no son válidas."
   "There are not defined applications in config/typus/*.yml": "There are not defined applications in config/typus/*.yml"
@@ -106,4 +105,5 @@ es:
   "{{model}} filtered by {{filtered_by}}": "{{model}} filtrados por {{filtered_by}}"
   "True": "Verdadero"
   "False": "Falso"
-  "Set language to": "Idioma"
+  "Set language to": "Idioma"
+  "Are you sure you want to sign out and end your session?": 

data/config/locales/typus/language.yml.template

@@ -16,7 +16,6 @@
   "That doesn't seem like a valid email address": 
   "I remember my password": 
   "Password recovery link sent to your email": 
-  "Passwords don't match": 
   "A valid token is required": 
   "The email and/or password you entered is invalid": 
   "There are not defined applications in config/typus/*.yml": 
@@ -110,4 +109,5 @@
   "{{model}} filtered by {{filtered_by}}": 
   "True": 
   "False": 
-  "Set language to": 
+  "Set language to": 
+  "Are you sure you want to sign out and end your session?": 

data/config/locales/typus/pt-BR.yml

@@ -12,7 +12,6 @@ pt-BR:
   "That doesn't seem like a valid email address": "Este não parece um email válido"
   "I remember my password": "Lembro minha senha"
   "Password recovery link sent to your email": "Link para recuperar senha enviado para seu email."
-  "Passwords don't match": "As senhas não conferem."
   "A valid token is required": "É necessário um token válido."
   "The email and/or password you entered is invalid": "O email e/ou a senha que você colocou são inválidos."
   "There are not defined applications in config/typus/*.yml": "Não há aplicativos definidos em config/typus/*.yml"
@@ -108,4 +107,5 @@ pt-BR:
   "{{model}} filtered by {{filtered_by}}": 
   "True": 
   "False": 
-  "Set language to": 
+  "Set language to": 
+  "Are you sure you want to sign out and end your session?": 

data/config/locales/typus/ru.yml

@@ -12,7 +12,6 @@ ru:
   "That doesn't seem like a valid email address": "E-Mail некорректен"
   "I remember my password": "Запомнить пароль"
   "Password recovery link sent to your email": "Ссылка для восставновления пароля выслана по указанному E-Mail"
-  "Passwords don't match": "Пароли не совпадают"
   "A valid token is required": "Необходим корректный ключ"
   "The email and/or password you entered is invalid": "E-Mail или пароль введены неверно"
   "There are not defined applications in config/typus/*.yml": "Ни одного приложения не определено в config/typus/*.yml"
@@ -108,4 +107,5 @@ ru:
   "{{model}} filtered by {{filtered_by}}": 
   "True": 
   "False": 
-  "Set language to": 
+  "Set language to": 
+  "Are you sure you want to sign out and end your session?": 

data/config/routes_hack.rb

@@ -0,0 +1,9 @@
+ActionController::Routing::Routes.draw do |map|
+
+  begin
+    ActionController::Routing::Routes.recognize_path '/admin/typus_users'
+  rescue
+    map.connect ':controller/:action/:id'
+  end
+
+end

data/generators/typus/templates/public/stylesheets/admin/screen.css

@@ -523,6 +523,15 @@ input#search {
     margin: 0.5em 0em;
   }
 
+  #dialog .errorExplanation ul {
+    margin: 10px 0 10px 0px!important;
+  }
+
+  #dialog .errorExplanation li {
+    font-weight: bold;
+    list-style: none!important;
+  }
+
 /* @end */
 
 /* @group Pagination */

data/lib/typus/active_record.rb

@@ -6,9 +6,7 @@ module Typus
 
   module ClassMethods
 
-    ##
     # Return model fields as a OrderedHash
-    #
     def model_fields
       hash = ActiveSupport::OrderedHash.new
       columns.map { |u| hash[u.name.to_sym] = u.type.to_sym }
@@ -35,9 +33,11 @@ module Typus
       human_name(:default => self.name.underscore.humanize)
     end
 
-    ##
+    def typus_description
+      Typus::Configuration.config[self.name]['description']
+    end
+
     # Form and list fields
-    #
     def typus_fields_for(filter)
 
       fields_with_type = ActiveSupport::OrderedHash.new
@@ -92,27 +92,21 @@ module Typus
 
     end
 
-    ##
     # Return tiny_mce options of the model merged into the default options
-    #
     def typus_tiny_mce_options
       typus_options_for(:tiny_mce).merge(Typus::Configuration.config[name]['fields']['options']['tiny_mce']['options'].symbolize_keys.delete_if { |key,value| value == nil})
     rescue
       typus_options_for(:tiny_mce)
     end
 
-    ##
     # Tiny_mce fields of the model
-    #
     def typus_tiny_mce_fields
       Typus::Configuration.config[name]['fields']['options']['tiny_mce']['fields'].split(', ')
     rescue
       []
     end
 
-    ##
     # Typus sidebar filters.
-    #
     def typus_filters
 
       fields_with_type = ActiveSupport::OrderedHash.new
@@ -133,35 +127,26 @@ module Typus
 
     end
 
-    ##
     # Extended actions for this model on Typus.
-    #
     def typus_actions_for(filter)
       Typus::Configuration.config[name]['actions'][filter.to_s].split(', ')
     rescue
       []
     end
 
-    ##
     # Used for +search+, +relationships+
-    #
     def typus_defaults_for(filter)
       data = Typus::Configuration.config[name][filter.to_s]
       return (!data.nil?) ? data.split(', ') : []
     end
 
-    ##
-    #
-    #
     def typus_field_options_for(filter)
       Typus::Configuration.config[name]['fields']['options'][filter.to_s].split(', ').collect { |i| i.to_sym }
     rescue
       []
     end
 
-    ##
     # We should be able to overwrite options by model.
-    #
     def typus_options_for(filter)
 
       data = Typus::Configuration.config[name]
@@ -178,9 +163,7 @@ module Typus
       !data['export'].nil? ? data['export'].split(', ') : []
     end
 
-    ##
-    # Used for order_by
-    #
+    # Used for `order_by`.
     def typus_order_by
 
       fields = typus_defaults_for(:order_by)
@@ -194,9 +177,7 @@ module Typus
 
     end
 
-    ##
     # We are able to define our own booleans.
-    #
     def typus_boolean(attribute = :default)
 
       boolean = Typus::Configuration.config[name]['fields']['options']['booleans'][attribute.to_s] rescue nil
@@ -216,28 +197,21 @@ module Typus
 
     end
 
-    ##
     # We are able to define how to display dates on Typus
-    #
     def typus_date_format(attribute = :default)
       date_format = Typus::Configuration.config[name]['fields']['options']['date_formats'][attribute.to_s].to_sym rescue nil
       date_format = :db if date_format.nil?
       return date_format
     end
 
-    ##
     # We are able to define which template to use to render the attribute 
     # within the form
-    #
     def typus_template(attribute)
       Typus::Configuration.config[name]['fields']['options']['templates'][attribute.to_s]
     rescue
       nil
     end
 
-    ##
-    # Build conditions
-    #
     def build_conditions(params)
 
       conditions, joins = merge_conditions, []
@@ -260,9 +234,9 @@ module Typus
         ##
         # Sidebar filters:
         #
-        #   - Booleans: true, false
-        #   - Datetime: today, past_7_days, this_month, this_year
-        #   - Integer & String: *_id and "selectors" (P.ej. category_id)
+        # - Booleans: true, false
+        # - Datetime: today, past_7_days, this_month, this_year
+        # - Integer & String: *_id and "selectors" (p.ej. category_id)
         #
         case filter_type
         when :boolean

data/lib/typus/authentication.rb

@@ -4,30 +4,25 @@ module Typus
 
     protected
 
-    ##
     # Require login checks if the user is logged on Typus, otherwise 
     # is sent to the sign in page with a :back_to param to return where 
     # she tried to go.
-    #
-    # Use this for demo!
-    #
-    #     session[:typus_user_id] = Typus.user_class.find(:first)
-    #
     def require_login
+
+      # Uncomment the following line for demo purpouses.
+      # session[:typus_user_id] = Typus.user_class.find(:first)
+
       if session[:typus_user_id]
         set_current_user
       else
         back_to = (request.env['REQUEST_URI'] == '/admin') ? nil : request.env['REQUEST_URI']
         redirect_to admin_sign_in_path(:back_to => back_to)
       end
+
     end
 
-    ##
-    # Return the current user.
-    #
-    # NOTE: If role does not longer exist on the system the user will 
-    #       be signed out from Typus.
-    #
+    # Return the current user. If role does not longer exist on the 
+    # system @current_user will be signed out from Typus.
     def set_current_user
 
       @current_user = Typus.user_class.find(session[:typus_user_id])
@@ -51,11 +46,7 @@ module Typus
       redirect_to admin_sign_in_path(:back_to => back_to)
     end
 
-    ##
-    # Action is available on:
-    #
-    #     edit, update, toggle and destroy
-    #
+    # Action is available on: edit, update, toggle and destroy
     def check_if_user_can_perform_action_on_user
 
       return unless @item.kind_of?(Typus.user_class)
@@ -104,10 +95,8 @@ module Typus
 
     end
 
-    ##
     # This method checks if the user can perform the requested action.
     # It works on models, so its available on the admin_controller.
-    #
     def check_if_user_can_perform_action_on_resource
 
       message = case params[:action]
@@ -133,11 +122,9 @@ module Typus
 
     end
 
-    ##
     # This method checks if the user can perform the requested action.
     # It works on resources, which are not models, so its available on 
     # the typus_controller.
-    #
     def check_if_user_can_perform_action_on_resource_without_model
       controller = params[:controller].split('/').last
       action = params[:action]

data/lib/typus/configuration.rb

@@ -2,20 +2,7 @@ module Typus
 
   module Configuration
 
-    ##
-    # Default Typus options which can be overwritten from the 
-    # initializer. Example:
-    #
-    #     Typus::Configuration.options[:recover_password]
-    #
-    # Special cases:
-    #
-    #     Typus::Configuration.options[:user_fk]
-    #     Typus.user_fk
-    #
-    #     Typus::Configuration.options[:user_class_name]
-    #     Typus.user_class
-    #
+    # Default options which can be overwritten from the initializer.
     typus_options = { :app_name => 'Typus', 
                       :config_folder => 'config/typus', 
                       :email => 'admin@example.com', 
@@ -27,12 +14,7 @@ module Typus
                       :user_class_name => 'TypusUser', 
                       :user_fk => 'typus_user_id' }
 
-    ##
-    # Default model options which can be overwritten from the 
-    # initializer. Example:
-    #
-    #    Model.typus_options_for(:default_action_on_item)
-    #
+    # Default options which can be overwritten from the initializer.
     model_options = { :default_action_on_item => 'edit', 
                       :end_year => nil,
                       :form_rows => 10, 
@@ -54,11 +36,7 @@ module Typus
 
     mattr_accessor :options
 
-    ##
     # Read Typus Configuration files placed on <tt>config/typus/**/*.yml</tt>.
-    #
-    #   Typus::Configuration.config! overwrites @@config
-    #
     def self.config!
 
       files = Dir["#{Rails.root}/#{options[:config_folder]}/**/*.yml"].sort
@@ -76,11 +54,7 @@ module Typus
 
     mattr_accessor :config
 
-    ##
     # Read Typus Roles from configuration files placed on <tt>config/typus/**/*_roles.yml</tt>.
-    #
-    #   Typus::Configuration.roles! overwrites @@roles
-    #
     def self.roles!
 
       files = Dir["#{Rails.root}/#{options[:config_folder]}/**/*_roles.yml"].sort

data/lib/typus/format.rb

@@ -26,9 +26,7 @@ module Typus
       fields = @resource[:class].typus_fields_for(:csv).collect { |i| i.first }
       csv_string = FasterCSV.generate do |csv|
         csv << fields.map { |f| _(f.humanize) }
-        data.each do |item|
-          csv << fields.map { |f| item.send(f) }
-        end
+        data.each { |i| csv << fields.map { |f| i.send(f) } }
       end
 
       filename = "#{Time.now.strftime("%Y%m%d%H%M%S")}_#{@resource[:self]}.csv"
@@ -46,7 +44,8 @@ module Typus
     end
 
     def data(*args)
-      options = { :joins => @joins, :conditions => @conditions, :order => @order }
+      eager_loading = @resource[:class].reflect_on_all_associations(:belongs_to).map { |i| i.name }
+      options = { :joins => @joins, :conditions => @conditions, :order => @order, :include => eager_loading }
       options.merge!(args.extract_options!)
       @resource[:class].find(:all, options)
     end

data/lib/typus/generator.rb

@@ -8,7 +8,7 @@ module Typus
     admin_controllers_folder = "#{Rails.root}/app/controllers/admin"
     Dir.mkdir(admin_controllers_folder) unless File.directory?(admin_controllers_folder)
 
-    # Get a list of all available app/controllers/admin
+    # Get a list of controllers under `app/controllers/admin`.
     admin_controllers = Dir["#{Rails.root}/vendor/plugins/*/app/controllers/admin/*.rb", "#{admin_controllers_folder}/*.rb"]
     admin_controllers = admin_controllers.map { |i| File.basename(i) }
 
@@ -22,27 +22,25 @@ module Typus
       Dir.mkdir(admin_controller_tests_folder) unless File.directory?(admin_controller_tests_folder)
     end
 
-    # Get a list of all available functional test for admin.
+    # Get a list of functional tests under `test/functional/admin`.
     admin_controller_tests = Dir["#{Rails.root}/vendor/plugins/*/test/functional/admin/*.rb", "#{admin_controller_tests_folder}/*.rb"]
     admin_controller_tests = admin_controller_tests.map { |i| File.basename(i) }
 
-    # Generate unexisting controllers for resources which are not tied to
-    # a model.
+    # Generate controllers for tableless models.
     resources.each do |resource|
 
       controller_filename = "#{resource.underscore}_controller.rb"
       controller_location = "#{admin_controllers_folder}/#{controller_filename}"
 
       if !admin_controllers.include?(controller_filename)
-        controller = File.open(controller_location, "w+")
+
         content = <<-RAW
 # Controller generated by Typus, use it to extend admin functionality.
 class Admin::#{resource}Controller < TypusController
 
   ##
   # This controller was generated because you have defined a resource 
-  # which is not tied to a model on your <tt>config/typus/XXXXXX_roles.yml</tt> 
-  # configuration file.
+  # on <tt>config/typus/XXXXXX_roles.yml</tt> which is a tableless model.
   #
   #     admin:
   #       #{resource}: index
@@ -54,8 +52,7 @@ class Admin::#{resource}Controller < TypusController
 end
       RAW
 
-        controller.puts(content)
-        controller.close
+        File.open(controller_location, "w+") { |f| f << content }
         logger.info "=> [typus] Admin::#{resource}Controller successfully created."
 
       end
@@ -66,7 +63,7 @@ end
 
       if !File.exist?("#{view_folder}/#{view_filename}")
         Dir.mkdir(view_folder) unless File.directory?(view_folder)
-        view = File.open("#{view_folder}/#{view_filename}", "w+")
+
         content = <<-RAW
 <!-- Sidebar -->
 
@@ -81,9 +78,10 @@ end
 <p>And here we do whatever we want to ...</p>
 
         RAW
-        view.puts(content)
-        view.close
+
+        File.open("#{view_folder}/#{view_filename}", "w+") { |f| f << content}
         logger.info "=> [typus] app/views/admin/#{resource.underscore}/index.html.erb successfully created."
+
       end
 
     end
@@ -97,7 +95,6 @@ end
       controller_location = "#{admin_controllers_folder}/#{controller_filename}"
 
       if !admin_controllers.include?(controller_filename)
-        controller = File.open(controller_location, "w+")
 
         content = <<-RAW
 # Controller generated by Typus, use it to extend admin functionality.
@@ -106,19 +103,9 @@ class Admin::#{model.pluralize}Controller < Admin::MasterController
 =begin
 
   ##
-  # You can overwrite any Admin::MasterController methods.
-  #
-  def index
-  end
-
-=end
-
-=begin
-
-  ##
-  # You can extend Admin::MasterController with your methods.
+  # You can overwrite and extend Admin::MasterController with your methods.
   #
-  # This actions have to be defined in <tt>config/typus/application.yml</tt>:
+  # Actions have to be defined in <tt>config/typus/application.yml</tt>:
   #
   #   #{model}:
   #     actions:
@@ -134,7 +121,10 @@ class Admin::#{model.pluralize}Controller < Admin::MasterController
   #   editor:
   #     #{model}: create, read, update, custom_action_for_an_item
   #
-  #
+
+  def index
+  end
+
   def custom_action
   end
 
@@ -146,9 +136,9 @@ class Admin::#{model.pluralize}Controller < Admin::MasterController
 end
         RAW
 
-        controller.puts(content)
-        controller.close
+        File.open(controller_location, "w+") { |f| f << content }
         logger.info "=> [typus] Admin::#{model.pluralize}Controller successfully created."
+
       end
 
       # Test test/functional/admin/*_test.rb
@@ -156,7 +146,6 @@ end
       test_location = "#{admin_controller_tests_folder}/#{test_filename}"
 
       if !admin_controller_tests.include?(test_filename) && File.directory?("#{Rails.root}/test")
-        test = File.open(test_location, "w+")
 
         content = <<-RAW
 require 'test_helper'
@@ -171,9 +160,9 @@ class Admin::#{model.pluralize}ControllerTest < ActionController::TestCase
 end
         RAW
 
-        test.puts(content)
-        test.close
+        File.open(test_location, "w+") { |f| f << content }
         logger.info "=> [typus] Admin::#{model.pluralize}ControllerTest successfully created."
+
       end
 
     end

data/lib/typus/hash.rb

@@ -1,8 +1,6 @@
 class Hash
 
-  ##
   # Remove nil and empty keys.
-  #
   def compact
     delete_if { |key, value| value.nil? || value.empty? }
   end

data/lib/typus/object.rb

@@ -1,6 +1,5 @@
 class Object
 
-  ##
   # Instead of having to translate strings and defining a default value:
   #
   #     t("Hello World!", :default => 'Hello World!')

data/lib/typus/quick_edit.rb

@@ -6,7 +6,7 @@ module Typus
 
       render :text => '' and return unless session[:typus_user_id]
 
-      links = [[ "Dashboard", admin_dashboard_path ] ]
+      links = [[ "Dashboard", admin_dashboard_path ]]
       links << [ params[:message], "/admin/#{params[:path]}" ] if params[:message] && params[:path]
 
       options = links.reverse.map do |link|

data/lib/typus/reloader.rb

@@ -2,9 +2,7 @@ module Typus
 
   module Reloader
 
-    ##
     # Reload config and roles when app is running in development.
-    #
     def reload_config_et_roles
       return if Rails.env.production?
       logger.info "=> [typus] Configuration files have been reloaded."

data/lib/typus.rb

@@ -1,3 +1,16 @@
+class ActionController::Routing::RouteSet
+
+  def load_routes_with_typus!
+    lib_path = File.dirname(__FILE__)
+    typus_routes = File.join(lib_path, *%w[ .. config routes_hack.rb ])
+    add_configuration_file(typus_routes) unless configuration_files.include?(typus_routes)
+    load_routes_without_typus!
+  end
+
+  alias_method_chain :load_routes!, :typus
+
+end
+
 module Typus
 
   class << self
@@ -22,9 +35,7 @@ module Typus
       Typus::Configuration.config.collect { |i| i.last['application'] }.compact.uniq.sort
     end
 
-    ##
-    # Returns a list of the modules of an application.
-    #
+    # List of the modules of an application.
     def application(name)
       Typus::Configuration.config.collect { |i| i.first if i.last['application'] == name }.compact.uniq.sort
     end
@@ -37,9 +48,7 @@ module Typus
       models.collect { |m| m if m.constantize.typus_options_for(:on_header) }.compact
     end
 
-    ##
-    # Return a list of resources, which are models tableless.
-    #
+    # List of resources, which are tableless models.
     def resources(models = get_model_names)
 
       all_resources = Typus::Configuration.roles.keys.map do |key|
@@ -55,10 +64,6 @@ module Typus
            "#{Rails.root}/vendor/plugins/**/app/models/**/*.rb" ].collect { |m| File.basename(m).sub(/\.rb$/,'').camelize }
     end
 
-    def module_description(modulo)
-      Typus::Configuration.config[modulo]['description']
-    end
-
     def user_class
       Typus::Configuration.options[:user_class_name].constantize
     end
@@ -75,11 +80,7 @@ module Typus
       File.exist?("#{Rails.root}/vendor/plugins/typus")
     end
 
-    ##
     # Enable application. This is used at boot time.
-    #
-    #   Typus.enable
-    #
     def enable
 
       # Ruby Extensions

data/test/functional/typus_controller_test.rb

@@ -127,8 +127,7 @@ class TypusControllerTest < ActionController::TestCase
   def test_should_be_redirected_if_password_does_not_match_confirmation
     typus_user = typus_users(:admin)
     post :reset_password, { :token => typus_user.token, :user => { :password => 'drowssap', :password_confirmation => 'drowssap2' } }
-    assert_response :redirect
-    assert_redirected_to admin_reset_password_path(:token => typus_user.token)
+    assert_response :success
   end
 
   def test_should_only_be_allowed_to_reset_password

data/test/helpers/admin/form_helper_test.rb

@@ -3,6 +3,7 @@ require 'test/helper'
 class Admin::FormHelperTest < ActiveSupport::TestCase
 
   include Admin::FormHelper
+  include Admin::MasterHelper
 
   include ActionView::Helpers::FormHelper
   include ActionView::Helpers::FormOptionsHelper

data/test/lib/active_record_test.rb

@@ -50,6 +50,11 @@ class ActiveRecordTest < ActiveSupport::TestCase
     end
   end
 
+  def test_should_return_description_of_a_model
+    assert TypusUser.respond_to?(:typus_description)
+    assert_equal "System Users Administration", TypusUser.typus_description
+  end
+
   def test_should_return_typus_fields_for_list_for_typus_user
     expected_fields = [['email', :string], 
                        ['role', :selector], 

data/test/lib/typus_test.rb

@@ -54,11 +54,6 @@ class TypusTest < ActiveSupport::TestCase
     assert_equal %w( Git Order Status WatchDog ), Typus.resources(models)
   end
 
-  def test_should_return_description_of_module
-    assert Typus.respond_to?(:module_description)
-    assert_equal 'System Users Administration', Typus.module_description('TypusUser')
-  end
-
   def test_should_verify_enable_exists
     assert Typus.respond_to?(:enable)
   end

data/test/unit/typus_user_roles_test.rb

@@ -48,20 +48,20 @@ class TypusUserRolesTest < ActiveSupport::TestCase
     end
 
     # Category: create, read, update
-    %w( create read update ).each { |action| assert typus_user.can_perform?(Category, action) }
-    %w( delete ).each { |action| assert !typus_user.can_perform?(Category, action) }
+    %w( create read update ).each { |action| assert typus_user.can_perform?('Category', action) }
+    %w( delete ).each { |action| assert !typus_user.can_perform?('Category', action) }
 
     # Post: create, read, update
-    %w( create read update ).each { |action| assert typus_user.can_perform?(Post, action) }
-    %w( delete ).each { |action| assert !typus_user.can_perform?(Post, action) }
+    %w( create read update ).each { |action| assert typus_user.can_perform?('Post', action) }
+    %w( delete ).each { |action| assert !typus_user.can_perform?('Post', action) }
 
     # Comment: read, update, delete
-    %w( read update delete ).each { |action| assert typus_user.can_perform?(Comment, action) }
-    %w( create ).each { |action| assert !typus_user.can_perform?(Comment, action) }
+    %w( read update delete ).each { |action| assert typus_user.can_perform?('Comment', action) }
+    %w( create ).each { |action| assert !typus_user.can_perform?('Comment', action) }
 
     # TypusUser: read, update
-    %w( read update ).each { |action| assert typus_user.can_perform?(TypusUser, action) }
-    %w( create delete ).each { |action| assert !typus_user.can_perform?(TypusUser, action) }
+    %w( read update ).each { |action| assert typus_user.can_perform?('TypusUser', action) }
+    %w( create delete ).each { |action| assert !typus_user.can_perform?('TypusUser', action) }
 
   end
 
@@ -74,16 +74,16 @@ class TypusUserRolesTest < ActiveSupport::TestCase
     assert_equal models, typus_user.resources.map(&:first).sort
 
     # Category: read, update
-    %w( read update ).each { |action| assert typus_user.can_perform?(Category, action) }
-    %w( create delete ).each { |action| assert !typus_user.can_perform?(Category, action) }
+    %w( read update ).each { |action| assert typus_user.can_perform?('Category', action) }
+    %w( create delete ).each { |action| assert !typus_user.can_perform?('Category', action) }
 
     # Comment: read
-    %w( read ).each { |action| assert typus_user.can_perform?(Comment, action) }
-    %w( create update delete ).each { |action| assert !typus_user.can_perform?(Comment, action) }
+    %w( read ).each { |action| assert typus_user.can_perform?('Comment', action) }
+    %w( create update delete ).each { |action| assert !typus_user.can_perform?('Comment', action) }
 
     # Post: read
-    %w( read ).each { |action| assert typus_user.can_perform?(Post, action) }
-    %w( create update delete ).each { |action| assert !typus_user.can_perform?(Post, action) }
+    %w( read ).each { |action| assert typus_user.can_perform?('Post', action) }
+    %w( create update delete ).each { |action| assert !typus_user.can_perform?('Post', action) }
 
   end
 

data/test/unit/typus_user_test.rb

@@ -167,4 +167,11 @@ this_is_chelm@example.com
     assert TypusUser.generate('demo@example.com', 'XXXX').invalid?
   end
 
+  def test_should_verify_can_perform?
+    assert TypusUser.instance_methods.include?('can_perform?')
+    @current_user = TypusUser.find(:first)
+    assert @current_user.can_perform?(TypusUser, 'delete')
+    assert @current_user.can_perform?('TypusUser', 'delete')
+  end
+
 end

data/typus.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{typus}
-  s.version = "0.9.15"
+  s.version = "0.9.16"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Francesc Esplugas"]
-  s.date = %q{2009-07-03}
+  s.date = %q{2009-07-09}
   s.description = %q{Effortless backend interface for Ruby on Rails applications. (Admin scaffold generator.)}
   s.email = %q{francesc@intraducibles.com}
   s.extra_rdoc_files = [
@@ -48,6 +48,7 @@ Gem::Specification.new do |s|
      "config/locales/typus/pt-BR.yml",
      "config/locales/typus/ru.yml",
      "config/routes.rb",
+     "config/routes_hack.rb",
      "generators/typus/templates/config/initializers/typus.rb",
      "generators/typus/templates/config/typus/README",
      "generators/typus/templates/config/typus/application.yml",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fesplugas-typus
 version: !ruby/object:Gem::Version 
-  version: 0.9.15
+  version: 0.9.16
 platform: ruby
 authors: 
 - Francesc Esplugas
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-03 00:00:00 -07:00
+date: 2009-07-09 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -57,6 +57,7 @@ files:
 - config/locales/typus/pt-BR.yml
 - config/locales/typus/ru.yml
 - config/routes.rb
+- config/routes_hack.rb
 - generators/typus/templates/config/initializers/typus.rb
 - generators/typus/templates/config/typus/README
 - generators/typus/templates/config/typus/application.yml