typus 0.9.22 → 0.9.23

data/README.rdoc

@@ -26,6 +26,25 @@ Step 3: Go to the admin area and enjoy it!
 
     http://0.0.0.0:3000/admin
 
+== Want to see a demo working?
+
+There's an application running at Heroku.
+
+    http://typus.heroku.com/
+
+Use the following credentials to log in.
+
+    Email: userdemo@intraducibles.com
+    Password: userdemo
+
+Notes on the application demo:
+
+- Runs under SSL.
+- Has an Assets model to show how assets can work.
+- User can only edit the posts they have generated.
+- User cannot edit Categories, just view them.
+- Shows how TinyMCE is integrated with Pages.
+
 == Installing
 
 Install from GitHub the latest version which it's compatible with Rails 2.3.2.
@@ -58,8 +77,7 @@ Typus and blog about Typus.
 
 == Fancyzoom for assets
 
-This feature is a work in progress. It currently works if the attached file is 
-named asset and only previews images.
+This feature is a work in progress. Only previews images.
 
     # db/migrate/create_photos.rb
 

data/VERSION

@@ -1 +1 @@
-0.9.22
+0.9.23

data/app/controllers/admin/master_controller.rb

@@ -88,7 +88,7 @@ class Admin::MasterController < ApplicationController
     @item = @resource[:class].new(params[:item])
 
     if @item.attributes.include?(Typus.user_fk)
-      @item.attributes = { Typus.user_fk => session[:typus_user_id] }
+      @item.attributes = { Typus.user_fk => @current_user.id }
     end
 
     if @item.valid?
@@ -147,7 +147,7 @@ class Admin::MasterController < ApplicationController
   def destroy
     @item.destroy
     flash[:success] = _("{{model}} successfully removed.", :model => @resource[:class].typus_human_name)
-    redirect_to :back
+    redirect_to request.referer || admin_dashboard_path
   rescue Exception => error
     error_handler(error, params.merge(:action => 'index', :id => nil))
   end
@@ -161,7 +161,7 @@ class Admin::MasterController < ApplicationController
     else
       flash[:notice] = _("Toggle is disabled.")
     end
-    redirect_to :back
+    redirect_to request.referer || admin_dashboard_path
   end
 
   ##
@@ -176,7 +176,7 @@ class Admin::MasterController < ApplicationController
   def position
     @item.send(params[:go])
     flash[:success] = _("Record moved {{to}}.", :to => params[:go].gsub(/move_/, '').humanize.downcase)
-    redirect_to :back
+    redirect_to request.referer || admin_dashboard_path
   end
 
   ##
@@ -256,9 +256,9 @@ private
 
     # OPTIMIZE: `typus_users` is currently hard-coded. We should find a good name for this option.
     if @item.respond_to?('typus_users') && !@item.send('typus_users').include?(@current_user) ||
-       @item.respond_to?(Typus.user_fk) && !(@item.send(Typus.user_fk) == session[:typus_user_id])
+       @item.respond_to?(Typus.user_fk) && !@item.owned_by?(@current_user)
        flash[:notice] = _("You don't have permission to access this item.")
-       redirect_to :back
+       redirect_to request.referer || admin_dashboard_path
     end
 
   end
@@ -271,7 +271,7 @@ private
     # If current user is not root and @resource has a foreign_key which 
     # is related to the logged user (Typus.user_fk) we only show the user 
     # related items.
-    if @resource[:class].columns.map { |u| u.name }.include?(Typus.user_fk)
+    if @resource[:class].typus_user_id?
       condition = { Typus.user_fk => @current_user }
       @conditions = @resource[:class].merge_conditions(@conditions, condition)
     end

data/app/controllers/typus_controller.rb

@@ -13,12 +13,15 @@ class TypusController < ApplicationController
     include SslRequirement
     ssl_required :sign_in, :sign_out, 
                  :dashboard, 
-                 :recover_password, :reset_password
+                 :recover_password, :reset_password, 
+                 :set_locale
   end
 
   filter_parameter_logging :password
 
-  before_filter :set_locale
+  before_filter :verify_typus_users_table_schema
+
+  before_filter :set_default_locale, :except => [ :dashboard ]
 
   before_filter :reload_config_et_roles
   before_filter :require_login, 
