typus 3.1.0.rc18 → 3.1.0.rc19

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

@@ -6,7 +6,7 @@
   "Actions": "Acções"
   "Active": "Activo"
   "Add": "Adicionar"
-  "Add new": "Adicionar novo"
+  "Add New": "Adicionar novo"
   "Are you sure?": "Tem a certeza?"
   "Are you sure you want to sign out and end your session?": "Tem certeza que quer sair e encerrar sua sessão?"
 
@@ -32,7 +32,7 @@
   "Last 30 days": "Últimos 30 dias"
   "Last 7 days": "Últimos 7 dias"
   "List": "Lista"
-  "Logged as": "Logado como"
+  "Logged in as": "Logado como"
   "Login": "Login"
 
   "New": "Novo"

data/config/locales/typus.ru.yml

@@ -31,7 +31,7 @@ ru:
   "Last few days": "Последние дней"
   "Last 7 days": "Последние 7 дней"
   "Last 30 days": "Последние 30 дней"
-  "Logged as": "Вы вошли как"
+  "Logged in as": "Вы вошли как"
   "Login": "Редактировать"
 
   "New": "Новый"

data/config/locales/typus.zh-CN.yml

@@ -30,7 +30,7 @@ zh-CN:
   "Last few days": "最近几天"
   "Last 30 days": "最近一个月"
   "Last 7 days": "最近一周"
-  "Logged as": "登录为"
+  "Logged in as": "登录为"
   "Login": "登录"
 
   "New": "新建"

data/config/routes.rb

@@ -2,7 +2,11 @@ Rails.application.routes.draw do
 
   scope "admin", :module => :admin, :as => "admin" do
 
-    match "/" => "dashboard#show", :as => "dashboard"
+    match "/" => redirect("/admin/dashboard")
+
+    match "dashboard" => "dashboard#index", :as => "dashboard_index"
+    match "dashboard/:application" => "dashboard#show", :as => "dashboard"
+
     match "user_guide" => "base#user_guide"
 
     if Typus.authentication == :session

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

@@ -6,6 +6,15 @@ Typus.setup do |config|
 
   # When mailer_sender is set, password recover is enabled. This email
   # address will be used in Admin::Mailer.
+  #
+  # Remember to setup the default url options for your specific environment
+  # Here is an example of development environment:
+  #
+  #     config.action_mailer.default_url_options = { :host => 'localhost:3000' }
+  #
+  # This is a required Rails configuration. In production it must be the actual
+  # actual host of your application
+  #
   # config.mailer_sender = "admin@example.com"
 
   # Define paperclip attachment styles.

data/lib/generators/templates/config/typus/README

@@ -12,14 +12,11 @@ most common settings.
         show: title, category, is_published?
         relationship: title, status
         options:
-          auto_generated:
           booleans:
             is_published: ["Yes, it is", "No, it isn't"]
           date_formats:
             created_at: post_long
           selectors:
-          read_only:
-          filter_by_date_range: valid_until
           templates:
             body: rich_text
       actions:
@@ -37,13 +34,10 @@ most common settings.
         end_year: 2015
         form_rows: 25
         minute_step: 15
-        nil: 'nil'
         only_user_items: true
         per_page: 25
         start_year: 1990
 
-Note: To define namespace models use :: as a separator. (i.e. Delayed::Job)
-
 # Roles
 
 In this file you can configure the actions available for each of your models

data/lib/support/active_record.rb

@@ -1,11 +1,5 @@
 class ActiveRecord::Base
 
-  def self.relationship_with(model)
-    association = reflect_on_association(model.table_name.to_sym) ||
-                  reflect_on_association(model.model_name.underscore.to_sym)
-    association.macro
-  end
-
   #--
   # On a model:
   #
@@ -32,11 +26,11 @@ class ActiveRecord::Base
 
     array = values.first.is_a?(Array) ? values : values.map { |i| [i, i] }
 
-    value = array.rassoc(send(attribute))
+    value = array.to_a.rassoc(send(attribute))
     value ? value.first : send(attribute)
   end
 
-  def to_str
+  def to_label
     if respond_to?(:name) && send(:name).present?
       send(:name)
     else
@@ -44,6 +38,4 @@ class ActiveRecord::Base
     end
   end
 
-  alias_method :to_label, :to_str
-
 end

data/lib/support/string.rb

@@ -12,11 +12,16 @@ class String
     remove_prefix.classify.constantize
   end
 
+  ##
+  # CRUD: create, read, update, delete
+  #
+  # You can read more at http://en.wikipedia.org/wiki/Create,_read,_update_and_delete
+  #
   def acl_action_mapper
     case self
     when "new", "create"
       "create"
-    when "index", "show", "autocomplete"
+    when "index", "show"
       "read"
     when "edit", "update", "position", "toggle", "relate", "unrelate"
       "update"

data/lib/typus.rb

@@ -23,8 +23,6 @@ module Typus
     autoload :Actions, "typus/controller/actions"
     autoload :ActsAsList, "typus/controller/acts_as_list"
     autoload :Ancestry, "typus/controller/ancestry"
