typus 1.0.0.pre8 → 1.0.0.pre9

data/config/available_locales/it.yml

@@ -9,8 +9,6 @@ it:
   "Are you sure you want to leave this page?": "Sei sicuro di volere lasciare questa pagina?"
   "Are you sure you want to sign out and end your session?": "Sei sicuro che vuoi disconnetterti dal sistema?"
   "As you're not the admin or the owner of this record you cannot edit it": "Non puoi modificare questo elemento poichè non sei un amministratore o il proprietario dello stesso"
-
-  "Back to list": "Torna alla lista"
   
   "Cancel and go back": "Annulla e torna indietro"
   "Change %{attribute}?": "Vuoi cambiare %{attribute}?"
@@ -23,7 +21,6 @@ it:
   "Dashboard": "Panoramica"
   "Developed by": "Realizzato da"
   "Do you want to cancel it?": "Vuoi annullare e tornare indietro?"
-  "Documentation": "Documentazione"
   "Down": "Giù"
 
   "Edit": "Modifica"
@@ -47,7 +44,6 @@ it:
   "Last few days": "Ultimi giorni"
   "Last 30 days": "Ultimi 30 giorni"
   "Last 7 days": "Ultimi 7 giorni"
-  "License": "Licenza"
   "List": "Lista"
   "Loading": "Caricamento"
   "Logged as": "Loggato come"

data/config/available_locales/language.yml.template

@@ -14,8 +14,6 @@
   "Are you sure you want to sign out and end your session?":
   "As you're not the admin or the owner of this record you cannot edit it":
 
-  "Back to list":
-
   "Change %{attribute}?":
   "Change password":
   "Checked if active":
@@ -25,7 +23,6 @@
 
   "Dashboard":
   "Do you want to cancel it?":
-  "Documentation":
   "Down":
 
   "Edit":
@@ -46,7 +43,7 @@
   "Last few days":
   "Last 30 days":
   "Last 7 days":
-  "License":
+  "List":
   "Logged as":
   "Login":
 
@@ -92,6 +89,7 @@
   "Unrelate %{unrelate_model} from %{unrelate_model_from}?":
   "Up":
 
+  "View all %{attribute}":
   "View site":
 
   "You're adding a new %{resource_from}":

data/config/available_locales/pt-BR.yml

@@ -14,8 +14,6 @@ pt-BR:
   "Are you sure you want to sign out and end your session?": "Tem certeza que quer sair e encerrar sua sessão?"
   "As you're not the admin or the owner of this record you cannot edit it": "Como você não é o dono desse registro ou o admin, você não pode editá-lo."
 
-  "Back to list": "Voltar à lista"
-
   "Cancel and go back":
   "Change password": "Trocar senha"
   "Change %{attribute}?": "Mudar %{attribute}?"
@@ -26,7 +24,6 @@ pt-BR:
 
   "Dashboard": "Painel"
   "Do you want to cancel it?": "Quer cancelar?"
-  "Documentation":
   "Down": "Descer"
 
   "Edit": "Editar"
@@ -48,7 +45,7 @@ pt-BR:
   "Last few days": "Últimos dias"
   "Last 30 days": "Últimos 30 dias"
   "Last 7 days": "Últimos 7 dias"
-  "License":
+  "List":
   "Logged as": "Logado como"
   "Login": "Login"
 
@@ -94,6 +91,7 @@ pt-BR:
   "Unrelate %{unrelate_model} from %{unrelate_model_from}?": "Desvincular %{unrelate_model} de %{unrelate_model_from}?"
   "Up": "Subir"
 
+  "View all %{attribute}":
   "View site": "Ver site"
 
   "You're adding a new %{resource_from} to %{resource_to}": "Você está adicionando um novo %{resource_from} a %{resource_to}."

data/config/available_locales/ru.yml

@@ -14,8 +14,6 @@ ru:
   "Are you sure you want to sign out and end your session?":
   "As you're not the admin or the owner of this record you cannot edit it": "Вы не администратор и не владелец записи и не можете ее редактировать"
 
-  "Back to list": "Назад к списку"
-
   "Cancel and go back":
   "Change password": "Сменить пароль"
   "Change %{attribute}?": "Изменить %{attribute}?"
@@ -26,7 +24,6 @@ ru:
 
   "Dashboard": "Обзор"
   "Do you want to cancel it?": "Вы хотите отменить это?"
-  "Documentation":
   "Down": "Вниз"
 
   "Edit": "Изменить"
@@ -48,7 +45,7 @@ ru:
   "Last few days": "Последние дней"
   "Last 7 days": "Последние 7 дней"
   "Last 30 days": "Последние 30 дней"
-  "License":
+  "List":
   "Logged as": "Вы вошли как"
   "Login": "Редактировать"
 
