typus 3.1.0.rc4 → 3.1.0.rc5

data/config/locales/typus.fr.yml

@@ -7,7 +7,7 @@ fr:
   "Actions": "Actions"
   "Active": "Actif"
   "Add": "Ajouter"
-  "Add new": "Ajouter nouveau"
+  "Add New": "Ajouter nouveau"
   "Are you sure?": "Êtes-vous sûre ?"
   "Are you sure you want to sign out and end your session?": "Etes-vous sûre de vouloir vous déconnecter et mettre fin à votre session ?"
 
@@ -34,7 +34,6 @@ fr:
   "Last few days": "Ces derniers jours"
   "Last 30 days": "30 derniers jours"
   "Last 7 days": "7 derniers jours"
-  "List": "Liste"
   "Logged as": "Identifié comme"
   "Login": "Identification"
 

data/config/locales/typus.hu.yml

@@ -6,7 +6,7 @@ hu:
   "Actions": "Akciók"
   "Active": "Aktív"
   "Add": "Hozzáad"
-  "Add new": "Új hozzáadása"
+  "Add New": "Új hozzáadása"
   "Are you sure?": "Biztos vagy benne?"
   "Are you sure you want to sign out and end your session?": "Biztosan ki akarsz lépni?"
 
@@ -31,7 +31,6 @@ hu:
   "Last few days": "Utóbbi néhány nap"
   "Last 30 days": "Az elmúlt 30 nap"
   "Last 7 days": "Az elmúlt 7 nap"
-  "List":
   "Logged as": "Bejelentkezve"
   "Login": "Belépés"
 

data/config/locales/typus.it.yml

@@ -6,7 +6,7 @@ it:
   "Actions": "Azioni"
   "Active": "Attivo"
   "Add": "Inserisci"
-  "Add new": "Inserisci nuovo"
+  "Add New": "Inserisci nuovo"
   "Are you sure?": "Sei sicuro?"
   "Are you sure you want to sign out and end your session?": "Sei sicuro che vuoi disconnetterti dal sistema?"
 
@@ -34,7 +34,6 @@ it:
   "Last few days": "Ultimi giorni"
   "Last 30 days": "Ultimi 30 giorni"
   "Last 7 days": "Ultimi 7 giorni"
-  "List": "Lista"
   "Loading": "Caricamento"
   "Logged as": "Loggato come"
   "Login": "Login"

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

@@ -6,7 +6,7 @@
   "Actions":
   "Active":
   "Add":
-  "Add new":
+  "Add New":
   "All":
   "Are you sure?":
   "Are you sure you want to sign out and end your session?":
@@ -31,7 +31,6 @@
   "Last few days":
   "Last 30 days":
   "Last 7 days":
-  "List":
   "Logged as":
   "Login":
 

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

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

data/config/locales/typus.ru.yml

@@ -6,7 +6,7 @@ ru:
   "Actions": "Действия"
   "Active":
   "Add": "Добавить"
-  "Add new": "Добавить новый"
+  "Add New": "Добавить новый"
   "Are you sure?":
   "Are you sure you want to sign out and end your session?":
 
@@ -31,7 +31,6 @@ ru:
   "Last few days": "Последние дней"
   "Last 7 days": "Последние 7 дней"
   "Last 30 days": "Последние 30 дней"
-  "List":
   "Logged as": "Вы вошли как"
   "Login": "Редактировать"
 

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

@@ -6,7 +6,7 @@ zh-CN:
   "Actions": "动作"
   "Active": "已激活"
   "Add": "新增"
-  "Add new": "新增"
+  "Add New": "新增"
   "Are you sure?": "你是否确认?"
   "Are you sure you want to sign out and end your session?": "你是否确认登出并结束本次会话?"
 
@@ -30,7 +30,6 @@ zh-CN:
   "Last few days": "最近几天"
   "Last 30 days": "最近一个月"
   "Last 7 days": "最近一周"
-  "List": "列表"
   "Logged as": "登录为"
   "Login": "登录"
 

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

@@ -12,7 +12,7 @@ Typus.setup do |config|
   # Define user_class_name.
   config.user_class_name = "<%= options[:user_class_name] %>"
 
-  # Define user_fk.
-  config.user_fk = "<%= options[:user_fk] %>"
+  # Define user_foreign_key.
+  config.user_foreign_key = "<%= options[:user_foreign_key] %>"
 
 end

data/lib/generators/typus/migration_generator.rb

@@ -10,7 +10,7 @@ module Typus
       source_root File.expand_path("../../templates", __FILE__)
 
       class_option :user_class_name, :default => "AdminUser", :aliases => "-u"
