typus 3.0.4 → 3.0.5

data/Gemfile

@@ -2,30 +2,48 @@ source 'http://rubygems.org'
 
 gemspec
 
-gem "acts_as_list"
-gem "acts_as_tree"
-gem "dragonfly", "~>0.8.1"
-gem "factory_girl"
+gem 'acts_as_list'
+gem 'acts_as_tree'
+gem 'dragonfly', '~>0.8.1'
+gem 'factory_girl'
+gem 'paperclip'
+gem 'rack-cache', :require => 'rack/cache'
+gem 'rails', '~> 3.0'
 
 group :test do
-  gem "mysql"
-  gem "pg"
+  gem 'shoulda'
+  gem 'tartare', :git => 'https://github.com/fesplugas/rails-tartare.git', :require => false
+
+  gem 'mocha'
 end
 
-gem "paperclip"
+group :development, :test do
 
-gem "rack-cache", :require => "rack/cache"
-gem "rails", "~> 3.0"
+  platforms :jruby do
+    gem 'activerecord-jdbc-adapter', :require => false
+    # gem 'activerecord-jdbcpostgresql-adapter'
+    gem 'jdbc-mysql'
+    gem 'jdbc-postgres'
+    gem 'jdbc-sqlite3'
+  end
 
-gem 'sqlite3-ruby', '1.2.1'
+  platforms :ruby do
+    gem 'mysql2'
+    gem 'pg'
+    gem 'sqlite3'
+  end
 
-# Keep this here because I use it as reference for development.
-gem "fastercsv", "1.5.3" if RUBY_VERSION < '1.9'
-gem "render_inheritable"
-gem "will_paginate", "~> 3.0.pre2"
+end
+
+group :production do
+
+  platforms :jruby do
+    gem 'activerecord-jdbc-adapter'
+    gem 'jdbc-sqlite3'
+  end
+
+  platforms :ruby do
+    gem 'sqlite3'
+  end
 
-group :test do
-  gem "shoulda"
-  gem "tartare", :git => "https://github.com/fesplugas/rails-tartare.git", :require => false
-  gem "mocha"
 end

data/Gemfile.lock

@@ -9,8 +9,8 @@ GIT
 PATH
   remote: .
   specs:
-    typus (3.0.3)
-      fastercsv (= 1.5.3)
+    typus (3.0.4)
+      fastercsv (~> 1.5)
       render_inheritable
       will_paginate (~> 3.0.pre2)
 
@@ -48,7 +48,7 @@ GEM
     acts_as_tree (0.1.1)
     arel (2.0.7)
     builder (2.1.2)
-    capybara (0.4.0)
+    capybara (0.4.1.1)
       celerity (>= 0.7.9)
       culerity (>= 0.2.4)
       mime-types (>= 1.16)
@@ -56,22 +56,22 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       selenium-webdriver (>= 0.0.27)
-      xpath (~> 0.1.2)
+      xpath (~> 0.1.3)
     celerity (0.8.7)
     childprocess (0.1.6)
       ffi (~> 0.6.3)
-    culerity (0.2.14)
+    culerity (0.2.15)
     dragonfly (0.8.2)
       rack
     erubis (2.6.6)
       abstract (>= 1.0.0)
     factory_girl (1.3.3)
-    fastercsv (1.5.3)
+    fastercsv (1.5.4)
     ffi (0.6.3)
       rake (>= 0.8.7)
     i18n (0.5.0)
-    json_pure (1.4.6)
-    mail (2.2.14)
+    json_pure (1.5.1)
+    mail (2.2.15)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
@@ -79,12 +79,12 @@ GEM
     mime-types (1.16)
     mocha (0.9.10)
       rake
-    mysql (2.8.1)
+    mysql2 (0.2.6)
     nokogiri (1.4.4)
     paperclip (2.3.8)
       activerecord
       activesupport
-    pg (0.10.0)
+    pg (0.10.1)
     polyglot (0.3.1)
     rack (1.2.1)
     rack-cache (1.0)