@@ -94,6 +91,7 @@ ru:
   "Unrelate %{unrelate_model} from %{unrelate_model_from}?": "Отсоединить %{unrelate_model} от %{unrelate_model_from}?"
   "Up": "Вверх"
 
+  "View all %{attribute}":
   "View site": "Перейти к сайту"
 
   "You can update your password at": "Вы можете установить свой пароль на"

data/config/routes.rb

@@ -16,5 +16,6 @@ Rails.application.routes.draw do
   end
 
   match ':controller(/:action(/:id))', :controller => /admin\/[^\/]+/
+  match ':controller(/:action(.:format))', :controller => /admin\/[^\/]+/
 
 end

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

@@ -4,19 +4,19 @@ Typus.setup do |config|
   config.admin_title = "<%= options[:admin_title] %>"
   # config.admin_sub_title = ""
 
-  # Configure the e-mail address which will be shown in Admin::Mailer.
-  # When this option is define Typus will allow admin users to recover
-  # lost passwords.
+  # When mailer_sender is set, password recover is enabled. This email
+  # address will be used in Admin::Mailer.
   # config.mailer_sender = "admin@example.com"
 
   # Define file attachment settings.
   # config.file_preview = :typus_preview
   # config.file_thumbnail = :typus_thumbnail
 
-  # Authentication: :none, :http_basic
+  # Authentication: +:none+, +:http_basic+
+  # Run `rails g typus:migration` if you need an advanced authentication system.
   # config.authentication = :none
 
-  # Define username and password for http authentication
+  # Define username and password for +:http_basic+ authentication
   # config.username = "admin"
   # config.password = "columbia"
 

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

@@ -1,18 +1,18 @@
 Typus.setup do |config|
 
-  # Authentication: none, http_basic, session
+  # Define authentication: +:none+, +:http_basic+, +:session+
   config.authentication = :session
 
-  # Define the default root.
+  # Define master_role.
   # config.master_role = "admin"
 
-  # Define relationship table.
+  # Define relationship.
   # config.relationship = "typus_users"
 
-  # Define user_class_name and user_fk.
+  # Define user_class_name.
   config.user_class_name = "<%= options[:user_class_name] %>"
 
-  # Define the user_fk
+  # Define user_fk.
   config.user_fk = "<%= options[:user_fk] %>"
 
 end

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

@@ -1,18 +1,18 @@
 Typus::Resources.setup do |config|
 
-  # Defines the default_action_on_item.
+  # Defines default_action_on_item.
   # config.default_action_on_item = "edit"
 
-  # Defines the end_year.
+  # Defines end_year.
   # config.end_year = nil
 
-  # Defines the form_rows.
+  # Defines form_rows.
   # config.form_rows = 15
 
-  # Defines the action_after_save.
+  # Defines action_after_save.
   # config.action_after_save = "edit"
 
-  # Defines the minute step.
+  # Defines minute_step.
   # config.minute_step = 5
 
   # Defines nil.
@@ -21,10 +21,10 @@ Typus::Resources.setup do |config|
   # Defines only_user_items.
   # config.only_user_items = false
 
-  # Defines per_page
+  # Defines per_page.
   # config.per_page = 15
 
-  # Defines start year
+  # Defines start_year.
   # config.start_year = nil
 
 end

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

@@ -1,8 +1,8 @@
 # Models
 
-This is an example of a **Typus** enabled model with all available
-options. You can use this example to customize your YAML files which
-only have set the most common settings.
+This is an example of a **Typus** enabled model with all available options. You
+can use this example to customize your YAML files which only have set the most
+common settings.
 
     Post:
       fields:
@@ -26,7 +26,7 @@ only have set the most common settings.
         index: cleanup
         edit: send_as_newsletter
         show: rebuild
-      export: csv, xml, pdf
+      export: csv, xml
       order_by: created_at
       relationships:
       filters: is_published?, created_at, category_id
@@ -34,10 +34,10 @@ only have set the most common settings.
       application: Application
       description: Some text to describe the model
       options:
+        action_after_save: :index
         default_action_on_item: show
         end_year: 2015
         form_rows: 25
-        action_after_save: :index
         minute_step: 15
         nil: 'nil'
         only_user_items: true
@@ -48,9 +48,9 @@ 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 on the application. You can also use the 'all' shortcut
-to allow the user the access to all actions.
+In this file you can configure the actions available for each of your models on
+the application. You can also use the 'all' shortcut to allow the user the
+access to all actions.
 
     admin:
       Post: create, read, update, delete
@@ -61,10 +61,8 @@ to allow the user the access to all actions.
       Post: create, read, update
       Category: read, update
 
