radiant 0.6.3 → 0.6.4

data/public/javascripts/tag_reference_search.js

@@ -1,30 +1,23 @@
-function hasWordInElement(word, element) {       
-    if(element.nodeType == Node.TEXT_NODE)                   
-        return element.nodeValue.match(word) != null;
-    else 
-        return $A(element.childNodes).any(
-            function (child) { 
-                return hasWordInElement(word, child); 
-            });
+function hasWordInElement(word, element) {
+  if (element.nodeType == Node.TEXT_NODE) {
+    return element.nodeValue.include(word) != null;
+  } else {
+    return $A(element.childNodes).any(function(child) { 
+      return hasWordInElement(word, child); 
+    });
+  }
 }
+
 var searchingOn = ""
+
 function observeTagSearch(element, value) {
-	if(value.length < 3 && searchingOn != "")
-	{
-		searchingOn = "";
-		divs = $$("div.tag-description");
-		$A(divs).each(function(div){ Element.show(div); });
-	}
-	else if(value.length >= 3 && searchingOn != value)
-	{
-		searchingOn = value
-    	divs = $$("div.tag-description");
-		$A(divs).each(function (div){
-			if(hasWordInElement(value, div))
-				Element.show(div);						
-			else
-				Element.hide(div);
-		});
-	}
+  if (value.length < 3 && searchingOn != "") {
+    searchingOn = "";
+    $$("div.tag-description").invoke('show');
+  } else if (value.length >= 3 && searchingOn != value) {
+    searchingOn = value
+    $$("div.tag-description").each(function(div) {
+      div[hasWordInElement(value, div) ? 'show' : 'hide']();
+    });
+  }
 }
-

data/public/stylesheets/admin/main.css

@@ -5,8 +5,8 @@ body {
   padding: 0;
 }
 img, input[type='image'] { 
-	border: 0;
-	vertical-align: middle; 
+  border: 0;
+  vertical-align: middle; 
 }
 h3 {
   font-size: 130%;
@@ -24,6 +24,9 @@ h3 {
   color: red;
 }
 
+table {
+  border-collapse: collapse;
+}
 
 /* main layout */
 
@@ -252,7 +255,8 @@ h1 {
   font-style: italic;
   font-weight: normal;
 }
-#content table.index tr.highlight {
+#content table.index tr.highlight,
+#content table.index tr:hover {
   background-color: #ffffb3;
 }
 #content table.index .no-children .w1 {
@@ -464,7 +468,7 @@ h1 {
   height: 280px;
   border: 1px solid #cdc295;
   font-family: Monaco, "Courier New", Courier, monospace;
-  font-size: 85%;
+  font-size: 95%;
 }
 #content #pages label {
   font-size: 85%;
@@ -490,7 +494,9 @@ h1 {
 #popups .popup .close-link {
   font-size: 85%;
 }
-
+#add-part-popup {
+  width: 17em;
+}
 
 /* tag reference */
 

data/test/fixtures/extensions/01_basic/lib/new_module.rb

@@ -0,0 +1,2 @@
+module NewModule
+end

data/test/fixtures/page_parts.yml

@@ -96,4 +96,19 @@ inheritance_test_part:
   id: 19
   name: body
   content: <r:title /> inherited body.
-  page_id: 47
+  page_id: 47
+if_dev_test_part:
+  id: 20
+  name: if_dev
+  content: <r:if_dev>dev</r:if_dev>
+  page_id: 60
+unless_dev_test_part:
+  id: 21
+  name: unless_dev
+  content: <r:unless_dev>not dev</r:unless_dev>
+  page_id: 60
+another:
+  id: 22
+  name: body
+  content: another page
+  page_id: 61

data/test/fixtures/pages.yml

@@ -95,89 +95,6 @@ child:
   status_id: 100
   parent_id: 10
   published_at: 2006-01-30 08:41:07 
-archive:
-  id: 12
-  title: Archive
-  breadcrumb: Parent
-  slug: archive
-  class_name: ArchivePage
-  status_id: 100
-  parent_id: 1
-  published_at: 2006-01-30 08:41:07 
-year_index:
-  id: 41
-  title: %Y Archive
-  slug: year
-  class_name: ArchiveYearIndexPage
-  status_id: 101
-  parent_id: 12
-  virtual: true
-  published_at: 2006-02-05 08:44:07 
-month_index:
-  id: 42
-  title: %B %Y Archive
-  slug: month
-  class_name: ArchiveMonthIndexPage
-  status_id: 101
-  parent_id: 12
-  virtual: true
-  published_at: 2006-02-05 08:44:07 
-day_index:
-  id: 43
-  title: %B %d, %Y Archive
-  slug: day
-  class_name: ArchiveDayIndexPage
-  status_id: 101
-  parent_id: 12
-  virtual: true
-  published_at: 2006-02-05 08:44:07 
-article:
-  id: 13
-  title: Article
-  breadcrumb: Article
-  slug: article
-  status_id: 100
-  parent_id: 12
-  published_at: 2000-05-01 08:41:07 
-article2:
-  id: 14
-  title: Article Two
-  breadcrumb: Article Two
-  slug: article-2
-  status_id: 100
-  parent_id: 12
-  published_at: 2000-06-09 08:42:04 
-article3:
-  id: 44
-  title: Article Three
-  breadcrumb: Article Three
-  slug: article-3
-  status_id: 100
-  parent_id: 12
-  published_at: 2000-06-10 12:02:43 
-article4:
-  id: 45
-  title: Article Four
-  breadcrumb: Article Four
-  slug: article-4
-  status_id: 100
-  parent_id: 12
-  published_at: 2000-08-06 03:32:31 
-article5:
-  id: 46
-  title: Article Five
-  breadcrumb: Article Five
-  slug: article-5
-  status_id: 100
-  parent_id: 12
-  published_at: 2001-08-06 03:32:31 
-article_draft:
-  id: 53
-  title: Draft Article
-  breadcrumb: Draft Article
-  slug: draft
-  status_id: 1
-  parent_id: 12
 draft:
   id: 15
   title: Draft Page