-      class_option :user_fk, :default => "admin_user_id", :aliases => "-fk"
+      class_option :user_foreign_key, :default => "admin_user_id", :aliases => "-fk"
 
       desc <<-DESC
 Description:

data/lib/support/active_record.rb

@@ -26,11 +26,7 @@ class ActiveRecord::Base
   #++
   def mapping(attribute)
     klass = self.class
-    values = if klass.const_defined?(attribute.upcase)
-               klass::const_get(attribute.upcase)
-             else
-               klass.send(attribute)
-             end
+    values = klass.send(attribute)
 
     array = values.first.is_a?(Array) ? values : values.map { |i| [i, i] }
 

data/lib/typus.rb

@@ -123,8 +123,8 @@ module Typus
   mattr_accessor :user_class_name
   @@user_class_name = "TypusUser"
 
-  mattr_accessor :user_fk
-  @@user_fk = "typus_user_id"
+  mattr_accessor :user_foreign_key
+  @@user_foreign_key = "typus_user_id"
 
   class << self
 

data/lib/typus/authentication/session.rb

@@ -87,19 +87,19 @@ module Typus
         if admin_user.is_not_root?
 
           condition_typus_users = @item.respond_to?(Typus.relationship) && !@item.send(Typus.relationship).include?(admin_user)
-          condition_typus_user_id = @item.respond_to?(Typus.user_fk) && !admin_user.owns?(@item)
+          condition_typus_user_id = @item.respond_to?(Typus.user_foreign_key) && !admin_user.owns?(@item)
 
           not_allowed if (condition_typus_users || condition_typus_user_id)
         end
       end
 
       #--
-      # Show only related items it @resource has a foreign_key (Typus.user_fk)
+      # Show only related items it @resource has a foreign_key (Typus.user_foreign_key)
       # related to the logged user.
       #++
       def check_resources_ownership
         if admin_user.is_not_root? && @resource.typus_user_id?
-          @resource = @resource.where(Typus.user_fk => admin_user)
+          @resource = @resource.where(Typus.user_foreign_key => admin_user)
         end
       end
 
@@ -107,7 +107,7 @@ module Typus
       # OPTIMIZE: This method should accept args.
       #
       def set_attributes_on_create
-        @item.send("#{Typus.user_fk}=", admin_user.id) if @resource.typus_user_id?
+        @item.send("#{Typus.user_foreign_key}=", admin_user.id) if @resource.typus_user_id?
       end
 
       ##
@@ -116,7 +116,7 @@ module Typus
       #
       def set_attributes_on_update
         if @resource.typus_user_id? && admin_user.is_not_root?
-          @item.update_attributes(Typus.user_fk => admin_user.id)
+          @item.update_attributes(Typus.user_foreign_key => admin_user.id)
         end
       end
 

data/lib/typus/controller/headless.rb

@@ -9,7 +9,7 @@ module Typus
       end
 
       def set_resources_action_for_headless_on_index
-        add_resources_action("Add new", {:action => "new"}, {})
+        add_resources_action("Add New", {:action => "new"}, {})
       end
       private :set_resources_action_for_headless_on_index
 

data/lib/typus/controller/trash.rb

@@ -25,7 +25,8 @@ module Typus
             generate_html
             render 'index'
           end
-          @resource.typus_export_formats.each { |f| format.send(f) { send("generate_#{f}") } }
+
+          %w(json xml csv).each { |f| format.send(f) { send("generate_#{f}") } }
         end
       end
 

data/lib/typus/orm/active_record/user/instance_methods.rb

@@ -54,7 +54,7 @@ module Typus
           end
 
           def owns?(resource)
-            id == resource.send(Typus.user_fk)
+            id == resource.send(Typus.user_foreign_key)
           end
 
         end

data/lib/typus/orm/base.rb

@@ -144,7 +144,7 @@ module Typus
       end
 
       def typus_user_id?
-        columns.map { |u| u.name }.include?(Typus.user_fk)
+        columns.map { |u| u.name }.include?(Typus.user_foreign_key)
       end
 
       def read_model_config

data/lib/typus/version.rb

@@ -1,3 +1,3 @@
 module Typus
-  VERSION = "3.1.0.rc4"
+  VERSION = "3.1.0.rc5"
 end

data/test/app/controllers/admin/posts_controller_test.rb

@@ -542,7 +542,7 @@ title;status
 
       should "render index_and_show_add_entry_link" do
         assert_select "#sidebar ul" do
-          assert_select "li", "Add new"
+          assert_select "li", "Add New"
         end
       end
 
@@ -559,7 +559,7 @@ title;status
       end
 
       should "render new and verify page title" do
-        assert_select "title", "Typus — New Post"
+        assert_select "title", "Typus — Add New Post"
       end
 
     end
