typus 3.0.8 → 3.0.9

data/Gemfile

@@ -15,7 +15,7 @@ gem 'rack-cache', :require => 'rack/cache'
 gem 'rails', '~> 3.0'
 
 group :test do
-  gem 'shoulda'
+  gem 'shoulda-context'
   gem 'mocha' # Make sure mocha is loaded at the end ...
 end
 
@@ -39,6 +39,13 @@ group :development, :test do
 
 end
 
+# MongoDB support is still in "beta" mode, so I'm not testing it for the moment.
+group :production do
+  # MongoDB support
+  gem 'mongoid', '2.0.0.rc.7'
+  gem 'bson_ext'
+end
+
 group :production do
 
   platforms :jruby do

data/README.md

@@ -17,8 +17,8 @@ Français, Magyar, Italiano, Portuguese, Russian, 中文)
 - Customizable and extensible templates.
 - 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` and `JRuby 1.5.6`.
+- Works with `Rails 3.0.5`.
+- Tested with `ruby-1.8.7-p334`, `ree-1.8.7-2011.03` and `ruby-1.9.2-p180` and `jruby-1.5.6`.
 - Tested with `SQLite`, `MySQL` and `PostgreSQL`.
 - MIT License, the same as Rails.
 

data/Rakefile

@@ -15,7 +15,6 @@ Rake::TestTask.new(:test) do |t|
   t.verbose = true
 end
 
-=begin
 desc 'Generate plugin documentation.'
 Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
@@ -24,39 +23,32 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('README.rdoc')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
-=end
 
+desc "Deploy test/fixtures/rails_app"
 task :deploy do
   system "cd test/fixtures/rails_app && cap deploy"
 end
 
-RUBIES = ["ruby-1.8.7-p330", "ruby-1.9.2-p136", "ree-1.8.7-2010.02", "jruby-1.5.6"]
+RUBIES = %w[1.8.7 ree 1.9.2 jruby].join(",")
 
 namespace :setup do
 
   desc "Setup test environment"
   task :test_environment do
-    RUBIES.each { |ruby| system "rvm install #{ruby}" }
+    system "rvm install #{RUBIES}"
   end
 
   desc "Setup CI Joe"
   task :cijoe do
-    system "git config --replace-all cijoe.runner 'rake test:all'"
+    system "git config --replace-all cijoe.runner 'rake test:rubies'"
   end
 
 end
 
 namespace :test do
 
-  task :all do
-    RUBIES.each do |ruby|
-      system "rvm use #{ruby}"
-      system "rm -f Gemfile.lock"
-      system "bundle install"
-      system "rake"
-      # system "rake DB=postgresql"
-      # system "rake DB=mysql"
-    end
+  task :rubies do
+    system "rvm #{RUBIES} rake"
   end
 
 end

data/app/controllers/admin/base_controller.rb

@@ -25,7 +25,7 @@ class Admin::BaseController < ActionController::Base
   end
 
   def set_locale
-    I18n.locale = admin_user.locale
+    I18n.locale = admin_user.locale if admin_user.respond_to?(:locale)
   end
 
 end

data/app/controllers/admin/dashboard_controller.rb

@@ -1,7 +1,6 @@
 class Admin::DashboardController < Admin::BaseController
 
   def show
-    raise "Run `rails generate typus` to create configuration files." if Typus.applications.empty?
   end
 
 end

data/app/controllers/admin/resources_controller.rb

@@ -6,13 +6,13 @@ class Admin::ResourcesController < Admin::BaseController
   include Typus::Controller::Filters
   include Typus::Controller::Format
 
+  Whitelist = [:edit, :update, :destroy, :toggle, :position, :relate, :unrelate]
+
   before_filter :get_model
   before_filter :set_scope
-  before_filter :get_object, :only => [:show, :edit, :update, :destroy, :toggle, :position, :relate, :unrelate]
-  before_filter :check_resource_ownership, :only => [:edit, :update, :destroy, :toggle, :position, :relate, :unrelate ]
+  before_filter :get_object, :only => Whitelist + [:show]
+  before_filter :check_resource_ownership, :only => Whitelist
   before_filter :check_if_user_can_perform_action_on_resources
-  before_filter :set_order, :only => [:index]
-  before_filter :set_fields, :only => [:index, :new, :edit, :create, :update, :show]
 
   ##
   # This is the main index of the model. With filters, conditions and more.
@@ -89,7 +89,6 @@ class Admin::ResourcesController < Admin::BaseController
     respond_to do |format|
       if @item.update_attributes(attributes)
         set_attributes_on_update
-        reload_locales
         format.html { redirect_on_success }
         format.json { render :json => @item }
       else
@@ -119,10 +118,7 @@ class Admin::ResourcesController < Admin::BaseController
         end
         format.json { render :json => @item }
       else
-        format.html do
-          set_fields
-          render :edit
-        end
+        format.html { render :edit }
         format.json { render :json => @item.errors, :status => :unprocessable_entity }
       end
     end
@@ -239,9 +235,10 @@ class Admin::ResourcesController < Admin::BaseController
     @resource = @resource.order(set_order).includes(eager_loading)
   end
 
-  def set_fields
-    @fields = @resource.typus_fields_for(params[:action].action_mapper)
+  def fields
+    @resource.typus_fields_for(params[:action])
   end
+  helper_method :fields
 
   def set_order
     params[:sort_order] ||= "desc"

data/app/controllers/admin/session_controller.rb

@@ -2,7 +2,6 @@ class Admin::SessionController < Admin::BaseController
 
   skip_before_filter :reload_config_and_roles
   skip_before_filter :authenticate
-  skip_before_filter :set_locale
 
   before_filter :create_an_account?, :only => [:new, :create]
 
@@ -23,9 +22,7 @@ class Admin::SessionController < Admin::BaseController
   end
 
   def destroy
-    session[:typus_user_id] = nil
-    I18n.locale = I18n.default_locale
-    redirect_to :action => :new
+    deauthenticate
   end
 
   private
@@ -34,4 +31,8 @@ class Admin::SessionController < Admin::BaseController
     redirect_to new_admin_account_path if Typus.user_class.count.zero?
   end
 
+  def set_locale
+    I18n.locale = I18n.default_locale
+  end
+
 end

data/app/helpers/admin/base_helper.rb

@@ -1,5 +1,4 @@
 module Admin
-
   module BaseHelper
 
     def title(page_title)
@@ -24,6 +23,15 @@ module Admin
       end
     end
 
+    def admin_sign_out_path
+      case Typus.authentication
+      when :devise
+        send("destroy_#{Typus.user_class_name.underscore}_session")
+      else
+        destroy_admin_session_path
+      end
+    end
+
     def display_flash_message(message = flash)
       if message.compact.any?
         render "admin/helpers/base/flash_message",
@@ -33,5 +41,4 @@ module Admin
     end
 
   end
-
 end

data/app/helpers/admin/dashboard_helper.rb

@@ -1,16 +1,10 @@
 module Admin
-
   module DashboardHelper
 
-    def applications
-      render "admin/helpers/dashboard/applications"
-    end
-
     def resources(admin_user)
       available = Typus.resources.delete_if { |r| !(admin_user.is_a?(FakeUser) || admin_user.resources.include?(r)) }
       render "admin/helpers/dashboard/resources", :resources => available
     end
 
   end
-
 end

data/app/helpers/admin/display_helper.rb

@@ -45,6 +45,7 @@ module Admin
     alias_method :display_text, :display_string
     alias_method :display_position, :display_string
     alias_method :display_integer, :display_string
+    alias_method :display_decimal, :display_string
 
   end
 end

data/app/helpers/admin/file_preview_helper.rb

@@ -1,5 +1,4 @@
 module Admin
-
   module FilePreviewHelper
 
     def get_type_of_attachment(attachment)
@@ -64,5 +63,4 @@ module Admin
     end
 
   end
-
 end

data/app/helpers/admin/filters_helper.rb

@@ -1,5 +1,4 @@
 module Admin
-
   module FiltersHelper
 
     def build_filters(resource = @resource, params = params)
@@ -80,7 +79,12 @@ module Admin
     end
 
     def string_filter(filter)
-      values = @resource::const_get(filter.to_s.upcase).to_a
+      values = if @resource.const_defined?(filter.to_s.upcase)
+                 @resource::const_get(filter.to_s.upcase).to_a
+               else
+                 @resource.send(filter.to_s).to_a
+               end
+
       items = [[Typus::I18n.t("Show by %{attribute}", :attribute => @resource.human_attribute_name(filter).downcase), ""]]
       array = values.first.is_a?(Array) ? values : values.map { |i| [i, i] }
       items += array
@@ -91,5 +95,4 @@ module Admin
     end
 
   end
-
 end

data/app/helpers/admin/form_helper.rb

@@ -1,5 +1,4 @@
 module Admin
-
   module FormHelper
 
     def build_form(fields, form)
@@ -19,7 +18,7 @@ module Admin
                     typus_template_field(key, :string, form)
                   end
         end
-      end
+      end.html_safe
     end
 
     def typus_tree_field(attribute, form)
@@ -38,7 +37,7 @@ module Admin
           next if admin_user.cannot?('read', association.class_name.typus_constantize)
           html << send("typus_form_#{association.macro}", relationship)
         end
-      end
+      end.html_safe
     end
 
     def typus_template_field(attribute, template, form)
@@ -74,5 +73,4 @@ module Admin
     end
 
   end
-
 end

data/app/helpers/admin/list_helper.rb

@@ -1,5 +1,4 @@
 module Admin
-
   module ListHelper
 
     def resources_actions
@@ -12,7 +11,7 @@ module Admin
           path = params.dup.merge!(url).compact.cleanup
           link_to Typus::I18n.t(body), path, options
         end
-      end.join(" / ").html_safe
+      end.compact.join(" / ").html_safe
     end
 
     #--
@@ -27,5 +26,4 @@ module Admin
     end
 
   end
-
 end

data/app/helpers/admin/relationships_helper.rb

@@ -1,5 +1,4 @@
 module Admin
-
   module RelationshipsHelper
 
     def setup_relationship(field)
@@ -107,7 +106,7 @@ module Admin
 
     def set_condition
       if @resource.typus_user_id? && admin_user.is_not_root?
-        @item.owned_by?(admin_user)
+        admin_user.owns?(@item)
       else
         true
       end
@@ -152,7 +151,7 @@ module Admin
         # Pass the resource_id only to edit/update because only there is where
         # the record actually exists.
         options.merge!(:resource_id => @item.id) if %w(edit update).include?(params[:action])
-        message = link_to Typus::I18n.t("Add"), options
+        message = link_to Typus::I18n.t("Add new"), options
       end
 
       # Set the template.
@@ -183,5 +182,4 @@ module Admin
     end
 
   end
-
 end

data/app/helpers/admin/resources_helper.rb

@@ -1,5 +1,4 @@
 module Admin
-
   module ResourcesHelper
 
     include Admin::DisplayHelper
@@ -34,5 +33,4 @@ module Admin
     end
 
   end
-
 end

data/app/helpers/admin/search_helper.rb

@@ -1,5 +1,4 @@
 module Admin
-
   module SearchHelper
 
     def search(resource = @resource, params = params)
@@ -14,5 +13,4 @@ module Admin
     end
 
   end
-
 end

data/app/helpers/admin/sidebar_helper.rb

@@ -1,5 +1,4 @@
 module Admin
-
   module SidebarHelper
 
     def build_sidebar
@@ -41,5 +40,4 @@ module Admin
     end
 
  end
-
 end

data/app/helpers/admin/table_helper.rb

@@ -1,5 +1,4 @@
 module Admin
-
   module TableHelper
 
     def build_table(model, fields, items, link_options = {}, association = nil, association_name = nil)
@@ -15,7 +14,7 @@ module Admin
     def table_header(model, fields, params = params)
       fields.map do |key, value|
 
-        key = key.gsub(".", " ") if key.match(/\./)
+        key = key.gsub(".", " ") if key.to_s.match(/\./)
         content = model.human_attribute_name(key)
 
         if params[:action].eql?('index') && model.typus_options_for(:sortable)
@@ -80,12 +79,10 @@ module Admin
 
     alias :table_has_many_field :table_has_and_belongs_to_many_field
 
-    def table_string_field(attribute, item)
+    def table_text_field(attribute, item)
       (raw_content = item.send(attribute)).present? ? truncate(raw_content) : "—".html_safe
     end
 
-    alias :table_text_field :table_string_field
-
     def table_generic_field(attribute, item)
       (raw_content = item.send(attribute)).present? ? raw_content : "—".html_safe
     end
@@ -94,6 +91,7 @@ module Admin
     alias :table_integer_field :table_generic_field
     alias :table_decimal_field :table_generic_field
     alias :table_virtual_field :table_generic_field
+    alias :table_string_field :table_generic_field
 
     def table_selector_field(attribute, item)
       item.mapping(attribute)
@@ -159,5 +157,4 @@ module Admin
     end
 
   end
-
 end

data/app/views/admin/account/forgot_password.html.erb

@@ -9,11 +9,11 @@
 
     <li>
       <%= form.label :email, Typus.user_class.human_attribute_name(:email) %>
-      <%= form.text_field :email, :size => 20, :class => "text" %>
+      <%= form.text_field :email, :size => 20, :class => "text", :autofocus => 'autofocus' %>
     </li>
 
     <li>
-      <%= submit_tag Typus::I18n.t("Submit"), :class => "button" %> <%= link_to Typus::I18n.t("I remember my password"), new_admin_session_path %>
+      <%= submit_tag Typus::I18n.t("Submit"), :class => "button", :disable_with => Typus::I18n.t("Sending data ...") %> <%= link_to Typus::I18n.t("I remember my password"), new_admin_session_path %>
     </li>
 
   </ul>