@@ -247,7 +164,23 @@ news_child_published_2:
   slug: another-great-day-for-ruby
   status_id: 100
   parent_id: 30
-  published_at: 2006-02-05 08:44:07 
+  published_at: 2006-02-05 08:44:07
+news_child_published_3:
+  id: 65
+  title: Later That Day
+  breadcrumb: news
+  slug: later-that-day
+  status_id: 100
+  parent_id: 30
+  published_at: 2006-02-06 09:44:07
+news_child_published_4:
+  id: 66
+  title: Next Year in Ruby
+  breadcrumb: news
+  slug: next-year-in-ruby
+  status_id: 100
+  parent_id: 30
+  published_at: 2007-01-30 08:44:07
 grandchild:
   id: 33
   title: Grandchild
@@ -374,3 +307,33 @@ custom_404:
   status_id: 100
   parent_id: 58
   published_at: 2006-02-05 08:44:07 
+devtags:
+  id: 60
+  title: Dev Test Page
+  slug: devtags
+  status_id: 100
+  parent_id: 1
+  published_at: 2006-02-05 08:44:07
+another:
+  id: 61
+  title: Another Page
+  slug: another
+  status_id: 100
+  parent_id: 1
+  published_at: 2006-02-05 08:44:07
+childless:
+  id: 62
+  title: Childless Page
+  slug: childless
+  status_id: 100
+  parent_id: 1
+  published_at: 2006-02-05 08:44:07
+virtual:
+  id: 63
+  title: Virtual Page
+  class_name: VirtualPage
+  slug: virtual
+  virtual: 1
+  status_id: 100
+  parent_id: 19
+  published_at: 2006-02-05 08:44:07

data/test/functional/extension_initialization_test.rb

@@ -70,6 +70,8 @@ class ExtensionInitializationTest < Test::Unit::TestCase
     assert_nothing_raised { Radiant::Extension.const_get(:PLUGIN_PLUGIN_NORMAL) }
     assert_equal BasicExtension.root + "/vendor/plugins/plugin_normal", Radiant::Extension::PLUGIN_PLUGIN_NORMAL
     assert $LOAD_PATH.include?(BasicExtension.root + "/vendor/plugins/plugin_normal/lib")
+    assert Dependencies.load_paths.include?(BasicExtension.root + "/vendor/plugins/plugin_normal/lib")
+    assert Dependencies.load_once_paths.include?(BasicExtension.root + "/vendor/plugins/plugin_normal/lib")    
     assert defined?(NormalPlugin)
   end
     
@@ -77,11 +79,20 @@ class ExtensionInitializationTest < Test::Unit::TestCase
     assert_nothing_raised { Radiant::Extension.const_get(:PLUGIN_MULTIPLE) }
     assert_equal BasicExtension.root + "/vendor/plugins/multiple", Radiant::Extension::PLUGIN_MULTIPLE
     assert $LOAD_PATH.include?(BasicExtension.root + "/vendor/plugins/multiple/lib")
+    assert Dependencies.load_paths.include?(BasicExtension.root + "/vendor/plugins/multiple/lib")
+    assert Dependencies.load_once_paths.include?(BasicExtension.root + "/vendor/plugins/multiple/lib")    
     assert defined?(Multiple)
     assert_not_equal OverridingExtension.root + "/vendor/plugins/multiple", Radiant::Extension::PLUGIN_MULTIPLE
     assert !$LOAD_PATH.include?(OverridingExtension.root + "/vendor/plugins/multiple/lib")
+    assert !Dependencies.load_paths.include?(OverridingExtension.root + "/vendor/plugins/multiple/lib")
+    assert !Dependencies.load_once_paths.include?(OverridingExtension.root + "/vendor/plugins/multiple/lib")    
   end
 
+  def test_should_add_extension_load_paths_to_requirable_load_path
+    assert_nothing_raised { require 'new_module' }
+    assert defined?(NewModule)
+  end
+  
   private
   
     def assert_admin_tabs(more_tabs = [])