@@ -116,7 +116,7 @@ GEM
       json_pure
       rubyzip
     shoulda (2.11.3)
-    sqlite3-ruby (1.2.1)
+    sqlite3 (1.3.3)
     thor (0.14.6)
     treetop (1.4.9)
       polyglot (>= 0.3.1)
@@ -129,20 +129,21 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  activerecord-jdbc-adapter
   acts_as_list
   acts_as_tree
   dragonfly (~> 0.8.1)
   factory_girl
-  fastercsv (= 1.5.3)
+  jdbc-mysql
+  jdbc-postgres
+  jdbc-sqlite3
   mocha
-  mysql
+  mysql2
   paperclip
   pg
   rack-cache
   rails (~> 3.0)
-  render_inheritable
   shoulda
-  sqlite3-ruby (= 1.2.1)
+  sqlite3
   tartare!
   typus!
-  will_paginate (~> 3.0.pre2)

data/README.md

@@ -18,8 +18,8 @@ Français, Magyar, Italiano, Portuguese, Russian, 中文)
 - Integrated [paperclip][1] and [dragonfly][2] attachments viewer.
 - Low memory footprint.
 - Works with `Rails 3.0`.
-- Tested with `Ruby 1.8.7-p300` and `Ruby 1.9.2-p136`.
-- Tested with SQLite, MySQL and PostgreSQL.
+- Tested with `Ruby 1.8.7-p300` and `Ruby 1.9.2-p136` and `JRuby 1.5.6`.
+- Tested with `SQLite`, `MySQL` and `PostgreSQL`.
 - MIT License, the same as Rails.
 
 ## Links
@@ -38,6 +38,9 @@ Add **Typus** to your `Gemfile`
 
     gem 'typus', :git => 'https://github.com/fesplugas/typus.git'
 
+    # If you have problems with "Smart HTTP" use the "Git Transfer Protocol".
+    # gem 'typus', :git => 'git://github.com/fesplugas/typus.git'
+
 Update your bundle
 
     $ bundle install
@@ -52,9 +55,28 @@ Start the application server
 
 and go to <http://0.0.0.0:3000/admin>.
 
-## License
+## MIT License
+
+    Copyright (c) 2007-2011 Francesc Esplugas Marti
+
+    Permission is hereby granted, free of charge, to any person obtaining
+    a copy of this software and associated documentation files (the
+    "Software"), to deal in the Software without restriction, including
+    without limitation the rights to use, copy, modify, merge, publish,
+    distribute, sublicense, and/or sell copies of the Software, and to
+    permit persons to whom the Software is furnished to do so, subject to
+    the following conditions:
+
+    The above copyright notice and this permission notice shall be
+    included in all copies or substantial portions of the Software.
 
-Copyright © 2007-2011 Francesc Esplugas, released under the MIT license.
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+    LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+    OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 [1]: http://rubygems.org/gems/paperclip
 [2]: http://rubygems.org/gems/dragonfly

data/Rakefile

@@ -38,6 +38,9 @@ task :release => :build do
   system "git push && git push --tags"
   system "gem push typus-#{Typus::VERSION}.gem"
   system "git clean -fd && rm -f typus-#{Typus::VERSION}.gem"
+  system "git branch -D 3-0-stable"
+  system "git checkout -b 3-0-stable && git push -f"
+  system "git checkout master"
 end
 
 desc 'Deploy'

data/app/controllers/admin/resources_controller.rb

@@ -21,8 +21,8 @@ class Admin::ResourcesController < Admin::BaseController
   # your formats.
   #
   def index
-    add_action(:action_name => default_action.titleize, :action => default_action)
-    add_action(:action_name => "Trash", :action => "destroy", :confirm => "#{Typus::I18n.t("Trash")}?", :method => 'delete')
+    add_resource_action(default_action.titleize, {:action => default_action}, {})
+    add_resource_action("Trash", {:action => "destroy"}, {:confirm => "#{Typus::I18n.t("Trash")}?", :method => 'delete'})
 
     get_objects
 
