radiant 0.5.2 → 0.6.0

data/script/process/inspector

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../../config/boot'
+require 'commands/process/inspector'

data/test/fixtures/extensions/basic/app/controllers/basic_extension_controller.rb

@@ -0,0 +1,7 @@
+class BasicExtensionController < ApplicationController
+  no_login_required
+  
+  def routing
+    render :text => "You're routing works"
+  end
+end

data/test/fixtures/extensions/basic/app/models/basic_extension_mailer.rb

@@ -0,0 +1,4 @@
+class BasicExtensionMailer < ActionMailer::Base
+  def message
+  end
+end

data/test/fixtures/extensions/basic/app/models/basic_extension_model.rb

@@ -0,0 +1,2 @@
+class BasicExtensionModel
+end

data/test/fixtures/extensions/basic/app/views/basic_extension/index.rhtml

@@ -0,0 +1 @@
+Hello, Extension World

data/test/fixtures/extensions/basic/app/views/basic_extension/override.rhtml

@@ -0,0 +1 @@
+I should be overridden.

data/test/fixtures/extensions/basic/app/views/basic_extension_mailer/message.rhtml

@@ -0,0 +1 @@
+Hello, Extension Mailer World

data/test/fixtures/extensions/basic/basic_extension.rb

@@ -0,0 +1,17 @@
+class BasicExtension < Radiant::Extension
+  version "1.1"
+  description "just a test"
+  url "http://test.com"
+  
+  define_routes do |map|
+    map.connect '/your/routing', :controller => 'basic_extension', :action => 'routing'
+    map.connect ':controller/:action'
+  end
+  
+  def activate
+    admin.tabs.add "Basic Extension Tab", "/admin/basic"
+  end
+  
+  def deactivate
+  end
+end

data/test/fixtures/extensions/basic/db/migrate/001_create_initial_schema.rb

@@ -0,0 +1,8 @@
+class CreateInitialSchema < ActiveRecord::Migration
+  def self.up
+    create_table "people", :force => true do |t|
+    end
+  end
+  
+  def self.down; end
+end

data/test/fixtures/extensions/basic/db/migrate/002_modify_initial_schema.rb

@@ -0,0 +1,8 @@
+class ModifyInitialSchema < ActiveRecord::Migration
+  def self.up
+    create_table "places", :force => true do |t|
+    end
+  end
+  
+  def self.down; end
+end

data/test/fixtures/extensions/overriding/app/views/basic_extension/override.rhtml

@@ -0,0 +1 @@
+Hello, Overridden Extension World

data/test/fixtures/extensions/overriding/overriding_extension.rb

@@ -0,0 +1,11 @@
+class OverridingExtension < Radiant::Extension
+  version "1.2"
+  description "overrides a view from basic extension"
+  url "http://test.com"
+
+  def activate
+  end
+
+  def deactivate
+  end
+end

data/test/fixtures/pages.yml

@@ -39,7 +39,9 @@ radius:
   status_id: 100
   parent_id: 1
   created_by: 3
-  published_at: 2006-01-30 08:41:07 
+  published_at: 2006-01-30 08:41:07
+  created_at: 2006-01-30 08:40:00
+  updated_at: 2006-01-31 08:40:00 
 <% for i in 1..3 %>
 radius_child_<%= i %>:
   id: <%= 5 + i %>
@@ -98,7 +100,7 @@ archive:
   title: Archive
   breadcrumb: Parent
   slug: archive
-  behavior_id: Archive
+  class_name: ArchivePage
   status_id: 100
   parent_id: 1
   published_at: 2006-01-30 08:41:07 
@@ -106,7 +108,7 @@ year_index:
   id: 41
   title: %Y Archive
   slug: year
-  behavior_id: Archive Year Index
+  class_name: ArchiveYearIndexPage
   status_id: 101
   parent_id: 12
   virtual: true
@@ -115,7 +117,7 @@ month_index:
   id: 42
   title: %B %Y Archive
   slug: month
-  behavior_id: Archive Month Index
+  class_name: ArchiveMonthIndexPage
   status_id: 101
   parent_id: 12
   virtual: true
@@ -124,7 +126,7 @@ day_index:
   id: 43
   title: %B %d, %Y Archive
   slug: day
-  behavior_id: Archive Day Index
+  class_name: ArchiveDayIndexPage
   status_id: 101
   parent_id: 12
   virtual: true
@@ -197,7 +199,7 @@ no_cache:
   slug: no-cache
   status_id: 100
   parent_id: 1