data/test/helpers/login_test_helper.rb

@@ -9,4 +9,15 @@ module LoginTestHelper
     @request ||= ActionController::TestRequest.new
     @request.session['user_id'] = logged_in_user.id
   end
-end
+  
+  def logout
+    @request ||= ActionController::TestRequest.new
+    @request.session['user_id'] = nil
+  end
+  
+  def assert_requires_login
+    yield if block_given?
+    assert_response :redirect
+    assert_redirected_to :controller => "admin/welcome", :action => "login"
+  end
+end

data/test/helpers/page_test_helper.rb

@@ -30,6 +30,12 @@ class TestPage < Page
   
 end
 
+class VirtualPage < Page
+  def virtual?
+    true
+  end
+end
+
 module PageTestHelper
   
   VALID_PAGE_PARAMS = {

data/test/helpers/render_test_helper.rb

@@ -1,6 +1,7 @@
 module RenderTestHelper
-  def assert_renders(expected, input, url = nil)
-    output = get_render_output(input, url)
+  
+  def assert_renders(expected, input, url = nil, host = nil)
+    output = get_render_output(input, url, host)
     message = "<#{expected.inspect}> expected but was <#{output.inspect}>"
     assert_block(message) { expected == output }
   end
@@ -44,14 +45,16 @@ module RenderTestHelper
   
   private
   
-    def get_render_output(input, url)
-      setup_page(url)
-      @page.render_text(input)
+    def get_render_output(input, url, host = nil)
+      setup_page(url, host)
+      @page.send(:parse, input)
     end
-  
-    def setup_page(url = nil)
+    
+    def setup_page(url = nil, host = nil)
       @page.request = ActionController::TestRequest.new
       @page.request.request_uri = 'http://testhost.tld' + (url || @page.url)
+      @page.request.host = host unless host.nil?
       @page.response = ActionController::TestResponse.new
     end
-end
+  
+end

data/test/test_helper.rb

@@ -37,17 +37,6 @@ unless defined? TEST_ROOT
     # Make sure instance installs know where fixtures are
     self.fixture_path = ["#{TEST_ROOT}/fixtures"]
     
-    # Session key stringification fix for Rails 1.2.2
-    %w( get post put delete head ).each do |method|
-      class_eval <<-EOV, __FILE__, __LINE__
-        def #{method}(action, parameters = nil, session = nil, flash = nil)
-          @request.env['REQUEST_METHOD'] = "#{method.upcase}" if defined?(@request)
-          session = session.stringify_keys if session.kind_of? Hash
-          process(action, parameters, session, flash)
-        end
-      EOV
-    end
-    
     class << self
       # Class method for test helpers
       def test_helper(*names)
@@ -70,4 +59,4 @@ unless defined? TEST_ROOT
       alias :test_helpers :test_helper
     end
   end
-end
+end

data/test/unit/file_not_found_page_test.rb

@@ -11,6 +11,10 @@ class FileNotFoundTest < Test::Unit::TestCase
   def test_url
     assert_renders 'http://testhost.tld/gallery/asdf?param=4', '<r:attempted_url />', '/gallery/asdf?param=4'
   end
+
+  def test_url__malicious_url
+    assert_renders 'http://testhost.tld/gallery/&lt;script&gt;alert(&quot;evil&quot;)&lt;/script&gt;', '<r:attempted_url />', '/gallery/<script>alert("evil")</script>'
+  end
   
   def test_virtual
     assert_equal true, @page.virtual?
@@ -24,4 +28,4 @@ class FileNotFoundTest < Test::Unit::TestCase
     assert_headers({'Status' => '404 Not Found'}, '/gallery/asdf')
   end
   
-end
+end

data/test/unit/local_time_test.rb

@@ -0,0 +1,45 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class MockClass; include LocalTime; end
+
+class LocalTimeTest < Test::Unit::TestCase
+
+  def setup
+    @obj = MockClass.new
+    @conf = Radiant::Config
+  end
+  
+  def test_adjust_time_with_no_timezone 
+    time = Time.gm 2004 
+    new_time = @obj.adjust_time(time)
+    assert_equal time, new_time 
+  end 
+
+  def test_adjust_time_with_garbage_timezone 
+    @conf["local.timezone"] = "Timezone that doesnt exist" 
+
+    time = Time.gm 2004 
+    new_time = @obj.adjust_time time 
+
+    assert_equal time, new_time 
+  end 
+
+  def test_adjust_time_with_numeric_timezone 
+    offset = -10.hours # Hawaii 
+    @conf["local.timezone"] = offset 
+
+    time = Time.gm 2004 
+    hawaii_time = @obj.adjust_time time 
+    assert_equal offset, hawaii_time - time 
+  end 
+
+  def test_adjust_time_with_string_timezone 
+    @conf["local.timezone"] = "Tokyo" 
+    time = Time.gm 2004 
+
+    tokyo_time = @obj.adjust_time time 
+    offset = 9.hours  # Tokyo is at +9:00 
+    assert_equal offset, tokyo_time - time 
+  end 
+  
+end