@@ -34,8 +34,7 @@ class Admin::ResourcesController < Admin::BaseController
 
   def new
     item_params = params.dup
-    rejections = %w(controller action resource resource_id back_to selected)
-    item_params.delete_if { |k, v| rejections.include?(k) }
+    item_params.delete_if { |k, v| !@resource.columns.map(&:name).include?(k) }
     @item = @resource.new(item_params)
   end
 
@@ -57,8 +56,8 @@ class Admin::ResourcesController < Admin::BaseController
   end
 
   def edit
-    add_action(:action_name => default_action.titleize, :action => default_action)
-    add_action(:action_name => "Unrelate", :action => "unrelate", :confirm => "#{Typus::I18n.t("Unrelate")}?", :resource => @resource.model_name, :resource_id => @item.id)
+    add_resource_action(default_action.titleize, {:action => default_action}, {})
+    add_resource_action("Unrelate", {:action => "unrelate", :resource => @resource.model_name, :resource_id => @item.id}, {:confirm => "#{Typus::I18n.t("Unrelate")}?"})
   end
 
   def show
@@ -81,7 +80,8 @@ class Admin::ResourcesController < Admin::BaseController
 
   def detach
     if @item.update_attributes(params[:attribute] => nil)
-      redirect_on_success
+      notice = Typus::I18n.t("%{model} successfully updated.", :model => @resource.model_name.human)
+      redirect_to :back, :notice => notice
     else
       render :edit
     end
@@ -184,7 +184,7 @@ class Admin::ResourcesController < Admin::BaseController
 
     case item_class.relationship_with(@resource)
     when :has_one
-      association_name = @resource.model_name.downcase.to_sym
+      association_name = @resource.model_name.underscore.to_sym
       worked = item.send(association_name).delete
     else
       association_name ||= @resource.model_name.tableize.to_sym
@@ -249,19 +249,24 @@ class Admin::ResourcesController < Admin::BaseController
 
   def redirect_on_success
     action = @resource.typus_options_for(:action_after_save)
+    path = params.dup.cleanup
+    path.merge!(:action => action)
 
     case params[:action]
     when "create"
-      path = { :action => action }
       path.merge!(:id => @item.id) unless action.eql?("index")
       notice = Typus::I18n.t("%{model} successfully created.", :model => @resource.model_name.human)
     when "update", "detach"
-      path = case action
-             when "index"
-               params[:back_to] ? "#{params[:back_to]}##{@resource.to_resource}" : { :action => action }
-             else
-               { :action => action, :id => @item.id, :back_to => params[:back_to] }
-             end
+      case action
+      when "index"
+        if params[:back_to]
+          path = "#{params[:back_to]}##{@resource.to_resource}"
+        else
+          path.delete_if { |k, v| %w(action id).include?(k) }
+        end
+      else
+        path.merge!(:action => action) #, :id => @item.id)
+      end
       notice = Typus::I18n.t("%{model} successfully updated.", :model => @resource.model_name.human)
     end
 
@@ -339,7 +344,7 @@ class Admin::ResourcesController < Admin::BaseController
     case item_class.relationship_with(@resource)
     when :has_one
       # Order#invoice = @item
-      association_name = @resource.model_name.downcase.to_sym
+      association_name = @resource.model_name.underscore.to_sym
       item.send("#{association_name}=", @item)
       worked = true
     when :has_and_belongs_to_many
@@ -352,6 +357,10 @@ class Admin::ResourcesController < Admin::BaseController
       if item
         worked = @item.send(association_name).push(item)
       end
+    when :has_many
+      # Dog#image_holders
+      association_name = @resource.model_name.tableize.to_sym
+      worked = item.send(association_name).push(@item)
     end
 
     association = @resource.reflect_on_association(association_name)