-  behavior_id: No Cache
+  class_name: NoCachePage
 assorted:
   id: 19
   title: Assorted Root
@@ -261,11 +263,11 @@ great_grandchild:
   status_id: 100
   parent_id: 33
   published_at: 2006-02-05 08:44:07 
-custom_tags:
+test_page:
   id: 35
-  title: Custom Tags
-  slug: custom-tags
-  behavior_id: Test Behavior
+  title: Test Page
+  slug: test-page
+  class_name: TestPage
   status_id: 100
   parent_id: 1
   published_at: 2006-02-05 08:44:07 
@@ -318,11 +320,11 @@ gallery:
   status_id: 100
   parent_id: 1
   published_at: 2006-02-05 08:44:07 
-missing:
+file_not_found:
   id: 51
   title: File Not Found
   slug: missing
-  behavior_id: Page Missing
+  class_name: FileNotFoundPage
   status_id: 100
   parent_id: 50
   published_at: 2006-02-05 08:44:07 

data/test/fixtures/sample.txt

@@ -0,0 +1 @@
+This is a sample text file.

data/test/fixtures/snippets.yml

@@ -15,4 +15,12 @@ markdown:
 snippet_with_tag:
   id: 4
   name: snippet_with_tag
-  content: <r:page:title />
+  content: <r:page:title />
+global_page_cascade:
+  id: 5
+  name: global_page_cascade
+  content: <r:children:each><r:page:title /> </r:children:each>
+recursive_snippet:
+  id: 6
+  name: recursive
+  content: <r:children:each><r:snippet name="recursive" /></r:children:each><r:page:title />

data/test/functional/admin/abstract_model_controller_test.rb

@@ -0,0 +1,125 @@
+require File.dirname(__FILE__) + '/../../test_helper'
+
+#
+# This test exercises the AbstractModelController by excercising the Layout
+# model and the LayoutController views.
+#
+class Admin::AbstractModelControllerTest < Test::Unit::TestCase
+  
+  class TestModelController < Admin::AbstractModelController
+    model_class Layout
+    
+    def rescue_action(e) raise e end
+    
+    def default_template_name(default_action_name = action_name)
+      "#{Admin::LayoutController.controller_path}/#{default_action_name}"
+    end
+  end
+  
+  fixtures :users, :layouts
+  test_helper :layouts, :caching, :routing
+  
+  def setup
+    @controller = TestModelController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    @request.session['user'] = users(:existing)
+    @cache = @controller.cache = FakeResponseCache.new
+    
+    @layout_name = "Test Layout"
+    
+    destroy_test_layout
+    setup_custom_routes
+  end
+  
+  def teardown
+    teardown_custom_routes
+  end
+  
+  def test_initialize
+    @controller = TestModelController.new
+    assert_kind_of ResponseCache, @controller.cache
+  end
+  
+  def test_index
+    get :index
+    assert_response :success
+    layouts = assigns(:layouts)
+    assert_kind_of Array, layouts
+    assert_kind_of Layout, layouts.first
+  end
+  
+  def test_new
+    get :new, :layout => layout_params
+    assert_response :success
+    assert_template 'admin/layout/edit'
+    
+    @layout = assigns(:layout)
+    assert_kind_of Layout, @layout
+    assert_nil @layout.name
+  end
+  def test_new__post
+    post :new, :layout => layout_params
+    assert_redirected_to layout_index_url
+    assert_match /saved/, flash[:notice]
+    assert_kind_of Layout, get_test_layout
+  end
+  def test_new__post_with_invalid_layout
+    post :new, :layout => layout_params(:name => nil)
+    assert_response :success
+    assert_match /error/, flash[:error]
+    assert_nil get_test_layout
+  end
+  def test_new__save_and_continue_editing
+    post :new, :layout => layout_params, :continue => 'Save and Continue Editing'
+    @layout = get_test_layout
+    assert_redirected_to layout_edit_url(:id => @layout.id)
+  end
+  
+  def test_edit
+    get :edit, :id => '1', :layout => layout_params
+    assert_response :success
+    
+    @layout = assigns(:layout)
+    assert_kind_of Layout, @layout
+    assert_equal 'Home Page', @layout.name
+  end  
+  def test_edit__post
+    @layout = create_test_layout
+    post :edit, :id => @layout.id, :layout => layout_params(:content => 'edited')
+    assert_response :redirect
+    assert_equal 'edited', get_test_layout.content
+    
+    # TODO: Test what happens when an invalid page is submitted 
+  end
+  
+  def test_remove
+    @layout = create_test_layout
+    get :remove, :id => @layout.id 
+    assert_response :success
+    assert_equal @layout, assigns(:layout)
+    assert_not_nil get_test_layout
+  end
+  def test_remove__post
+    @layout = create_test_layout
+    post :remove, :id => @layout.id
+    assert_nil get_test_layout
+    assert_redirected_to layout_index_url
+    assert_match /deleted/, flash[:notice]
+  end
+  
+  def test_clears_cache_on_save
+    @layout = layouts(:main)
+    post :edit, :id => @layout.id, :layout => layout_params(:content => 'edited')
+    assert_redirected_to layout_index_url
+    assert_equal true, @cache.cleared?
+  end
+  
+  def test_not_cleared_when_invalid
+    @layout = layouts(:main)
+    post :edit, :id => @layout.id, :layout => layout_params(:name => 'x' * 1000)
+    assert_response :success
+    assert_equal false, @cache.cleared?
+  end
+  
+end