-    autoload :Associations, "typus/controller/associations"
-    autoload :Autocomplete, "typus/controller/autocomplete"
     autoload :Bulk, "typus/controller/bulk"
     autoload :FeaturedImage, "typus/controller/featured_image"
     autoload :Filters, "typus/controller/filters"
@@ -38,19 +36,17 @@ module Typus
     autoload :Base, "typus/authentication/base"
     autoload :Devise, "typus/authentication/devise"
     autoload :None, "typus/authentication/none"
+    autoload :NoneWithRole, "typus/authentication/none_with_role"
     autoload :HttpBasic, "typus/authentication/http_basic"
     autoload :Session, "typus/authentication/session"
   end
 
-  mattr_accessor :autocomplete
-  @@autocomplete = nil
-
   mattr_accessor :admin_title
   @@admin_title = "Typus"
 
   mattr_accessor :admin_sub_title
   @@admin_sub_title = <<-CODE
-<a href="http://core.typuscms.com/">core.typuscms.com</a>
+<a href="http://core.typuscmf.com/">core.typuscmf.com</a>
   CODE
 
   ##
@@ -121,6 +117,9 @@ module Typus
   mattr_accessor :image_thumb_size
   @@image_thumb_size = 'x100'
 
+  mattr_accessor :image_table_thumb_size
+  @@image_table_thumb_size = '25x25#'
+
   ##
   # Defines the default relationship table.
   #
@@ -149,12 +148,26 @@ module Typus
     end
 
     def applications
-      Typus::Configuration.config.map { |i| i.last["application"] }.compact.uniq.sort
+      hash = {}
+
+      Typus::Configuration.config.map { |i| i.last["application"] }.compact.uniq.each do |app|
+        settings = app.extract_settings
+        hash[settings.first] = settings.size > 1 ? settings.last : 1000
+      end
+
+      hash.sort { |a1, a2| a1[1].to_i <=> a2[1].to_i }.map { |i| i.first }
     end
 
     # Lists modules of an application.
     def application(name)
-      Typus::Configuration.config.map { |i| i.first if i.last["application"] == name }.compact.uniq
+      array = []
+
+      Typus::Configuration.config.each do |i|
+        settings = i.last["application"]
+        array << i.first if settings && settings.extract_settings.first.eql?(name)
+      end
+
+      array.compact.uniq
     end
 
     # Lists models from the configuration file.
@@ -184,17 +197,43 @@ module Typus
       detect_application_models.map do |model|
         class_name = model.sub(/\.rb$/,"").camelize
         klass = class_name.split("::").inject(Object) { |klass,part| klass.const_get(part) }
-        class_name if klass < ActiveRecord::Base && !klass.abstract_class?
+        class_name if is_active_record?(klass) || is_mongoid?(klass)
       end.compact
     end
 
+    def is_active_record?(klass)
+      (defined?(ActiveRecord) && klass < ActiveRecord::Base && !klass.abstract_class?)
+    end
+    private :is_active_record?
+
+    def is_mongoid?(klass)
+      (defined?(Mongoid) && klass < Mongoid::Document)
+    end
+    private :is_mongoid?
+
     def user_class
       user_class_name.constantize
     end
 
+    def root
+      Rails.root.join(config_folder)
+    end
+
+    def model_configuration_files
+      app = Typus.root.join("*.yml")
+      plugins = Rails.root.join("vendor", "plugins", "*", "config", "typus", "*.yml")
+      Dir[app, plugins].reject { |f| f.match(/_roles.yml/) }.sort
+    end
+
+    def role_configuration_files
+      app = Typus.root.join("*_roles.yml")
+      plugins = Rails.root.join("vendor", "plugins", "*", "config", "typus", "*_roles.yml")
+      Dir[app, plugins].sort
+    end
+
     def reload!
       Typus::Configuration.roles!
-      Typus::Configuration.config!
+      Typus::Configuration.models!
     end
 
   end

data/lib/typus/authentication/base.rb

@@ -15,10 +15,6 @@ module Typus
       def set_attributes_on_create; end
       def set_attributes_on_update; end
 
-      def not_allowed
-        render :text => "Not allowed!", :status => :unprocessable_entity
-      end
-
     end
   end
 end

data/lib/typus/authentication/none_with_role.rb

@@ -0,0 +1,15 @@
+module Typus
+  module Authentication
+    module NoneWithRole
+
+      protected
+
+      include Base
+
+      def authenticate
+        @admin_user = MyFakeUser.new
+      end
+
+    end
+  end
+end

data/lib/typus/configuration.rb

@@ -2,12 +2,10 @@ module Typus
   module Configuration
 
     # Read configuration from <tt>config/typus/*.yml</tt>.
-    def self.config!
-      files = Dir[File.join(Typus.config_folder, "*.yml").to_s].reject { |f| f.match(/_roles.yml/) }
-
+    def self.models!
       @@config = {}
 