@@ -677,7 +677,7 @@ title;status
     context "when creating an item" do
 
       ##
-      # We click on the "Add new" link and we are redirected to:
+      # We click on the "Add New" link and we are redirected to:
       #
       #     /admin/posts/new
       #
@@ -707,7 +707,7 @@ title;status
     context "when editing an item" do
 
       ##
-      # We click on the "Add new" link and we are redirected to:
+      # We click on the "Add New" link and we are redirected to:
       #
       #     /admin/posts/new
       #

data/test/fixtures/rails_app/app/controllers/admin/assets_controller.rb

@@ -4,7 +4,7 @@ class Admin::AssetsController < Admin::ResourcesController
 
   def index
     if params[:layout]
-      add_resources_action("Add new", {:action => "new"}, {})
+      add_resources_action("Add New", {:action => "new"}, {})
     end
 
     super

data/test/fixtures/rails_app/app/controllers/admin/entries_controller.rb

@@ -1,2 +1,5 @@
 class Admin::EntriesController < Admin::ResourcesController
+
+  include Typus::Controller::Trash
+
 end

data/test/fixtures/rails_app/app/models/entry.rb

@@ -8,6 +8,12 @@
 
 class Entry < ActiveRecord::Base
 
+  ##
+  # Macros
+  #
+
+  has_trash
+
   ##
   # Validations
   #
@@ -20,4 +26,10 @@ class Entry < ActiveRecord::Base
 
   has_and_belongs_to_many :categories
 
+  ##
+  # Scopes
+  #
+
+  default_scope where(:deleted_at => nil)
+
 end

data/test/fixtures/rails_app/app/models/post.rb

@@ -1,17 +1,5 @@
 class Post < ActiveRecord::Base
 
-  ##
-  # Constants
-  #
-
-  STATUS = { "Draft" => "draft",
-             "Published" => "published",
-             "Unpublished" => "unpublished",
-             "<div class=''>Something special</div>".html_safe => "special" }
-
-  ARRAY_SELECTOR = %w(item1 item2)
-  ARRAY_HASH_SELECTOR = [["Draft", "draft"], ["Custom Status", "custom"]]
-
   ##
   # Validations
   #
@@ -29,4 +17,24 @@ class Post < ActiveRecord::Base
   has_many :comments
   has_many :views
 
+  ##
+  # Class Methods
+  #
+
+  def self.status
+    { "Draft" => "draft",
+      "Published" => "published",
+      "Unpublished" => "unpublished",
+      "<div class=''>Something special</div>".html_safe => "special" }
+  end
+
+  def self.array_selector
+    %w(item1 item2)
+  end
+
+  def self.array_hash_selector
+    [["Draft", "draft"],
+     ["Custom Status", "custom"]]
+  end
+
 end

data/test/fixtures/rails_app/db/schema.rb

@@ -62,6 +62,7 @@ ActiveRecord::Schema.define do
     t.text :content
     t.string :type
     t.boolean :published, :null => false, :default => false
+    t.datetime :deleted_at
   end
 
   create_table :categories_entries, :force => true, :id => false do |t|

data/test/lib/support/active_record_test.rb

@@ -2,133 +2,71 @@ require "test_helper"
 
 class ActiveRecordTest < ActiveSupport::TestCase
 
-  test "relationship between Post and Comment" do
-    assert Post.relationship_with(Comment).eql?(:has_many)
-  end
-
-  test "relationship between Comment and Post" do
-    assert Comment.relationship_with(Post).eql?(:belongs_to)
-  end
-
-  test "relationship between Post and Category" do
-    assert Post.relationship_with(Category).eql?(:has_and_belongs_to_many)
-  end
-
-  test "relationship between Category and Post" do
+  test "relationship between models" do
     assert Category.relationship_with(Post).eql?(:has_and_belongs_to_many)
-  end
-
-  test "relationship between Order and Invoice" do
-    assert Order.relationship_with(Invoice).eql?(:has_one)
-  end
-
-  test "relationship between Invoice and Order" do
+    assert Comment.relationship_with(Post).eql?(:belongs_to)
     assert Invoice.relationship_with(Order).eql?(:belongs_to)
-  end
-
-  test "relationship between Invoice and TypusUser" do
     assert Invoice.relationship_with(TypusUser).eql?(:belongs_to)
-  end
-
-  test "relationship between TypusUser and Invoice" do
+    assert Order.relationship_with(Invoice).eql?(:has_one)
+    assert Post.relationship_with(Category).eql?(:has_and_belongs_to_many)
+    assert Post.relationship_with(Comment).eql?(:has_many)
     assert TypusUser.relationship_with(Invoice).eql?(:has_many)
   end
 