data/test/functional/admin/export_controller_test.rb

@@ -8,15 +8,15 @@ class Admin::ExportControllerTest < Test::Unit::TestCase
   fixtures :users, :pages
   
   def setup
-    @controller = ExportController.new
+    @controller = Admin::ExportController.new
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
-    @request.session[:user] = users(:developer)
+    @request.session['user'] = users(:developer)
   end
 
   def test_yaml
     get :yaml
     assert_kind_of Hash, YAML.load(@response.body)
-    assert_equal 'text/yaml', @response.headers['Content-Type']
+    assert_equal 'text/yaml; charset=utf-8', @response.headers['Content-Type']
   end
 end

data/test/functional/admin/extension_controller_test.rb

@@ -0,0 +1,40 @@
+require File.dirname(__FILE__) + '/../../test_helper'
+require 'admin/extension_controller'
+
+# Re-raise errors caught by the controller.
+class Admin::ExtensionController; def rescue_action(e) raise e end; end
+
+class Admin::ExtensionControllerTest < Test::Unit::TestCase
+  
+  fixtures :users
+  
+  def setup
+    @controller = Admin::ExtensionController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    @request.session['user'] = users(:admin)
+  end
+
+  def test_index
+    get :index
+    assert_response :success
+    assert_equal sorted_ext, assigns(:extensions)
+  end
+  
+  def test_update
+    all_extensions = Radiant::Extension.descendants.dup
+    active_extensions = Radiant::Extension.descendants.select { |e| e.active? }
+    assert_equal all_extensions, active_extensions
+    
+    flagged_extensions = [all_extensions[0]]
+    unflagged_extensions = all_extensions - flagged_extensions
+    post :update, :enabled_extensions => flagged_extensions.collect { |e| e.extension_name }
+    assert_equal unflagged_extensions, Radiant::Extension.descendants.select { |e| !e.active? }
+  end
+  
+  private
+  
+    def sorted_ext
+      Radiant::Extension.descendants.sort_by { |e| e.extension_name }
+    end
+end

data/test/functional/admin/layout_controller_test.rb

@@ -12,7 +12,7 @@ class Admin::LayoutControllerTest < Test::Unit::TestCase
     @controller = Admin::LayoutController.new
     @request = ActionController::TestRequest.new
     @response = ActionController::TestResponse.new
-    @request.session[:user] = users(:developer)
+    @request.session['user'] = users(:developer)
   end
 
   def test_ancestors
@@ -21,7 +21,7 @@ class Admin::LayoutControllerTest < Test::Unit::TestCase
   
   [:index, :new, :edit, :remove].each do |action|
     define_method "test_#{action}_action_allowed_if_admin" do
-      get action, { :id => 1 }, { :user => users(:admin) }
+      get action, { :id => 1 }, { 'user' => users(:admin) }
       assert_response :success, "action: #{action}"
     end
     
@@ -31,7 +31,7 @@ class Admin::LayoutControllerTest < Test::Unit::TestCase
     end
     
     define_method "test_#{action}_action__not_allowed_if_other" do
-      get action, { :id => 1 }, { :user => users(:existing) }, {}
+      get action, { :id => 1 }, { 'user' => users(:existing) }, {}
       assert_redirected_to page_index_url, "action: #{action}"
       assert_match /privileges/, flash[:error], "action: #{action}"
     end

data/test/functional/admin/page_controller_test.rb

@@ -12,7 +12,7 @@ class Admin::PageControllerTest < Test::Unit::TestCase
     @controller = Admin::PageController.new
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
-    @request.session[:user] = users(:existing)
+    @request.session['user'] = users(:existing)
     
     @page_title = 'Just a Test'
     