@@ -375,7 +384,7 @@ class Admin::ResourcesController < Admin::BaseController
       if worked
         notice = Typus::I18n.t("%{model} successfully updated.", :model => item_class.model_name.human)
       else
-        alert = @item.error.full_messages
+        alert = @item.errors.full_messages
       end
     end
 
@@ -405,7 +414,7 @@ class Admin::ResourcesController < Admin::BaseController
       item = item_class.find(params[:resource_id]) if params[:resource_id]
 
       if item_class.relationship_with(@resource) == :has_one
-        association_name = @resource.model_name.downcase.to_sym
+        association_name = @resource.model_name.underscore.to_sym
         if item.send(association_name)
           render :text => "Not allowed!", :status => :unprocessable_entity
         end

data/app/helpers/admin/file_preview_helper.rb

@@ -11,14 +11,14 @@ module Admin
     end
 
     def link_to_detach_attribute(attribute)
-      validators = @item.class.validators.delete_if { |i| i.class != ActiveModel::Validations::PresenceValidator }.map { |i| i.attributes.to_s }.flatten
+      validators = @item.class.validators.delete_if { |i| i.class != ActiveModel::Validations::PresenceValidator }.map { |i| i.attributes }.flatten.map { |i| i.to_s }
 
       attachment = @item.send(attribute)
 
       field = case get_type_of_attachment(attachment)
-                 when :dragonfly then attribute
-                 when :paperclip then "#{attribute}_file_name"
-                 end
+              when :dragonfly then attribute
+              when :paperclip then "#{attribute}_file_name"
+              end
 
       if !validators.include?(field) && attachment
         attribute_i18n = @item.class.human_attribute_name(attribute)

data/app/helpers/admin/filters_helper.rb

@@ -2,7 +2,7 @@ module Admin
 
   module FiltersHelper
 
-    def build_filters(resource = @resource)
+    def build_filters(resource = @resource, params = params)
       typus_filters = resource.typus_filters
 
       return if typus_filters.empty?
@@ -24,7 +24,17 @@ module Admin
         { :filter => filter, :items => items }
       end
 
-      render "admin/helpers/filters/filters", :filters => filters
+      hidden_filters = params.dup
+
+      # Remove default params.
+      rejections = %w(controller action locale utf8 sort_order order_by)
+      hidden_filters.delete_if { |k, v| rejections.include?(k) }
+
+      # Remove also custom params.
+      rejections = filters.map { |i| i[:filter] }
+      hidden_filters.delete_if { |k, v| rejections.include?(k) }
+
+      render "admin/helpers/filters/filters", :filters => filters, :hidden_filters => hidden_filters
     end
 
     def set_filter(key, value)
@@ -44,7 +54,7 @@ module Admin
       class_name = att_assoc.options[:class_name] || filter.capitalize.camelize
       resource = class_name.typus_constantize
 
-      items = [[Typus::I18n.t("View belongs all %{attribute}", :attribute => @resource.human_attribute_name(filter).downcase.pluralize), ""]]
+      items = [[Typus::I18n.t("View all %{attribute}", :attribute => @resource.human_attribute_name(filter).downcase.pluralize), ""]]
       items += resource.order(resource.typus_order_by).map { |v| [v.to_label, v.id] }
     end
 
@@ -70,23 +80,10 @@ module Admin
     end
 
     def string_filter(filter)
-      values = @resource::const_get(filter.to_s.upcase)
-
+      values = @resource::const_get(filter.to_s.upcase).to_a
       items = [[Typus::I18n.t("Show by %{attribute}", :attribute => @resource.human_attribute_name(filter).downcase), ""]]
-
-      array = case values
-              when Hash
-                values
-              when Array
-                if values.first.is_a?(Array)
-                  keys, values = values.map { |i| i.first }, values.map { |i| i.last }
-                  keys.to_hash_with(values)
-                else
-                  values.to_hash_with(values)
-                end
-              end
-
-      items += array.to_a
+      array = values.first.is_a?(Array) ? values : values.map { |i| [i, i] }
+      items += array
     end
 
     def predefined_filters