-  context "mapping" do
-
-    teardown do
-      Post.send(:remove_const, :STATUS)
-      Post::STATUS = { "Draft" => "draft",
-                       "Published" => "published",
-                       "Unpublished" => "unpublished",
-                       "<div class=''>Something special</div>".html_safe => "special" }
-    end
-
-    context "with an array" do
-
-      setup do
-        Post.send(:remove_const, :STATUS)
-        Post::STATUS = %w(pending published unpublished)
-      end
-
-      should "work for symbols" do
-        post = Factory.build(:post)
-        assert_equal "published", post.mapping(:status)
-      end
-
-      should "work for strings" do
-        post = Factory.build(:post, :status => "unpublished")
-        assert_equal "unpublished", post.mapping('status')
-      end
-
-      should "for unexisting keys returning the current key" do
-        post = Factory.build(:post, :status => "unexisting")
-        assert_equal "unexisting", post.mapping(:status)
-      end
+  test "mapping with an array" do
+    expected = %w(pending published unpublished)
+    Post.stubs(:status).returns(expected)
 
-    end
+    post = Factory.build(:post)
+    assert_equal "published", post.mapping(:status)
 
-    context "with a two dimension array" do
+    post = Factory.build(:post, :status => "unpublished")
+    assert_equal "unpublished", post.mapping('status')
 
-      setup do
-        Post.send(:remove_const, :STATUS)
-        Post::STATUS = [["Publicado", "published"],
-                        ["Pendiente", "pending"],
-                        ["No publicado", "unpublished"]]
-      end
-
-      should "verify" do
-        post = Factory.build(:post)
-        assert_equal "Publicado", post.mapping(:status)
-        post = Factory.build(:post, :status => "unpublished")
-        assert_equal "No publicado", post.mapping(:status)
-      end
-
-    end
-
-    context "with a hash" do
-
-      setup do
-        Post.send(:remove_const, :STATUS)
-        Post::STATUS = { "Pending - Hash" => "pending",
-                         "Published - Hash" => "published",
-                         "Not Published - Hash" => "unpublished" }
-      end
+    post = Factory.build(:post, :status => "unexisting")
+    assert_equal "unexisting", post.mapping(:status)
+  end
 
-      should "verify" do
-        page = Factory.build(:post)
-        assert_equal "Published - Hash", page.mapping(:status)
-        page = Factory.build(:post, :status => "unpublished")
-        assert_equal "Not Published - Hash", page.mapping(:status)
-      end
+  test "mapping with a two dimension array" do
+    expected = [["Publicado", "published"], ["Pendiente", "pending"], ["No publicado", "unpublished"]]
+    Post.stubs(:status).returns(expected)
 
-    end
+    post = Factory.build(:post)
+    assert_equal "Publicado", post.mapping(:status)
 
+    post = Factory.build(:post, :status => "unpublished")
+    assert_equal "No publicado", post.mapping(:status)
   end
 
-  context "to_label" do
+  test "mapping with a hash" do
+    expected = { "Pending - Hash" => "pending", "Published - Hash" => "published", "Not Published - Hash" => "unpublished" }
+    Post.stubs(:status).returns(expected)
 
-    should "return email for TypusUser" do
-      typus_user = Factory.build(:typus_user)
-      assert_equal typus_user.email, typus_user.to_label
-    end
+    page = Factory.build(:post)
+    assert_equal "Published - Hash", page.mapping(:status)
+    page = Factory.build(:post, :status => "unpublished")
+    assert_equal "Not Published - Hash", page.mapping(:status)
+  end
 
-    should "return name for Category" do
-      category = Factory.build(:category, :name => "Chunky Bacon")
-      assert_match "Chunky Bacon", category.to_label
-    end
+  test "to_label returns email for TypusUser" do
+    typus_user = Factory.build(:typus_user)
+    assert_equal typus_user.email, typus_user.to_label
+  end
 
-    should "return Model#id because Category#name is empty" do
-      category = Factory(:category)
-      category.name = nil
-      category.save(:validate => false)
-      assert_equal "Category##{category.id}", category.to_label
-    end
+  test "to_label returns name for Category" do
+    category = Factory.build(:category, :name => "Chunky Bacon")
+    assert_match "Chunky Bacon", category.to_label
+  end
 
-    should "return default Model#id" do
-      assert_match /Post#/, Factory(:post).to_label
-    end
+  test "to_label returns Model#id because Category#name is empty" do
+    category = Factory(:category)
+    category.name = nil
+    category.save(:validate => false)
+    assert_equal "Category##{category.id}", category.to_label
+  end
 
+  test "to_label returns default Model#id" do
+    assert_match /Post#/, Factory(:post).to_label
   end
 
   test "to_resource" do