-      files.each do |file|
+      Typus.model_configuration_files.each do |file|
         if data = YAML::load_file(file)
           @@config.merge!(data)
         end
@@ -19,11 +17,9 @@ module Typus
 
     # Read roles from files <tt>config/typus/*_roles.yml</tt>.
     def self.roles!
-      files = Dir[File.join(Typus.config_folder, "*_roles.yml").to_s].sort
-
       @@roles = {}
 
-      files.each do |file|
+      Typus.role_configuration_files.each do |file|
         if data = YAML::load_file(file)
           data.compact.each do |key, value|
             @@roles[key] ? @@roles[key].merge!(value) : (@@roles[key] = value)

data/lib/typus/controller/ancestry.rb

@@ -21,7 +21,7 @@ module Typus
 
         @items = Kaminari.paginate_array(items).page(params[:page]).per(1000)
 
-        add_resource_action(default_action.titleize, {:action => default_action}, {})
+        set_default_action
         add_resource_action("Trash", {:action => "destroy"}, {:confirm => "#{Typus::I18n.t("Trash")}?", :method => 'delete'})
       end
 

data/lib/typus/controller/bulk.rb

@@ -21,10 +21,14 @@ module Typus
       private :set_bulk_action_for_trash
 
       def bulk
-        if (ids = params[:selected_item_ids])
+        if (ids = params[:selected_item_ids]) && (action = params[:batch_action]).present?
           send(params[:batch_action], ids)
         else
-          notice = Typus::I18n.t("Items must be selected in order to perform actions on them. No items have been changed.")
+          notice = if action.empty?
+                     Typus::I18n.t("No bulk action selected.")
+                   else
+                     Typus::I18n.t("Items must be selected in order to perform actions on them. No items have been changed.")
+                   end
           redirect_to :back, :notice => notice
         end
       end

data/lib/typus/controller/format.rb

@@ -6,43 +6,49 @@ module Typus
 
       protected
 
-      def generate_html
+      def get_paginated_data
         items_per_page = @resource.typus_options_for(:per_page)
         @items = @resource.page(params[:page]).per(items_per_page)
       end
 
+      alias_method :generate_html, :get_paginated_data
+
       #--
       # TODO: Find in batches only works properly if it's used on models, not
       #       controllers, so in this action does nothing. We should find a way
       #       to be able to process large amounts of data.
       #++
       def generate_csv
-        fields = @resource.typus_fields_for(:csv)
-
-        filename = Rails.root.join("tmp", "export-#{@resource.to_resource}-#{Time.zone.now.to_s(:number)}.csv")
-
-        options = { :conditions => @conditions, :batch_size => 1000 }
-
-        ::CSV.open(filename, 'w') do |csv|
-          csv << fields.keys
-          @resource.find_in_batches(options) do |records|
-            records.each do |record|
-              csv << fields.map do |key, value|
-                       case value
-                       when :transversal
-                         a, b = key.split(".")
-                         record.send(a).send(b)
-                       when :belongs_to
-                         record.send(key).try(:to_label)
-                       else
-                         record.send(key)
+        if can_export?(:csv)
+          fields = @resource.typus_fields_for(:csv)
+
+          filename = Rails.root.join("tmp", "export-#{@resource.to_resource}-#{Time.zone.now.to_s(:number)}.csv")
+
+          options = { :conditions => @conditions, :batch_size => 1000 }
+
+          ::CSV.open(filename, 'w') do |csv|
+            csv << fields.keys
+            @resource.find_in_batches(options) do |records|
+              records.each do |record|
+                csv << fields.map do |key, value|
+                         case value
+                         when :transversal
+                           a, b = key.split(".")
+                           record.send(a).send(b)
+                         when :belongs_to
+                           record.send(key).try(:to_label)
+                         else
+                           record.send(key)
+                         end
                        end
-                     end
+              end
             end
           end
-        end
 
-        send_file filename
+          send_file filename
+        else
+          not_allowed
+        end
       end
 
       def generate_json
@@ -50,14 +56,21 @@ module Typus
       end
 
       def generate_xml
-        export(:xml)
+        can_export?(:xml) ? export(:xml) : not_allowed
       end
 
       def export(format)
         fields = @resource.typus_fields_for(format).map { |i| i.first }
         methods = fields - @resource.column_names
         except = @resource.column_names - fields
-        render format => @resource.send("to_#{format}", :methods => methods, :except => except)
+
+        get_paginated_data
+
+        render format => @items.send("to_#{format}", :methods => methods, :except => except)
+      end
+
+      def can_export?(format)
+        @resource.typus_options_for(:export).extract_settings.include?(format.to_s)
       end
 
     end

data/lib/typus/orm/active_record/class_methods.rb

@@ -19,7 +19,6 @@ module Typus
           end
         end
 
-        # Form and list fields
         def typus_fields_for(filter)
           ActiveSupport::OrderedHash.new.tap do |fields_with_type|
             get_typus_fields_for(filter).each do |field|