data/app/helpers/admin/list_helper.rb

@@ -0,0 +1,20 @@
+module Admin
+
+  module ListHelper
+
+    def resources_actions
+      @resources_actions ||= []
+    end
+
+    def list_actions
+      resources_actions.map do |body, url, options|
+        if admin_user.can?(url[:action], @resource.name)
+          path = params.dup.merge!(url)
+          link_to Typus::I18n.t(body), path.cleanup, options # .merge(:target => "_parent")
+        end
+      end.compact.join(" / ").html_safe
+    end
+
+  end
+
+end

data/app/helpers/admin/resources_helper.rb

@@ -2,6 +2,7 @@ module Admin
 
   module ResourcesHelper
 
+    include Admin::ListHelper
     include Admin::FiltersHelper
     include Admin::FormHelper
     include Admin::RelationshipsHelper

data/app/helpers/admin/search_helper.rb

@@ -2,12 +2,14 @@ module Admin
 
   module SearchHelper
 
-    def search(resource = @resource)
+    def search(resource = @resource, params = params)
       if (typus_search = resource.typus_defaults_for(:search)) && typus_search.any?
-        search_params = params.dup
-        %w(action controller id search page utf8).each { |p| search_params.delete(p) }
-        options = { :hidden_params => search_params.map { |k, v| hidden_field_tag(k, v) } }
-        render "admin/helpers/search/search", options
+
+        hidden_filters = params.dup
+        rejections = %w(controller action locale utf8 sort_order order_by search)
+        hidden_filters.delete_if { |k, v| rejections.include?(k) }
+
+        render "admin/helpers/search/search", :hidden_filters => hidden_filters
       end
     end
 

data/app/helpers/admin/table_helper.rb

@@ -47,16 +47,16 @@ module Admin
       fields.map { |k, v| send("table_#{v}_field", k, item) }
     end
 
-    def actions
-      @actions ||= []
+    def resource_actions
+      @resource_actions ||= []
     end
 
     def table_actions(model, item, association_name = nil)
-      actions.map do |action|
-        if admin_user.can?(action[:action], model.name)
-          link_to Typus::I18n.t(action[:action_name]),
-                  { :controller => model.to_resource, :action => action[:action], :id => item.id, :resource => action[:resource], :resource_id => action[:resource_id], :association_name => association_name },
-                  { :confirm => action[:confirm], :method => action[:method], :target => "_parent" }
+      resource_actions.map do |body, url, options|
+        if admin_user.can?(url[:action], model.name)
+          link_to Typus::I18n.t(body),
+                  params.dup.cleanup.merge(url).merge(:controller => model.to_resource, :id => item.id),
+                  options.merge(:target => "_parent")
         end
       end.compact.join(" / ").html_safe
     end
@@ -137,8 +137,8 @@ module Admin
 
     def table_boolean_field(attribute, item)
       status = item.send(attribute)