@@ -40,14 +40,14 @@ class Admin::PageControllerTest < Test::Unit::TestCase
   def test_index__without_cookies
     get :index
     assert_response :success
-    assert_rendered_nodes_where { |page| page.parent_id.nil? || page.parent.parent_id.nil? }
+    assert_rendered_nodes_where { |page| [nil, 1].include?(page.parent_id) }
   end
 
   def test_index__with_empty_cookie
     @request.cookies['expanded_rows'] = [""]
     get :index
     assert_response :success
-    assert_rendered_nodes_where { |page| page.parent_id.nil? }
+    assert_rendered_nodes_where { |page| [nil, 1].include?(page.parent_id) }
   end
 
   def test_index__with_cookie
@@ -66,10 +66,14 @@ class Admin::PageControllerTest < Test::Unit::TestCase
   end
   
   def test_new
-    @controller.config = { 'default.parts' => 'body, extended, summary' }
+    @controller.config = {
+      'defaults.page.parts' => 'body, extended, summary',
+      'defaults.page.status' => 'published'
+    }
     
     get :new, :parent_id => '1', :page => page_params
     assert_response :success
+    assert_template 'admin/page/edit'
     
     @page = assigns(:page)
     assert_kind_of Page, @page
@@ -79,6 +83,7 @@ class Admin::PageControllerTest < Test::Unit::TestCase
     assert_equal @expected_parent, @page.parent
     
     assert_equal 3, @page.parts.size
+    assert_equal Status[:published], @page.status
   end
   def test_new__with_slug_and_breadcrumb
     get :new, :parent_id => '1', :page => page_params, :slug => 'test', :breadcrumb => 'me'
@@ -134,11 +139,21 @@ class Admin::PageControllerTest < Test::Unit::TestCase
     @page = get_test_page
     assert_redirected_to page_edit_url(:id => @page.id)
   end
+  def test_new_edit__meta_and_buttons_partials_initialized
+    get :new, :parent_id => '1'
+    assert_response :success
+    assert_not_nil assigns(:meta)
+    assert_not_nil assigns(:buttons_partials)
+   
+    get :edit, :id => '1'
+    assert_response :success
+    assert_not_nil assigns(:meta)
+    assert_not_nil assigns(:buttons_partials)
+  end
   
   def test_edit
     get :edit, :id => '1', :page => page_params
     assert_response :success
-    assert_template 'admin/page/new'
     
     @page = assigns(:page)
     assert_kind_of Page, @page
@@ -165,7 +180,26 @@ class Admin::PageControllerTest < Test::Unit::TestCase
     @page = get_test_page 
     assert_equal 1, @page.parts.size
     assert_equal 'changed', @page.parts.first.content
-  end
+  end
+
+  def test_edit__post_with_optimistic_locking
+    @page = create_test_page
+    post :edit, :id => @page.id, :page => page_params(:status_id => '1', :lock_version => '12')
+    assert_response :success # not redirected
+    assert_match /has been modified/, flash[:error]
+  end
+  
+  def test_edit__post_with_parts_and_optimistic_locking
+    @page = create_test_page
+    @page.parts.create(part_params(:name => 'test-part-1', :content => 'original-1'))
+    post :edit, :id => @page.id, :page => page_params(:status_id => '1', :lock_version => '12'), :part => {'1' => part_params(:name => 'test-part-1', :content => 'changed-1')}
+    assert_response :success # not redirected
+    assert_match /has been modified/, flash[:error]
+    #changed value must not be saved
+    assert_equal 'original-1', @page.parts.find_by_name('test-part-1').content
+    #but must be rendered to page
+    assert_tag :tag => 'textarea', :content => 'changed-1' 
+  end  
   
   def test_remove
     @page = create_test_page
@@ -212,6 +246,20 @@ class Admin::PageControllerTest < Test::Unit::TestCase
     assert_equal 'text/html;charset=utf-8', @response.headers['Content-Type']
   end
   
+  def test_tag_reference
+    xml_http_request :get, :tag_reference, :class_name => "Page"
+    assert_response :success
+    assert_equal "Page", assigns(:class_name)
+    assert_template "tag_reference"
+  end
+
+  def test_filter_reference
+    xml_http_request :get, :filter_reference, :filter_name => "Textile"
+    assert_response :success
+    assert_equal "Textile", assigns(:filter_name)
+    assert_template "filter_reference"
+  end
+  
   protected
   
     def assert_rendered_nodes_where(&block)