-You can also define `resources` which are not related to a model,
-for example to control MemCached or see the Starling queue
-statistics.
+You can also define `resources` which are not related to a model, for example
+to control `Redis`.
 
     admin:
-      Starling: index
-      MemCached: index, cleanup
+      Redis: index, flush_all

data/lib/generators/templates/controller.rb

@@ -1,4 +1,2 @@
-# Controller generated by Typus, use it to extend admin functionality.
 class Admin::<%= resource %>Controller < <%= inherits_from %>
-
 end

data/lib/generators/templates/functional_test.rb

@@ -1,21 +1,10 @@
-require "test_helper"
+require 'test_helper'
 
-# ControllerTest generated by Typus, use it to test the extended admin functionality.
 class Admin::<%= resource %>ControllerTest < ActionController::TestCase
 
-  setup do
-    admin = admin_users(:admin)
-    @request.session[:typus_user_id] = admin.id
-  end
-
-  test "should render index" do
-    get :index
-    assert_template :index
-  end
-
-  test "should render new" do
-    get :new
-    assert_template :new
+  # Replace this with your real tests.
+  test "the truth" do
+    assert true
   end
 
 end

data/lib/generators/typus/migration_generator.rb

@@ -46,7 +46,6 @@ Examples:
         template "config/typus/typus.yml", "config/typus/typus.yml"
         template "config/typus/typus_roles.yml", "config/typus/typus_roles.yml"
         template "model.rb", "app/models/#{options[:user_class_name].underscore}.rb"
-        template "model.yml", "test/fixtures/#{options[:user_class_name].underscore.pluralize}.yml"
       end
 
       def generate_controllers

data/lib/support/active_record.rb

@@ -11,12 +11,11 @@ class ActiveRecord::Base
   end
 
   #--
-  # TODO: This has been copied from Rails 2 because has been removed
-  #       from Rails 3. Once the "build_conditions" has been refactored
-  #       to use Arel this can be removed.
+  # TODO: This has been copied from Rails 2 because has been removed from
+  #       Rails 3. Once the "build_conditions" has been refactored to use Arel
+  #       this can be removed.
   #++
   def self.merge_conditions(*conditions)
-
     segments = []
 
     conditions.each do |condition|
@@ -27,16 +26,15 @@ class ActiveRecord::Base
     end
 
     "(#{segments.join(') AND (')})" unless segments.empty?
-
   end
 
   #--
   # On a model:
   #
   #     class Post < ActiveRecord::Base
-  #       STATUS = { "published" => t("Published"),
-  #                  "pending" => t("Pending"),
-  #                  "draft" => t("Draft") }
+  #       STATUS = {  t("Published") => "published",
+  #                   t("Pending") => "pending",
+  #                   t("Draft") => "draft" }
   #     end
   #
   #     >> Post.first.status
@@ -50,7 +48,18 @@ class ActiveRecord::Base
   #++
   def mapping(attribute)
     values = self.class::const_get(attribute.to_s.upcase)
-    values.kind_of?(Hash) ? values[send(attribute)] : send(attribute)
+
+    if values.kind_of?(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)]
   end
 
   def to_label

data/lib/support/fake_user.rb

@@ -0,0 +1,42 @@
+class FakeUser
+
+  def id
+    0
+  end
+
+  def can?(*args)
+    true
+  end
+
+  def cannot?(*args)
+    !can?(*args)
+  end
+
+  def is_root?
+    true
+  end
+
+  def is_not_root?
+    !is_root?
+  end
+
+  def resources
+    Typus::Configuration.roles[role].compact
+  end
+
+  def applications
+    Typus.applications
+  end
+
+  def application(name)
+    Typus.application(name)
+  end
+
+  def role
+    Typus.master_role
+  end
+
+  def name
+  end
+
+end

data/lib/support/object.rb

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

data/lib/support/string.rb

@@ -8,40 +8,8 @@ class String
     partition(prefix).last
   end
 
-  def extract_resource
-    remove_prefix
-  end
-
   def extract_class
     remove_prefix.camelize.classify.constantize
   end
 
-  def extract_human_name
-    extract_class.model_name.human.gsub('/', ' ')
-  end
-
-  #--
-  # OPTIMIZE: Find a way to remove the rescue.
-  #++
-  def typus_actions_on(filter)
-    if settings = Typus::Configuration.config[self]['actions'][filter.to_s]
-      settings.extract_settings
-    else
-      []
-    end
-  rescue
-    []
-  end
-
-  #--
-  # OPTIMIZE: Find a way to remove the rescue.
-  #++
-  def typus_defaults_for(filter)
-    if settings = Typus::Configuration.config[self][filter.to_s]
-      settings.extract_settings
-    else
-      []
-    end
-  end
-
 end