-      boolean_hash = item.class.typus_boolean(attribute).invert
-      human_boolean = status ? boolean_hash["true"] : boolean_hash["false"]
+      boolean_assoc = item.class.typus_boolean(attribute)
+      human_boolean = (status ? boolean_assoc.rassoc("true") : boolean_assoc.rassoc("false")).first
 
       options = { :controller => "/admin/#{item.class.to_resource}",
                   :action => "toggle",

data/app/views/admin/helpers/filters/_filters.html.erb

@@ -5,7 +5,11 @@
       <% filters.each do |filter| %>
         <li><%= select_tag filter[:filter], options_for_select(filter[:items], params[filter[:filter]]) %></li>
       <% end %>
-      <%= hidden_field_tag :search, params[:search] if params[:search] %>
+
+      <% hidden_filters.each do |key, value| %>
+        <%= hidden_field_tag key, value %>
+      <% end %>
+
       <li><%= submit_tag Typus::I18n.t("Filter"), :name => nil %></li>
     </ul>
   </div>

data/app/views/admin/helpers/search/_search.html.erb

@@ -1,12 +1,15 @@
 <div id="search">
 
-  <%= form_tag url_for(:controller => params[:controller]), :method => :get do %>
+  <%= form_tag nil, :method => :get do %>
+
     <ul>
       <li><%= search_field_tag "search", nil, :id => "quicksearch", :title => (params[:search] || Typus::I18n.t("Search")) %></li>
     </ul>
-    <% hidden_params.each do |field| %>
-      <%= field %>
+
+    <% hidden_filters.each do |key, value| %>
+      <%= hidden_field_tag key, value %>
     <% end %>
+
   <% end %>
 
 </div>

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

@@ -9,6 +9,7 @@
 
 <h2>
   <%= page_title %>
+  <small><%= list_actions %></small>
 </h2>
 
 <%= display_link_to_previous %>
@@ -16,11 +17,7 @@
 <%= render 'edit' %>
 
 <%
-  options = { :action => "update",
-              :id => @item.id ,
-              :back_to => params[:back_to],
-              :resource => params[:resource],
-              :resource_id => params[:resource_id] }
+  options = params.dup.cleanup.merge!(:action => 'update')
   button = Typus::I18n.t("Save %{resource}", :resource => @resource.model_name.human)
 %>
 

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

@@ -7,6 +7,7 @@
 
 <h2>
   <%= page_title %>
+  <small><%= list_actions %></small>
 </h2>
 
 <%= display_flash_message %>
@@ -15,7 +16,7 @@
 
 <ul class="predefined_filters">
   <% predefined_filters.each do |filter, action, scope| %>
-    <li><%= link_to Typus::I18n.t(filter), :action => action %> (<%= @resource.send(scope).count %>)</li>
+    <li><%= link_to Typus::I18n.t(filter), params.dup.cleanup.merge(:action => action) %> (<%= @resource.send(scope).count %>)</li>
   <% end %>
 </ul>
 
@@ -30,5 +31,5 @@
   <%= raw build_list(@resource, @fields, @items) %>
   <%= will_paginate(@items, Typus.pagination) %>
 <% else %>
-  <p><%= Typus::I18n.t("No %{resources} found.", :resources => @resource.model_name.human.pluralize.downcase) %></p>
+  <p><%= Typus::I18n.t("No %{resources} found.", :resources => @resource.model_name.human.downcase.pluralize) %></p>
 <% end %>

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

@@ -7,17 +7,14 @@
 
 <h2>
   <%= page_title %>
+  <small><%= list_actions %></small>
 </h2>
 
 <%= display_link_to_previous %>
 <%= render 'new' %>
 
 <%
-  options = { :action => 'create',
-              :back_to => params[:back_to],
-              :selected => params[:selected],
-              :resource => params[:resource],
-              :resource_id => params[:resource_id] }
+  options = params.dup.cleanup.merge(:action => 'create')
   button = Typus::I18n.t("Create %{resource}", :resource => @resource.model_name.human)
 %>
 

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

@@ -7,20 +7,20 @@
 
 <h2>
   <%= page_title %>
+  <small><%= list_actions %></small>
 </h2>
 
 <%= display_flash_message %>
 <%= render 'show' %>
 
 <dl>
-<%- @fields.each do |field| -%>
-  <dt><%=h @resource.human_attribute_name(field.first) %></dt>
+<%- @fields.each do |key, value| -%>
+  <dt><%=h @resource.human_attribute_name(key) %></dt>
   <%-
-    data_type = field.last
-    raw_data = @item.send(field.first)
-    data = case data_type
+    raw_data = @item.send(key)
+    data = case value
            when :boolean
-             @resource.typus_boolean(field.first).invert[raw_data.to_s]
+             @resource.typus_boolean(key).invert[raw_data.to_s]
            when :belongs_to
              if raw_data
                link_to raw_data.to_label, { :controller => raw_data.class.to_resource,
@@ -28,9 +28,13 @@
                                             :id => raw_data }
              end
            when :file
-             typus_file_preview(@item, field.first)
+             typus_file_preview(@item, key)
            when :selector
-             @item.mapping(field.first)
+             @item.mapping(key)
+           when :datetime
+             if raw_data
+               I18n.localize(raw_data, :format => @resource.typus_date_format(key))
+             end
            else
              raw_data
            end

data/app/views/admin/templates/_has_n.html.erb

@@ -1,7 +1,7 @@
 <div class="box_relationships" id="<%= association_name %>">
 
   <h2>
-    <%= association_name.capitalize.pluralize %>
+    <%= association_name.humanize.pluralize %>
     <small><%= add_new %></small>
   </h2>
 
@@ -11,7 +11,7 @@
     <%= table %>
     <%= will_paginate(@items, Typus.pagination.merge(:anchor => association_name)) %>
   <% else %>
-    <p><%= Typus::I18n.t("No %{resources} found.", :resources => association_name.pluralize.downcase) %></p>
+    <p><%= Typus::I18n.t("No %{resources} found.", :resources => association_name.humanize.downcase.pluralize) %></p>
   <% end %>
 
 </div>

data/app/views/layouts/admin/base.html.erb

@@ -8,7 +8,7 @@
   <meta name="apple-mobile-web-app-capable" content="yes" />
   <meta name="generator" content="Typus <%= Typus::VERSION %>" />
 
-  <title><%= yield :title %></title>
+  <title><%= Typus.admin_title %> &mdash; <%= yield :title %></title>
 
   <%= stylesheet_link_tag "/admin/stylesheets/screen",
                           "/admin/stylesheets/application",

data/app/views/layouts/admin/session.html.erb

@@ -8,7 +8,7 @@
   <meta name="apple-mobile-web-app-capable" content="yes" />
   <meta name="generator" content="Typus <%= Typus::VERSION %>" />
 
-  <title><%= yield :title %></title>
+  <title><%= Typus.admin_title %> &mdash; <%= yield :title %></title>
 
   <%= stylesheet_link_tag "/admin/stylesheets/screen",
                           "/admin/stylesheets/application" %>

data/lib/support/active_record.rb

@@ -2,7 +2,7 @@ class ActiveRecord::Base
 
   def self.relationship_with(model)
     association = reflect_on_association(model.table_name.to_sym) ||
-                  reflect_on_association(model.model_name.downcase.to_sym)
+                  reflect_on_association(model.model_name.underscore.to_sym)
     association.macro
   end
 
@@ -35,19 +35,9 @@ class ActiveRecord::Base
   #     => "Publicado"
   #++
   def mapping(attribute)
-    values = self.class::const_get(attribute.to_s.upcase)
-
-    if values.is_a?(Array)
-      case values.first
-      when Array
-        array_keys, array_values = values.transpose
-      else
-        array_keys = array_values = values
-      end
-      values = array_keys.to_hash_with(array_values)
-    end
-
-    values.invert[send(attribute)]
+    values = self.class::const_get(attribute.to_s.upcase).to_a
+    array = values.first.is_a?(Array) ? values : values.map { |i| [i, i] }
+    array.rassoc(send(attribute)).first
   end
 
   def to_label

data/lib/support/hash.rb

@@ -4,4 +4,14 @@ class Hash
     delete_if { |k, v| v.blank? }
   end
 
+  def cleanup
+    whitelist = %w(controller action id
+                   CKEditor CKEditorFuncNum langCode
+                   layout
+                   resource resource_id resource_action
+                   selected
+                   back_to)
+    delete_if { |k, v| !whitelist.include?(k) }
+  end
+
 end

data/lib/typus.rb

@@ -1,7 +1,6 @@
 # coding: utf-8
 
 require "support/active_record"
-require "support/array"
 require "support/hash"
 require "support/object"
 require "support/string"

data/lib/typus/actions.rb

@@ -4,22 +4,36 @@ module Typus
 
     protected
 
-    def add_action(*args)
-      options = args.extract_options!
-      @actions ||= []
-      @actions << options
+    def add_resource_action(*args)
+      @resource_actions ||= []
+      @resource_actions << args
     end
 
-    def prepend_action(*args)
-      options = args.extract_options!
-      @actions ||= []
-      @actions = @actions.unshift(options)
+    def prepend_resource_action(*args)
+      @resource_actions ||= []
+      @resource_actions = @resource_actions.unshift(args)
     end
 
-    def append_action(*args)
-      options = args.extract_options!
-      @actions ||= []
-      @actions = @actions.concat([options])
+    def append_resource_action(*args)
+      @resource_actions ||= []
+      @resource_actions = @resource_actions.concat([args])
+    end
+
+    # FIXME: I know this is ugly but first of all I want to see it working.
+
+    def add_resources_action(*args)
+      @resources_actions ||= []
+      @resources_actions << args
+    end
+
+    def prepend_resources_action(*args)
+      @resources_actions ||= []
+      @resources_actions = @resources_actions.unshift(args)
+    end
+
+    def append_resources_action(*args)
+      @resources_actions ||= []
+      @resources_actions = @resources_actions.concat([args])
     end
 
   end

data/lib/typus/orm/active_record.rb

@@ -29,7 +29,7 @@ module Typus
           data = read_model_config['fields']
           fields = data[filter.to_s] || data['default'] || ""
 
-          virtual_fields = instance_methods - model_fields.keys.map { |i| i.to_s }
+          virtual_fields = instance_methods.map { |i| i.to_s } - model_fields.keys.map { |i| i.to_s }
 
           fields.extract_settings.map { |f| f.to_sym }.each do |field|
             if reflect_on_association(field)
@@ -176,7 +176,7 @@ module Typus
                     ["True", "False"]
                   end
 
-        { boolean.first => "true", boolean.last => "false" }
+        [[boolean.first, "true"], [boolean.last, "false"]]
       end
 
       #--

data/lib/typus/version.rb

@@ -1,3 +1,3 @@
 module Typus
-  VERSION = "3.0.4"
+  VERSION = "3.0.5"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: typus
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 3
   - 0
-  - 4
-  version: 3.0.4
+  - 5
+  version: 3.0.5
 platform: ruby
 authors: 
 - Francesc Esplugas
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-21 00:00:00 +01:00
+date: 2011-01-28 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,14 +24,13 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 5
         segments: 
         - 1
         - 5
-        - 3
-        version: 1.5.3
+        version: "1.5"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -85,6 +84,7 @@ files:
 - app/helpers/admin/file_preview_helper.rb
 - app/helpers/admin/filters_helper.rb
 - app/helpers/admin/form_helper.rb
+- app/helpers/admin/list_helper.rb
 - app/helpers/admin/relationships_helper.rb
 - app/helpers/admin/resources_helper.rb
 - app/helpers/admin/search_helper.rb
@@ -212,7 +212,6 @@ files:
 - lib/generators/typus/typus_generator.rb
 - lib/generators/typus/views_generator.rb
 - lib/support/active_record.rb
-- lib/support/array.rb
 - lib/support/fake_user.rb
 - lib/support/hash.rb
 - lib/support/object.rb

data/lib/support/array.rb

@@ -1,13 +0,0 @@
-class Array
-
-  #--
-  # Taken from http://snippets.dzone.com/posts/show/302
-  #
-  # >> %W{ a b c }.to_hash_with( %W{ 1 2 3 } )
-  # => {"a"=>"1", "b"=>"2", "c"=>"3"}
-  #++
-  def to_hash_with(other)
-    Hash[ *(0...self.size()).inject([]) { |arr, ix| arr.push(self[ix], other[ix]) } ]
-  end
-
-end