@@ -35,6 +38,8 @@ class TypusController < ApplicationController
   before_filter :recover_password_disabled?, 
                 :only => [ :recover_password, :reset_password ]
 
+  before_filter :set_locale, :only => [ :dashboard ]
+
   def dashboard
     flash[:notice] = _("There are not defined applications in config/typus/*.yml.") if Typus.applications.empty?
   end
@@ -117,6 +122,18 @@ class TypusController < ApplicationController
 
 private
 
+  def verify_typus_users_table_schema
+
+    unless Typus.user_class.model_fields.keys.include?(:roles)
+      raise "Run `script/generate typus_update_schema_to_01 -f && rake db:migrate` to update database schema."
+    end
+
+    unless Typus.user_class.model_fields.keys.include?(:preferences)
+      raise "Run `script/generate typus_update_schema_to_02 -f && rake db:migrate` to update database schema."
+    end
+
+  end
+
   def recover_password_disabled?
     redirect_to admin_sign_in_path unless Typus::Configuration.options[:recover_password]
   end

data/app/helpers/admin/form_helper.rb

@@ -58,7 +58,7 @@ module Admin::FormHelper
         html << typus_tree_field(related_fk, related.roots, related_fk)
       else
         html << <<-HTML
-<li><label for="item_#{attribute}">#{_(related_fk.humanize)}
+<li><label for="item_#{attribute}">#{@resource[:class].human_attribute_name(attribute)}
     <small>#{link_to _("Add"), { :controller => "admin/#{related.class_name.tableize}", :action => 'new', :back_to => back_to, :selected => related_fk }, :confirm => message.join("\n\n") if @current_user.can_perform?(related, 'create')}</small>
     </label>
 #{select :item, related_fk, related.find(:all, :order => related.typus_order_by).collect { |p| [p.typus_name, p.id] }, { :include_blank => true }, { :disabled => attribute_disabled?(attribute) } }</li>
@@ -93,25 +93,27 @@ module Admin::FormHelper
     HTML
   end
 
-  # WEI: Added image preview.
+  # Optimize
   def typus_file_field(attribute)
-    attribute_display = attribute.split('_file_name').first
+
+    attachment = attribute.split('_file_name').first
+
     unless @item.send(attribute).blank?
-      if attachment = @item.send(attribute_display)
-        if (@item.send("#{attribute_display}_content_type") =~ /^image\/.+/) and (attachment.styles.member?(:thumbnail) or attachment.styles.member?(:edit))
-          style = attachment.styles.member?(:thumbnail) ? :thumbnail : :edit
-          preview = image_tag attachment.url(style)
-        else
-          preview = link_to @item.send(attribute), attachment.url
-        end
-      end
+      item = @item.send(attachment)
+      preview = if @item.send("#{attachment}_content_type") =~ /^image\/.+/ && item.styles.member?(:typus_thumbnail)
+                    image_tag item.url(:typus_thumbnail)
+                  else
+                    link_to @item.send(attribute), item.url
+                  end
     end
+
     <<-HTML
-    <li><label for="item_#{attribute}">#{_(attribute_display.humanize)}</label>
-      #{file_field :item, attribute.split("_file_name").first, :disabled => attribute_disabled?(attribute)}
-      #{preview}
-    </li>
+<li><label for="item_#{attribute}">#{_(attachment.humanize)}</label>
+#{file_field :item, attachment, :disabled => attribute_disabled?(attribute)}
+#{preview}
+</li>
     HTML
+
   end
 
   def typus_password_field(attribute)
@@ -235,8 +237,6 @@ module Admin::FormHelper
       association = reflection.macro
       foreign_key = reflection.through_reflection ? reflection.primary_key_name.pluralize : reflection.primary_key_name
 
