typus 3.1.0.rc6 → 3.1.0.rc7

data/test/app/helpers/admin/dashboard_helper_test.rb

@@ -10,7 +10,7 @@ class Admin::DashboardHelperTest < ActiveSupport::TestCase
   def render(*args); args; end
 
   setup do
-    @expected = ["admin/helpers/dashboard/resources", { :resources => ["Git", "Status", "WatchDog"] }]
+    @expected = ["helpers/admin/resources/dashboard/resources", { :resources => ["Git", "Status", "WatchDog"] }]
   end
 
   test "resources work for typus_user" do

data/test/app/helpers/admin/filters_helper_test.rb

@@ -13,7 +13,7 @@ class Admin::FiltersHelperTest < ActiveSupport::TestCase
     # FIXME: Should work without this ...
     setup do
       @resource = Entry
-      @expected = ["admin/helpers/filters/filters",
+      @expected = ["helpers/admin/resources/filters/filters",
                   {:filters=>[{:filter=>"published",
                                :items=>[["Show by published", ""], ["Yes", "true"], ["No", "false"]]}],
                    :hidden_filters=>{}}]
@@ -44,7 +44,7 @@ class Admin::FiltersHelperTest < ActiveSupport::TestCase
     should "not reject the search param" do
       parameters = {"search"=>"Chunky Bacon"}
 
-      expected = ["admin/helpers/filters/filters",
+      expected = ["helpers/admin/resources/filters/filters",
                  {:filters=>[{:filter=>"published",
                               :items=>[["Show by published", ""], ["Yes", "true"], ["No", "false"]]}],
                   :hidden_filters=>{"search"=>"Chunky Bacon"}}]
@@ -55,7 +55,7 @@ class Admin::FiltersHelperTest < ActiveSupport::TestCase
     should "not reject applied filters" do
       parameters = {"user_id"=>"1"}
 
-      expected = ["admin/helpers/filters/filters",
+      expected = ["helpers/admin/resources/filters/filters",
                  {:filters=>[{:filter=>"published",
                               :items=>[["Show by published", ""], ["Yes", "true"], ["No", "false"]]}],
                   :hidden_filters=>{"user_id"=>"1"}}]
@@ -66,7 +66,7 @@ class Admin::FiltersHelperTest < ActiveSupport::TestCase
     should "reject applied filter" do
       parameters = {"published"=>"true"}
 
-      expected = ["admin/helpers/filters/filters",
+      expected = ["helpers/admin/resources/filters/filters",
                  {:filters=>[{:filter=>"published",
                               :items=>[["Show by published", ""], ["Yes", "true"], ["No", "false"]]}],
                   :hidden_filters=>{}}]
@@ -148,17 +148,13 @@ class Admin::FiltersHelperTest < ActiveSupport::TestCase
 
   end
 
-  context "predefined_filters" do
-
-    should "be empty" do
-      assert predefined_filters.empty?
-    end
-
-    should "return my filter" do
-      @predefined_filters = "mock"
-      assert_equal "mock", predefined_filters
-    end
+  test "predefined_filters is empty" do
+    assert predefined_filters.empty?
+  end
 
+  test "predefined_filters returns my filter" do
+    @predefined_filters = "mock"
+    assert_equal "mock", predefined_filters
   end
 
   def link_to(*args); args; end

data/test/app/helpers/admin/form_helper_test.rb

@@ -3,7 +3,7 @@ require "test_helper"
 class Admin::FormHelperTest < ActiveSupport::TestCase
 
   include Admin::FormHelper
-  include Admin::ResourcesHelper
+  # include Admin::ResourcesHelper
 
   should_eventually "verify_belongs_to_field" do
 

data/test/app/helpers/admin/relationships_helper_test.rb

@@ -8,7 +8,6 @@ class Admin::RelationshipsHelperTest < ActiveSupport::TestCase
 #  should_eventually "test typus_form_has_many"
 #  should_eventually "test typus_form_has_and_belongs_to_many"
 #  should_eventually "test build_pagination"
-#  should_eventually "test build_relate_form"
 #  should_eventually "test build_relationship_table"
 #  should_eventually "test build_add_new"
 #  should_eventually "test set_condition"

data/test/app/helpers/admin/search_helper_test.rb

@@ -10,46 +10,46 @@ class Admin::SearchHelperTest < ActiveSupport::TestCase
 
   test "search rejects controller and action params" do
     parameters = {"controller"=>"admin/posts", "action"=>"index"}
-    expected = ["admin/helpers/search/search", {:hidden_filters => {}}]
+    expected = ["helpers/admin/resources/search/search", {:hidden_filters => {}}]
     assert_equal expected, search(Entry, parameters)
   end
 
   # Why do you need the pagination page for a new search?
   test "search rejects page param" do
     parameters = {"page"=>"1"}
-    expected = ["admin/helpers/search/search", {:hidden_filters => {}}]
+    expected = ["helpers/admin/resources/search/search", {:hidden_filters => {}}]
     assert_equal expected, search(Entry, parameters)
   end
 
   # TODO: I want to think about it ...
   test "search rejects locale params" do
     parameters = {"locale"=>"jp"}
-    expected = ["admin/helpers/search/search", {:hidden_filters => {}}]
+    expected = ["helpers/admin/resources/search/search", {:hidden_filters => {}}]
     assert_equal expected, search(Entry, parameters)
   end
 
   # TODO: I want to think about it ...
   test "search rejects to sort_order and order_by" do
     parameters = {"sort_order"=>"asc", "order_by"=>"title"}
-    expected = ["admin/helpers/search/search", {:hidden_filters => {}}]
+    expected = ["helpers/admin/resources/search/search", {:hidden_filters => {}}]
     assert_equal expected, search(Entry, parameters)
   end
 
   test "search rejects utf8 param because form already contains it" do
     parameters = {"utf8"=>"✓"}
-    expected = ["admin/helpers/search/search", {:hidden_filters => {}}]
+    expected = ["helpers/admin/resources/search/search", {:hidden_filters => {}}]
     assert_equal expected, search(Entry, parameters)
   end
 
   test "search rejects search param because form already contains it" do
     parameters = {"search"=>"Chunky Bacon"}
-    expected = ["admin/helpers/search/search", {:hidden_filters => {}}]
+    expected = ["helpers/admin/resources/search/search", {:hidden_filters => {}}]
     assert_equal expected, search(Entry, parameters)
   end
 
   test "search not rejects applied filters" do
     parameters = {"published"=>"true", "user_id"=>"1"}
-    expected = ["admin/helpers/search/search", {:hidden_filters=>{"published"=>"true", "user_id"=>"1"}}]
+    expected = ["helpers/admin/resources/search/search", {:hidden_filters=>{"published"=>"true", "user_id"=>"1"}}]
     assert_equal expected, search(Entry, parameters)
   end
 

data/test/app/models/admin_user_test.rb

@@ -1,10 +1,13 @@
 require "test_helper"
 
-##
-# Here we test:
-#
-# - Typus::Orm::ActiveRecord::AdminUserV2
-#
+=begin
+
+  Here we test:
+
+  - Typus::Orm::ActiveRecord::AdminUserV2
+
+=end
+
 class AdminUserTest < ActiveSupport::TestCase
 
   test "token changes everytime we save the user" do

data/test/app/models/typus_user_test.rb

@@ -1,10 +1,13 @@
 require "test_helper"
 
-##
-# Here we test:
-#
-# - Typus::Orm::ActiveRecord::AdminUserV1
-#
+=begin
+
+  Here we test:
+
+  - Typus::Orm::ActiveRecord::AdminUserV1
+
+=end
+
 class TypusUserTest < ActiveSupport::TestCase
 
   test "validate email" do

data/test/app/models/user_test.rb

@@ -1,10 +1,13 @@
 require "test_helper"
 
-##
-# Here we test:
-#
-# - Typus::Orm::ActiveRecord::User::InstanceMethods
-#
+=begin
+
+  Here we test:
+
+  - Typus::Orm::ActiveRecord::User::InstanceMethods
+
+=end
+
 class UserTest < ActiveSupport::TestCase
 
   test "to_label" do

data/test/factories.rb

@@ -17,6 +17,16 @@ Factory.define :entry do |f|
   f.content "Body of the entry"
 end
 
+Factory.define :entry_bulk do |f|
+  f.sequence(:title) { |n| "EntryBulk##{n}" }
+  f.content "Body of the entry"
+end
+
+Factory.define :entry_trash do |f|
+  f.sequence(:title) { |n| "EntryTrash##{n}" }
+  f.content "Body of the entry"
+end
+
 Factory.define :case do |f|
   f.sequence(:title) { |n| "Case##{n}" }
   f.content "Body of the entry"

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

@@ -1,51 +1,2 @@
 class Admin::AssetsController < Admin::ResourcesController
-
-  layout :set_layout
-
-  def index
-    if params[:layout]
-      add_resources_action("Add New", {:action => "new"}, {})
-    end
-
-    super
-  end
-
-  def new
-    if params[:layout]
-      add_resources_action("Back to list", {:action => "index", :id => nil}, {})
-    end
-
-    super
-  end
-
-  def create
-    if params[:layout]
-      add_resources_action("Back to list", {:action => "index", :id => nil}, {})
-    end
-
-    super
-  end
-
-  def edit
-    if params[:layout]
-      add_resources_action("Back to list", {:action => "index", :id => nil}, {})
-    end
-
-    super
-  end
-
-  def update
-    if params[:layout]
-      add_resources_action("Back to list", {:action => "index", :id => nil}, {})
-    end
-
-    super
-  end
-
-  private
-
-  def set_layout
-    params[:layout] || "admin/base"
-  end
-
 end

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

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

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

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

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

@@ -0,0 +1,5 @@
+class Admin::EntryBulksController < Admin::ResourcesController
+
+  include Typus::Controller::Bulk
+
+end

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

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

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

@@ -19,6 +19,7 @@ class Entry < ActiveRecord::Base
   #
 
   validates :title, :presence => true
+  validates :content, :presence => true
 
   ##
   # Associations

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

@@ -0,0 +1,2 @@
+class EntryBulk < Entry
+end

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

@@ -0,0 +1,2 @@
+class EntryTrash < Entry
+end

data/test/fixtures/rails_app/app/views/admin/article/entries/_index.html.erb

@@ -0,0 +1,3 @@
+<div class="notice">
+  <strong>Article::Entry</strong> is a namespaced model.
+</div>

data/test/fixtures/rails_app/app/views/admin/assets/_edit.html.erb

@@ -0,0 +1,26 @@
+<% if headless_mode? %>
+
+  <%
+     attachment, caption = @item.dragonfly_required, @item.caption
+
+     files = if attachment.mime_type =~ /^image\/.+/
+               { :large_image => image_tag(attachment.thumb("500x").url, :title => caption, :alt => caption),
+                 :medium_image => image_tag(attachment.thumb("250x").url, :title => caption, :alt => caption),
+                 :small_image => image_tag(attachment.thumb("100x").url, :title => caption, :alt => caption), }
+             else
+               { :document => link_to(caption, @item.data.url) }
+             end
+  %>
+
+  <div class="notice">
+    <ul>
+      <% files.each do |key, value| %>
+        <li>
+          <%= link_to_function "Insert #{key} into entry.",
+                               "window.parent.CKEDITOR.instances['#{params[:input]}'].insertHtml('#{value}'); parent.$.fancybox.close();" %></li>
+        </li>
+      <% end %>
+    </ul>
+  </div>
+
+<% end %>

data/test/fixtures/rails_app/app/views/admin/cases/_index.html.erb

@@ -1,3 +1,3 @@
 <div class="notice">
-  This model inherits from <strong>Entry</strong>.
+  <strong>Single Table Inheritance</strong> support. (Inherits from Entry)
 </div>

data/test/fixtures/rails_app/app/views/admin/categories/_index.html.erb

@@ -1,3 +1,3 @@
 <div class="notice">
-  Categories <strong>"acts_as_list"</strong>.
+  This model has enabled the <strong>ActsAsList</strong> module.
 </div>

data/test/fixtures/rails_app/app/views/admin/dashboard/_sidebar.html.erb

@@ -6,6 +6,6 @@
 
 <p>In some models appears an explanation of the customization added like for example: filters, search, sidebars ...</p>
 
-<p>Code for this application is available at <a href="https://github.com/fesplugas/typus/tree/master/test/fixtures/rails_app">GitHub</a>.</p>
+<p>Code for this application is available at <a href="https://github.com/typus/typus/tree/master/test/fixtures/rails_app">GitHub</a>.</p>
 
 <p>If you need help don't hesitate in joining the <%= link_to 'mailing list', 'http://groups.google.com/group/typus' %> or use the <%= link_to "help", "/admin/help" %>.</p>

data/test/fixtures/rails_app/app/views/admin/entry_bulks/_index.html.erb

@@ -0,0 +1,3 @@
+<div class="notice">
+  This model has enabled the <strong>Bulk</strong> module.
+</div>

data/test/fixtures/rails_app/app/views/admin/entry_trashes/_index.html.erb

@@ -0,0 +1,3 @@
+<div class="notice">
+  This model has enabled the <strong>Trash</strong> module.
+</div>

data/test/fixtures/rails_app/app/views/admin/templates/_datepicker.html.erb

@@ -1 +1,6 @@
-templates#datepicker_template_<%= attribute %>
+<!-- templates#datepicker_template_<%= attribute %> -->
+
+<li id="<%= attribute %>">
+  <label>Published at</label>
+  (This can be a datepicker)
+</li>

data/test/fixtures/rails_app/config/deploy.rb

@@ -5,7 +5,7 @@ set :deploy_to, "/home/#{user}/public_html/#{application}"
 
 set :scm, :git
 set :default_run_options, { :pty => true }
-set :repository, "git://github.com/fesplugas/typus.git"
+set :repository, "git://github.com/typus/typus.git"
 set :deploy_via, :remote_cache
 set :keep_releases, 2
 set :branch, "3-1-unstable"

data/test/fixtures/rails_app/config/typus/README

@@ -34,7 +34,6 @@ 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

data/test/fixtures/rails_app/config/typus/admin.yml

@@ -2,7 +2,7 @@ AdminUser: &ADMIN_USER
   fields:
     default: first_name, last_name, role, email, locale
     list: email, role, status
-    form: first_name, last_name, role, email, password, password_confirmation, locale
+    form: first_name, last_name, role, email, password, password_confirmation, locale, status
     options:
       selectors: role, locale
       booleans:

data/test/fixtures/rails_app/config/typus/crud_extended.yml

@@ -6,12 +6,12 @@ Asset:
     new: dragonfly, dragonfly_required, paperclip, paperclip_required
   application: CRUD Extended
 
-Category:
+Case:
   fields:
-    default: name, position
-    form: name, permalink, position
-  order_by: position
+    default: title
+    form: title, content
   application: CRUD Extended
+  relationships: categories
 
 Comment:
   fields:
@@ -54,6 +54,7 @@ Post:
       date_formats:
         created_at: short
       templates:
+        body: text_with_ckeditor_and_assets
         published_at: datepicker
   relationships: categories, comments, views
   actions:
@@ -64,3 +65,14 @@ Post:
   order_by: title, -created_at
   export: csv, xml
   application: CRUD Extended
+
+Article::Entry:
+  fields:
+    default: title, published
+    form: title, content, published
+    options:
+      booleans:
+        published: ["Yes", "No"]
+  search: title
+  filters: published
+  application: CRUD Extended

data/test/fixtures/rails_app/config/typus/crud_extended_roles.yml

@@ -1,18 +1,17 @@
 admin:
+  Article::Entry: all
   Asset: create, read, update, delete
-  Category: create, read, update, delete
+  Case: all
   Comment: create, read, update, delete
   Order:
   Page: create, read, update, delete, rebuild, rebuild_all
   Post: create, read, update, delete
 
 editor:
-  Category: create, read, update
   Comment: read, update, delete
   Post: create, read, update
   TypusUser: read, update
 
 designer:
-  Category: read, update
   Comment: read
   Post: read, update

data/test/fixtures/rails_app/config/typus/extensions.yml

@@ -0,0 +1,29 @@
+Category:
+  fields:
+    default: name, position
+    form: name, permalink, position
+  order_by: position
+  application: Extensions
+  search: name
+
+EntryBulk:
+  fields:
+    default: title, published
+    form: title, content, published
+    options:
+      booleans:
+        published: ["Yes", "No"]
+  search: title
+  filters: published
+  application: Extensions
+
+EntryTrash:
+  fields:
+    default: title, published
+    form: title, content, published
+    options:
+      booleans:
+        published: ["Yes", "No"]
+  search: title
+  filters: published
+  application: Extensions

data/test/fixtures/rails_app/config/typus/extensions_roles.yml

@@ -0,0 +1,4 @@
+admin:
+  Category: all
+  EntryBulk: all
+  EntryTrash: all

data/test/fixtures/rails_app/public/vendor/ckeditor/.htaccess

@@ -0,0 +1,24 @@
+#
+# Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+# For licensing, see LICENSE.html or http://ckeditor.com/license
+#
+
+#
+# On some specific Linux installations you could face problems with Firefox.
+# It could give you errors when loading the editor saying that some illegal
+# characters were found (three strange chars in the beginning of the file).
+# This could happen if you map the .js or .css files to PHP, for example.
+#
+# Those characters are the Byte Order Mask (BOM) of the Unicode encoded files.
+# All FCKeditor files are Unicode encoded.
+#
+
+AddType application/x-javascript .js
+AddType text/css .css
+
+#
+# If PHP is mapped to handle XML files, you could have some issues. The
+# following will disable it.
+#
+
+AddType text/xml .xml