-      #WEI: Changed link to use type name rather than field:
-      #WEI: link_options = { :controller => "admin/#{field}", 
       link_options = { :controller => "admin/#{model_to_relate_as_resource.pluralize}", 
                        :action => 'new', 
                        :back_to => "#{@back_to}##{field}", 

data/app/helpers/admin/sidebar_helper.rb

@@ -28,10 +28,17 @@ module Admin::SidebarHelper
       end
     end
 
+    # OPTIMIZE
     case params[:action]
     when 'show'
       if @current_user.can_perform?(@resource[:class], 'update')
-        items << (link_to _("Edit entry"), :action => 'edit', :id => @item.id)
+        if @item.typus_user_id?
+          if @item.owned_by?(@current_user)
+            items << (link_to _("Edit entry"), :action => 'edit', :id => @item.id)
+          end
+        else
+          items << (link_to _("Edit entry"), :action => 'edit', :id => @item.id)
+        end
       end
     end
 
@@ -194,16 +201,9 @@ function surfto_#{model_pluralized}(form) {
 
   end
 
-  ##
-  # Thinking in update datetime_filters to ...
-  #
-  #     %w( today last_few_days last_7_days last_30_days )
-  #
-  # ... which are the ones used by 'exception_logger'.
-  #
   def datetime_filter(request, filter)
     items = []
-    %w( today past_7_days this_month this_year ).each do |timeline|
+    %w( today last_few_days last_7_days last_30_days ).each do |timeline|
       switch = request.include?("#{filter}=#{timeline}") ? 'on' : 'off'
       options = { filter.to_sym => timeline, :page => nil }
       items << (link_to _(timeline.humanize), params.merge(options), :class => switch)

data/app/helpers/admin/table_helper.rb

@@ -31,14 +31,21 @@ module Admin::TableHelper
           else
             html << typus_table_string_field(key, item, link_options)
           end
-
         end
 
-      action = item.class.typus_options_for(:default_action_on_item)
-      content = link_to _(action.capitalize), :controller => "admin/#{item.class.name.tableize}", :action => action, :id => item.id
-      html << <<-HTML
+        action = if item.typus_user_id? && !@current_user.is_root?
+                   # If there's a typus_user_id column on the table and logged user is not root ...
+                   item.owned_by?(@current_user) ? 'edit' : 'show'
+                 elsif !@current_user.can_perform?(model, 'edit')
+                   'show'
+                 else
+                   item.class.typus_options_for(:default_action_on_item)
+                 end
+
+        content = link_to _(action.capitalize), :controller => "admin/#{item.class.name.tableize}", :action => action, :id => item.id
+        html << <<-HTML
 <td width="10px">#{content}</td>
-      HTML
+        HTML
 
       ##
       # This controls the action to perform. If we are on a model list we 
@@ -149,10 +156,20 @@ module Admin::TableHelper
   end
 
   def typus_table_file_field(attribute, item, link_options = {})
-    <<-HTML
+
+    attachment = attribute.split('_file_name').first
+
+    if item.send(attachment).styles.member?(:typus_preview) && item.send("#{attachment}_content_type") =~ /^image\/.+/
+      <<-HTML
 <td><a href="##{item.to_dom(:suffix => 'zoom')}" id="#{item.to_dom}" title="Click to preview">#{item.send(attribute)}</a></td>
-<div id="#{item.to_dom(:suffix => 'zoom')}">#{item.typus_preview}</div>
-    HTML
+<div id=\"#{item.to_dom(:suffix => 'zoom')}\">#{item.typus_preview(attachment)}</div>
+      HTML
+    else
+      <<-HTML
+<td>#{link_to item.send(attribute), item.send(attachment).url}</td>
+      HTML
+    end
+
   end
 
   def typus_table_tree_field(attribute, item)

data/app/helpers/typus_helper.rb

@@ -149,9 +149,15 @@ module TypusHelper
 
     message = _("Are you sure you want to sign out and end your session?")
 
+    user_details = if user.can_perform?(Typus::Configuration.options[:user_class_name], 'edit')
+                     link_to user.name, admin_edit_typus_user_path, :title => "#{user.email} (#{user.role})"
+                   else
+                     user.name
+                   end
+
     <<-HTML
 <ul>
-  <li>#{_("Logged as")} #{link_to user.name, admin_edit_typus_user_path, :title => "#{user.email} (#{user.role})"}</li>
+  <li>#{_("Logged as")} #{user_details}</li>
   <li>#{link_to _("Sign out"), admin_sign_out_path, { :confirm => message } }</li>
 </ul>
     HTML

data/app/views/admin/dashboard/_sidebar.html.erb

@@ -4,6 +4,4 @@
 
 <p>If you need help don't hesitate in joining the <%= link_to 'Typus', 'http://groups.google.com/group/typus', :rel => 'external' %> mailing list.</p>
 
-<p>Remember you can replace this sidebar adding <code>_sidebar.html.erb</code> file on <code>app/views/admin/dashboard</code> folder.</p>
-
-<p>Have a nice day!</p>
+<p>Replace this sidebar dropping a file named <code>_sidebar.html.erb</code> on the <code>app/views/admin/dashboard</code> folder.</p>

data/app/views/typus_mailer/reset_password_link.erb

@@ -3,9 +3,4 @@
 
     <%= url_for admin_reset_password_url(:token => @user.token) %>
 
-<%= _("If you didn't request a password update, you can ignore this message") %>
-
-<%= _("Have a nice day") %>
-
---
-<%= Typus::Configuration.options[:app_name] %>
+<%= _("If you didn't request a password update, you can ignore this message") %>

data/config/locales/typus/de.yml

@@ -86,7 +86,6 @@ de:
   "{{current_user_role}} can't display items": "{{current_user_role}} kann Einträge nicht anzeigen"
   "You can update your password at": "Sie k7ouml;nnen Ihr Passwort ändern unter"
   "If you didn't request a password update, you can ignore this message": "Falls Sie keine Passwort Äderung beantragt haben, können Sie diese nachricht ignorieren"
-  "Have a nice day": "Haben Sie einen guten Tag"
   "Reset password": "Passwort zurücksetzen"
   "Add new": "Erstellen"
   "Do you want to cancel it?": "Wollen Sie abbrechen?"
@@ -99,9 +98,9 @@ de:
   "Change {{attribute}}?": "{{attribute}}ändern?"
   "Set language": "Sprache einstellen"
   "Today": "Heute"
-  "Past 7 days": "Letzten 7 Tage"
-  "This month": "Diesen Monat"
-  "This year": "Dieses Jahr"
+  "Last few days": "Letzten Tage"
+  "Last 7 days": "Letzten 7 Tage"
+  "Last 30 days": "Letzten 30 Tage"
   "{{model}} filtered by {{filtered_by}}": "{{model}} gefiltert nach {{filtered_by}}"
   "True": "Richtig"
   "False": "Falsch"

data/config/locales/typus/es.yml

@@ -86,7 +86,6 @@ es:
   "{{current_user_role}} can't display items": "{{current_user_role}} no puede mostrar los elementos."
   "You can update your password at": "Puedes actualizar tu contraseña en"
   "If you didn't request a password update, you can ignore this message": "Si no pediste una actualización de tu contraseña, puedes ignorar este mensaje."
-  "Have a nice day": "Que tengas un buen dia."
   "Reset password": "Cambiar contraseña"
   "Add new": "Añadir nuevo"
   "Do you want to cancel it?": "¿Quieres cancelarlo?"
@@ -99,9 +98,9 @@ es:
   "Change {{attribute}}?": "Change {{attribute}}?"
   "Set language": "Cambiar idioma"
   "Today": "Hoy"
-  "Past 7 days": "Últimos 7 dias"
-  "This month": "Este mes"
-  "This year": "Este año"
+  "Last few days": "Últimos dias"
+  "Last 7 days": "Últimos 7 dias"
+  "Last 30 days": "Últimos 30 dias"
   "{{model}} filtered by {{filtered_by}}": "{{model}} filtrados por {{filtered_by}}"
   "True": "Verdadero"
   "False": "Falso"

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

@@ -90,7 +90,6 @@
   "{{current_user_role}} can't display items": 
   "You can update your password at": 
   "If you didn't request a password update, you can ignore this message": 
-  "Have a nice day": 
   "Reset password": 
   "Add new": 
   "Do you want to cancel it?": 
@@ -103,9 +102,9 @@
   "Change {{attribute}}?": 
   "Set language": 
   "Today": 
-  "Past 7 days": 
-  "This month": 
-  "This year": 
+  "Last few days": 
+  "Last 7 days": 
+  "Last 30 days": 
   "{{model}} filtered by {{filtered_by}}": 
   "True": 
   "False": 

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

@@ -86,7 +86,6 @@ pt-BR:
   "{{current_user_role}} can't display items": "{{current_user_role}} não pode mostrar os items."
   "You can update your password at": "Você pode atualizar sua senha em"
   "If you didn't request a password update, you can ignore this message": "Se você não pediu uma renovação de senha, por favor ignore esta mensagem."
-  "Have a nice day": "Tenha um bom dia."
   "Reset password": "Trocar senha"
   "Add new": "Adicionar novo"
   "Do you want to cancel it?": "Quer cancelar?"
@@ -99,9 +98,9 @@ pt-BR:
   "Change {{attribute}}?": "Mudar {{attribute}}?"
   "Set language": "Mudar idioma"
   "Today": "Hoje"
-  "Past 7 days": "Últimos 7 dias"
-  "This month": "Este mês"
-  "This year": "Este ano"
+  "Last few days": "Últimos dias"
+  "Last 7 days": "Últimos 7 dias"
+  "Last 30 days": "Últimos 30 dias"
   "Created at": "Criado em"
   "Updated at": "Atualizado em"
   "{{model}} filtered by {{filtered_by}}": "{{model}} filtrados por {{filtered_by}}"

data/config/locales/typus/ru.yml

@@ -26,7 +26,7 @@ ru:
   "Update entry": "Изменить запись"
   "New": "Новый"
   "Show": "Показать"
-  "Edit": "Editar"
+  "Edit": 
   "Login": "Редактировать"
   "Setup": "Установки"
   "Create": "Создать"
@@ -86,7 +86,6 @@ ru:
   "{{current_user_role}} can't display items": "{{current_user_role}} не может отобразить записи"
   "You can update your password at": "Вы можете установить свой пароль на"
   "If you didn't request a password update, you can ignore this message": "Если Вы не запрашивали обновление пароля, Вы можете проигнорировать это сообщение."
-  "Have a nice day": "Добрый день."
   "Reset password": "Сбросить пароль"
   "Add new": "Добавить новый"
   "Do you want to cancel it?": "Вы хотите отменить это?"
@@ -99,9 +98,9 @@ ru:
   "Change {{attribute}}?": "Изменить {{attribute}}?"
   "Set language": "Установить язык"
   "Today": "Сегодня"
-  "Past 7 days": "Последние 7 дней"
-  "This month": "Этот месяц"
-  "This year": "Этот год"
+  "Last few days": "Последние дней"
+  "Last 7 days": "Последние 7 дней"
+  "Last 30 days": "Последние 30 дней"
   "Created at": "Создано"
   "Updated at": "Обновлено"
   "{{model}} filtered by {{filtered_by}}": 

data/generators/typus/templates/config/initializers/typus.rb

@@ -5,7 +5,6 @@
 Typus::Configuration.options[:app_name] = '<%= application %>'
 # Typus::Configuration.options[:config_folder] = 'config/typus'
 # Typus::Configuration.options[:email] = 'admin@example.com'
-# Typus::Configuration.options[:image_preview_size] = :typus
 # Typus::Configuration.options[:locales] = [ [ "English", :en ], [ "Español", :es ] ]
 # Typus::Configuration.options[:recover_password] = true
 # Typus::Configuration.options[:root] = 'admin'

data/generators/typus/templates/db/create_typus_users.rb

@@ -10,6 +10,7 @@ class CreateTypusUsers < ActiveRecord::Migration
       t.string :token, :null => false
       t.string :salt, :null => false
       t.string :crypted_password, :null => false
+      t.string :preferences
       t.timestamps
     end
   end

data/generators/typus_update_schema_to_02/templates/migration.rb

@@ -0,0 +1,11 @@
+class UpdateTypusSchemaTo02 < ActiveRecord::Migration
+
+  def self.up
+    add_column :typus_users, :preferences, :string
+  end
+
+  def self.down
+    remove_column :typus_users, :preferences
+  end
+
+end

data/generators/typus_update_schema_to_02/typus_update_schema_to_02_generator.rb

@@ -0,0 +1,11 @@
+class TypusUpdateSchemaTo02Generator < Rails::Generator::Base
+
+  def manifest
+
+    record do |m|
+      m.migration_template 'migration.rb', 'db/migrate', { :migration_file_name => 'update_typus_schema_to_02' }
+    end
+
+  end
+
+end

data/lib/typus/active_record.rb

@@ -235,9 +235,11 @@ module Typus
         # Sidebar filters:
         #
         # - Booleans: true, false
-        # - Datetime: today, past_7_days, this_month, this_year
+        # - Datetime: today, last_few_days, last_7_days, last_30_days
         # - Integer & String: *_id and "selectors" (p.ej. category_id)
         #
+        # today last_few_days last_7_days last_30_days
+        #
         case filter_type
         when :boolean
           condition = { key => (value == 'true') ? true : false }
@@ -245,9 +247,9 @@ module Typus
         when :datetime
           interval = case value
                      when 'today' then         Time.new.midnight..Time.new.midnight.tomorrow
-                     when 'past_7_days' then   6.days.ago.midnight..Time.new.midnight.tomorrow
-                     when 'this_month' then    Time.new.midnight.last_month..Time.new.midnight.tomorrow
-                     when 'this_year' then     Time.new.midnight.last_year..Time.new.midnight.tomorrow
+                     when 'last_few_days' then 3.days.ago.midnight..Time.new.midnight.tomorrow
+                     when 'last_7_days' then   6.days.ago.midnight..Time.new.midnight.tomorrow
+                     when 'last_30_days' then  Time.new.midnight.last_month..Time.new.midnight.tomorrow
                      end
           condition = ["#{key} BETWEEN ? AND ?", interval.first.to_s(:db), interval.last.to_s(:db)]
           conditions = merge_conditions(conditions, condition)
@@ -266,6 +268,10 @@ module Typus
 
     end
 
+    def typus_user_id?
+      columns.map { |u| u.name }.include?(Typus.user_fk)
+    end
+
   end
 
   module InstanceMethods
@@ -299,6 +305,14 @@ module Typus
       respond_to?(:name) ? name : "#{self.class}##{id}"
     end
 
+    def typus_user_id?
+      self.class.typus_user_id?
+    end
+
+    def owned_by?(user)
+      send(Typus.user_fk) == user.id
+    end
+
   end
 
 end

data/lib/typus/authentication.rb

@@ -27,10 +27,6 @@ module Typus
 
       @current_user = Typus.user_class.find(session[:typus_user_id])
 
-      unless @current_user.respond_to?(:role)
-        raise _("Run 'script/generate typus_update_schema_to_01 -f && rake db:migrate' to update database schema.")
-      end
-
       unless Typus::Configuration.roles.keys.include?(@current_user.role)
         raise _("Role does no longer exists.")
       end

data/lib/typus/locale.rb

@@ -6,12 +6,22 @@ module Typus
       if params[:locale]
         I18n.locale = params[:locale]
         session[:typus_locale] = params[:locale]
-        redirect_to :back
+        @current_user.update_attributes :preferences => { :locale => params[:locale] }
+        redirect_to request.referer || admin_dashboard_path
       else
-        I18n.locale = session[:typus_locale] || Typus.default_locale
+        begin
+          I18n.locale = @current_user.preferences[:locale]
+        rescue
+          @current_user.update_attributes :preferences => { :locale => params[:locale] }
+          retry
+        end
       end
     end
 
+    def set_default_locale
+      I18n.locale = Typus.default_locale
+    end
+
   end
 
 end

data/lib/typus/preview.rb

@@ -2,8 +2,8 @@ module Typus
 
   module InstanceMethods
 
-    def typus_preview
-      return "<img src=\"#{asset.url(Typus::Configuration.options[:image_preview_size])}\" />"
+    def typus_preview(attachment)
+      return "<img src=\"#{send(attachment).url(:typus_preview)}\" />"
     end
 
   end

data/lib/typus/user.rb

@@ -25,6 +25,9 @@ module Typus
         validates_presence_of :role
 
         before_save :initialize_salt, :encrypt_password, :initialize_token
+        before_create :set_preferences
+
+        serialize :preferences
 
         include InstanceMethods
 
@@ -96,6 +99,10 @@ module Typus
 
     protected
 
+      def set_preferences
+        self.preferences = { :locale => Typus.default_locale }
+      end
+
       def generate_hash(string)
         Digest::SHA1.hexdigest(string)
       end

data/test/helpers/admin/form_helper_test.rb

@@ -109,11 +109,14 @@ class Admin::FormHelperTest < ActiveSupport::TestCase
   def test_typus_file_field
 
     @resource = { :class => Post }
+    @item = Post.new
 
     output = typus_file_field('asset_file_name')
     expected = <<-HTML
 <li><label for="item_asset_file_name">Asset</label>
-<input id="item_asset" name="item[asset]" size="30" type="file" /></li>
+<input id="item_asset" name="item[asset]" size="30" type="file" />
+
+</li>
     HTML
 
     assert_equal expected, output

data/test/helpers/admin/sidebar_helper_test.rb

@@ -194,9 +194,9 @@ class Admin::SidebarHelperTest < ActiveSupport::TestCase
 <h2>Created at</h2>
 <ul>
 <li><a href="http://test.host/admin/typus_users?created_at=today" class="off">Today</a></li>
-<li><a href="http://test.host/admin/typus_users?created_at=past_7_days" class="off">Past 7 days</a></li>
-<li><a href="http://test.host/admin/typus_users?created_at=this_month" class="off">This month</a></li>
-<li><a href="http://test.host/admin/typus_users?created_at=this_year" class="off">This year</a></li>
+<li><a href="http://test.host/admin/typus_users?created_at=last_few_days" class="off">Last few days</a></li>
+<li><a href="http://test.host/admin/typus_users?created_at=last_7_days" class="off">Last 7 days</a></li>
+<li><a href="http://test.host/admin/typus_users?created_at=last_30_days" class="off">Last 30 days</a></li>
 </ul>
     HTML
     assert_equal expected, output
@@ -207,9 +207,9 @@ class Admin::SidebarHelperTest < ActiveSupport::TestCase
 <h2>Created at</h2>
 <ul>
 <li><a href="http://test.host/admin/typus_users?created_at=today" class="on">Today</a></li>
-<li><a href="http://test.host/admin/typus_users?created_at=past_7_days" class="off">Past 7 days</a></li>
-<li><a href="http://test.host/admin/typus_users?created_at=this_month" class="off">This month</a></li>
-<li><a href="http://test.host/admin/typus_users?created_at=this_year" class="off">This year</a></li>
+<li><a href="http://test.host/admin/typus_users?created_at=last_few_days" class="off">Last few days</a></li>
+<li><a href="http://test.host/admin/typus_users?created_at=last_7_days" class="off">Last 7 days</a></li>
+<li><a href="http://test.host/admin/typus_users?created_at=last_30_days" class="off">Last 30 days</a></li>
 </ul>
     HTML
     assert_equal expected, output

data/test/lib/active_record_test.rb

@@ -285,33 +285,32 @@ class ActiveRecordTest < ActiveSupport::TestCase
     params = { :created_at => 'today' }
     assert_equal expected, TypusUser.build_conditions(params).first
 
-
     expected = case ENV['DB']
                when /postgresql/
-                 "(created_at BETWEEN E'#{6.days.ago.midnight.to_s(:db)}' AND E'#{Time.new.midnight.tomorrow.to_s(:db)}')"
+                 "(created_at BETWEEN E'#{3.days.ago.midnight.to_s(:db)}' AND E'#{Time.new.midnight.tomorrow.to_s(:db)}')"
                else
-                 "(created_at BETWEEN '#{6.days.ago.midnight.to_s(:db)}' AND '#{Time.new.midnight.tomorrow.to_s(:db)}')"
+                 "(created_at BETWEEN '#{3.days.ago.midnight.to_s(:db)}' AND '#{Time.new.midnight.tomorrow.to_s(:db)}')"
                end
-    params = { :created_at => 'past_7_days' }
+    params = { :created_at => 'last_few_days' }
     assert_equal expected, TypusUser.build_conditions(params).first
 
-
     expected = case ENV['DB']
                when /postgresql/
-                 "(created_at BETWEEN E'#{Time.new.midnight.last_month.to_s(:db)}' AND E'#{Time.new.midnight.tomorrow.to_s(:db)}')"
+                 "(created_at BETWEEN E'#{6.days.ago.midnight.to_s(:db)}' AND E'#{Time.new.midnight.tomorrow.to_s(:db)}')"
                else
-                 "(created_at BETWEEN '#{Time.new.midnight.last_month.to_s(:db)}' AND '#{Time.new.midnight.tomorrow.to_s(:db)}')"
+                 "(created_at BETWEEN '#{6.days.ago.midnight.to_s(:db)}' AND '#{Time.new.midnight.tomorrow.to_s(:db)}')"
                end
-    params = { :created_at => 'this_month' }
+    params = { :created_at => 'last_7_days' }
     assert_equal expected, TypusUser.build_conditions(params).first
 
+
     expected = case ENV['DB']
                when /postgresql/
-                 "(created_at BETWEEN E'#{Time.new.midnight.last_year.to_s(:db)}' AND E'#{Time.new.midnight.tomorrow.to_s(:db)}')"
+                 "(created_at BETWEEN E'#{Time.new.midnight.last_month.to_s(:db)}' AND E'#{Time.new.midnight.tomorrow.to_s(:db)}')"
                else
-                 "(created_at BETWEEN '#{Time.new.midnight.last_year.to_s(:db)}' AND '#{Time.new.midnight.tomorrow.to_s(:db)}')"
+                 "(created_at BETWEEN '#{Time.new.midnight.last_month.to_s(:db)}' AND '#{Time.new.midnight.tomorrow.to_s(:db)}')"
                end
-    params = { :created_at => 'this_year' }
+    params = { :created_at => 'last_30_days' }
     assert_equal expected, TypusUser.build_conditions(params).first
 
   end

data/test/lib/configuration_test.rb

@@ -12,7 +12,6 @@ class ConfigurationTest < ActiveSupport::TestCase
     assert_equal 'Typus', Typus::Configuration.options[:app_name]
     assert_equal 'vendor/plugins/typus/test/config/working', Typus::Configuration.options[:config_folder]
     assert_equal 'admin@example.com', Typus::Configuration.options[:email]
-    assert_equal 'typus', Typus::Configuration.options[:image_preview_size]
     assert_equal [ [ "English", :en] ], Typus::Configuration.options[:locales]
     assert_equal false, Typus::Configuration.options[:recover_password]
     assert_equal 'admin', Typus::Configuration.options[:root]

data/test/models.rb

@@ -48,4 +48,7 @@ class Post < ActiveRecord::Base
     'plugin'
   end
 
+  def asset_file_name
+  end
+
 end

data/test/unit/typus_mailer_test.rb

@@ -26,8 +26,4 @@ class TypusMailerTest < ActiveSupport::TestCase
     assert_match expected, @response.body
   end
 
-  def test_should_check_email_contains_signature
-    assert_match /--\n#{Typus::Configuration.options[:app_name]}/, @response.body
- end
-
 end

data/typus.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{typus}
-  s.version = "0.9.22"
+  s.version = "0.9.23"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Francesc Esplugas"]
-  s.date = %q{2009-08-26}
+  s.date = %q{2009-09-03}
   s.description = %q{Effortless backend interface for Ruby on Rails applications. (Admin scaffold generator.)}
   s.email = %q{francesc@intraducibles.com}
   s.extra_rdoc_files = [
@@ -94,6 +94,8 @@ Gem::Specification.new do |s|
      "generators/typus_update_schema_to_01/templates/config/typus.yml",
      "generators/typus_update_schema_to_01/templates/migration.rb",
      "generators/typus_update_schema_to_01/typus_update_schema_to_01_generator.rb",
+     "generators/typus_update_schema_to_02/templates/migration.rb",
+     "generators/typus_update_schema_to_02/typus_update_schema_to_02_generator.rb",
      "lib/typus.rb",
      "lib/typus/active_record.rb",
      "lib/typus/authentication.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: typus
 version: !ruby/object:Gem::Version 
-  version: 0.9.22
+  version: 0.9.23
 platform: ruby
 authors: 
 - Francesc Esplugas
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-26 00:00:00 +02:00
+date: 2009-09-03 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -100,6 +100,8 @@ files:
 - generators/typus_update_schema_to_01/templates/config/typus.yml
 - generators/typus_update_schema_to_01/templates/migration.rb
 - generators/typus_update_schema_to_01/typus_update_schema_to_01_generator.rb
+- generators/typus_update_schema_to_02/templates/migration.rb
+- generators/typus_update_schema_to_02/typus_update_schema_to_02_generator.rb
 - lib/typus.rb
 - lib/typus/active_record.rb
 - lib/typus/authentication.rb