radiant 0.6.3 → 0.6.4

data/test/unit/page_context_test.rb

@@ -19,11 +19,42 @@ class PageContextTest < Test::Unit::TestCase
     def @context.testing?() false end
     assert_parse_output_match "undefined tag `missing'", '<r:missing />'
   end
+  
+  def test_request_is_passed_around
+    @context.define_tag "if_request" do |tag|
+      tag.expand if tag.locals.page.request
+    end
+    assert_parse_output_match /^$/, '<r:if_request>tada!</r:if_request>'
+    
+    @page.request = ActionController::TestRequest.new
+    assert_parse_output_match "tada!", '<r:if_request>tada!</r:if_request>'
+    assert_parse_output_match "tada!", '<r:find url="/another/"><r:if_request>tada!</r:if_request></r:find>'
+  end
+  
+  def test_response_is_passed_around
+    @context.define_tag "if_response" do |tag|
+      tag.expand if tag.locals.page.response
+    end
+    assert_parse_output_match /^$/, '<r:if_response>tada!</r:if_response>'
     
+    @page.response = ActionController::TestResponse.new
+    assert_parse_output_match "tada!", '<r:if_response>tada!</r:if_response>'
+    assert_parse_output_match "tada!", '<r:find url="/another/"><r:if_response>tada!</r:if_response></r:find>'
+  end
+
+  def test_exception_pops_stack
+    assert_equal '', @context.current_nesting
+    @context.define_tag("error") {|tag| raise "Broken!"}
+    def @context.testing?(); false; end
+    assert_parse_output_match /Broken\!/, "<r:error/>"
+    assert_equal '', @context.current_nesting
+  end
+
   private
     
     def assert_parse_output_match(regexp, input)
       output = @parser.parse(input)
       assert_match regexp, output
     end
-end
+    
+end

data/test/unit/page_test.rb

@@ -94,7 +94,19 @@ class PageTest < Test::Unit::TestCase
     part = pages(:radius).part(:body)
     assert_equal 'body', part.name
   end
-
+  def test_part__when_page_is_unsaved
+    part = PagePart.new(:content => "test", :name => "test")
+    @page.parts << part
+    assert_equal part, @page.part('test')
+    assert_equal part, @page.part(:test)
+  end
+  def test_part__when_parts_are_unsaved
+    @page = pages(:radius)
+    @page.parts.build(:content => "test", :name => "test")
+    assert_equal "test", @page.part('test').content
+    assert_equal "test", @page.part(:test).content
+  end
+  
   def test_published_at
     @page = create_test_page(:status_id => '1')
     assert_nil @page.published_at
@@ -147,13 +159,9 @@ class PageTest < Test::Unit::TestCase
     found = @page.find_by_url('/parent/child/grandchild/great-grandchild/')
     assert_equal expected, found 
   end
-  def test_find_by_url_3
-    @page = pages(:homepage)
-    assert_equal pages(:article), @page.find_by_url('/archive/2000/05/01/article/')
-  end
   def test_find_by_url__when_virtual
     @page = pages(:homepage)
-    found = @page.find_by_url('/archive/2006/02/05/month/')
+    found = @page.find_by_url('/assorted/virtual/')
     assert_equal nil, found
   end
   def test_find_by_url__when_not_found_and_missing_page_defined
@@ -297,11 +305,6 @@ class PageTest < Test::Unit::TestCase
     assert_equal "Hello world! Another test.", @page.render_part(:body)
   end
 
-  def test_render_text
-    @page = pages(:homepage)
-    assert_equal "/", @page.render_text( "<r:slug />")
-  end
-  
   def test_display_name_class_method
     assert_equal "Page", Page.display_name
     
@@ -412,4 +415,35 @@ class PageTest < Test::Unit::TestCase
     end
   end
   
+  def test_has_part
+    @page = pages(:homepage)
+    assert(@page.has_part?(:body))
+    assert(@page.has_part?('extended'))
+    assert(!@page.has_part?(:obviously_false_part_name))
+  end
+  def test_has_or_inherits_part
+    @page = pages(:child)
+    assert(!@page.has_part?(:sidebar))
+    assert(@page.has_or_inherits_part?(:sidebar))
+    assert(!@page.has_or_inherits_part?(:obviously_false_part_name))
+    
+    @page = pages(:homepage)
+    assert(@page.has_part?(:sidebar))
+    assert(@page.has_or_inherits_part?(:sidebar))
+    assert(!@page.has_or_inherits_part?(:obviously_false_part_name))
+  end
+  def test_inherits_part
+    @page = pages(:child)
+    assert(!@page.has_part?(:sidebar))
+    assert(@page.inherits_part?(:sidebar))
+    
+    @page = pages(:homepage)
+    assert(@page.has_part?(:sidebar))
+    assert(!@page.inherits_part?(:sidebar))
+    
+    @page = pages(:radius)
+    assert(@page.has_part?(:extended))
+    assert(!@page.inherits_part?(:extended))
+  end
+  
 end

data/test/unit/radiant/config_test.rb

@@ -46,7 +46,7 @@ class Radiant::ConfigTest < Test::Unit::TestCase
     set('bool2', :blahblahblah)
     assert_equal 'blahblahblah', @conf['bool2']
   end
-  
+
   private
     def set(key, value)
       setting = Radiant::Config.find_by_key(key)

data/test/unit/response_cache_test.rb

@@ -13,13 +13,15 @@ class ResponseCacheTest < Test::Unit::TestCase
   end
   
   def setup
-    @dir = "#{RAILS_ROOT}/test/cache"
+    @dir = File.expand_path("#{RAILS_ROOT}/test/cache")
+    @baddir = File.expand_path("#{RAILS_ROOT}/test/badcache")
+    FileUtils.rm_rf @baddir
     @old_perform_caching = ResponseCache.defaults[:perform_caching]
     ResponseCache.defaults[:perform_caching] = true
     @cache = ResponseCache.new(
       :directory => @dir,
       :perform_caching => true
-    )
+    )
     @cache.clear
   end
   
@@ -188,6 +190,29 @@ class ResponseCacheTest < Test::Unit::TestCase
     File.open("#{@dir}/test_me.yml",'w') {|f| f.puts "--- \nheaders: \n  Last-Modified: Tue, 27 Feb 2007 06:13:43 GMT\n"}
     assert !@cache.response_cached?('/test_me')
   end  
+  
+  def test_cache_cant_write_outside_dir
+    @cache.cache_response('../badcache/cache_cant_write_outside_dir', response('content'))
+    assert !File.exist?("#{RAILS_ROOT}/test/badcache/cache_cant_write_outside_dir.yml")
+  end
+  
+  def test_cache_cant_read_outside_dir
+    FileUtils.makedirs(@baddir)
+    @cache.cache_response('/test_me', response('content'))
+    File.rename "#{@dir}/test_me.yml","#{@baddir}/test_me.yml"
+    File.rename "#{@dir}/test_me.data","#{@baddir}/test_me.data"
+    assert !@cache.response_cached?('/../badcache/test_me')
+  end
+  
+  def test_cache_cant_expire_outside_dir
+    FileUtils.makedirs(@baddir)
+    @cache.cache_response('/test_me', response('content'))
+    File.rename "#{@dir}/test_me.yml","#{@baddir}/test_me.yml"
+    File.rename "#{@dir}/test_me.data","#{@baddir}/test_me.data"
+    @cache.expire_response('/../badcache/test_me')
+    assert File.exist?("#{@baddir}/test_me.yml")
+    assert File.exist?("#{@baddir}/test_me.data")
+  end  
 
   # Class Methods
   

data/test/unit/standard_tags_test.rb

@@ -66,27 +66,27 @@ class StandardTagsTest < Test::Unit::TestCase
     assert_render_error message, page_children_each_tags(%{order="asdf"})
   end
   def test_tag_children_each_does_not_list_virtual_pages
-    @page = pages(:archive)
-    assert_renders 'article article-2 article-3 article-4 article-5 ', '<r:children:each><r:slug /> </r:children:each>'
-    assert_render_match /^(draft |)article article-2 article-3 article-4 article-5( draft|) $/, '<r:children:each status="all"><r:slug /> </r:children:each>'
+    @page = pages(:assorted)
+    assert_renders 'a b c d e f g h i j ', '<r:children:each><r:slug /> </r:children:each>'
+    assert_render_match /^(draft |)a b c d e f g h i j( draft|) $/, '<r:children:each status="all"><r:slug /> </r:children:each>'
   end
   
   def test_tag_children_each_header
-    @page = pages(:archive)
-    assert_renders '[May/00] article [Jun/00] article-2 article-3 [Aug/00] article-4 [Aug/01] article-5 ', '<r:children:each><r:header>[<r:date format="%b/%y" />] </r:header><r:slug /> </r:children:each>'
+    @page = pages(:news)
+    assert_renders '[Jan/06] a-great-day-for-ruby [Feb/06] another-great-day-for-ruby later-that-day [Jan/07] next-year-in-ruby ', '<r:children:each><r:header>[<r:date format="%b/%y" />] </r:header><r:slug /> </r:children:each>'
   end
   def test_tag_children_each_header_with_name_attribute
-    @page = pages(:archive)
-    assert_renders '[2000] (May) article (Jun) article-2 article-3 (Aug) article-4 [2001] article-5 ', %{<r:children:each><r:header name="year">[<r:date format='%Y' />] </r:header><r:header name="month">(<r:date format="%b" />) </r:header><r:slug /> </r:children:each>}  
+    @page = pages(:news)
+    assert_renders '[2006] (Jan) a-great-day-for-ruby (Feb) another-great-day-for-ruby later-that-day [2007] (Jan) next-year-in-ruby ', %{<r:children:each><r:header name="year">[<r:date format='%Y' />] </r:header><r:header name="month">(<r:date format="%b" />) </r:header><r:slug /> </r:children:each>}  
   end
   def test_tag_children_each_header_with_restart_attribute
-    @page = pages(:archive)
+    @page = pages(:news)
     assert_renders(
-      '[2000] (May) article (Jun) article-2 article-3 (Aug) article-4 [2001] (Aug) article-5 ',
+      '[2006] (Jan) a-great-day-for-ruby (Feb) another-great-day-for-ruby later-that-day [2007] (Jan) next-year-in-ruby ',
       %{<r:children:each><r:header name="year" restart="month">[<r:date format='%Y' />] </r:header><r:header name="month">(<r:date format="%b" />) </r:header><r:slug /> </r:children:each>}
     )
     assert_renders(
-      '[2000] (May) <01> article (Jun) <09> article-2 <10> article-3 (Aug) <06> article-4 [2001] (Aug) <06> article-5 ',
+      '[2006] (Jan) <30> a-great-day-for-ruby (Feb) <05> another-great-day-for-ruby <06> later-that-day [2007] (Jan) <30> next-year-in-ruby ',
       %{<r:children:each><r:header name="year" restart="month;day">[<r:date format='%Y' />] </r:header><r:header name="month" restart="day">(<r:date format="%b" />) </r:header><r:header name="day"><<r:date format='%d' />> </r:header><r:slug /> </r:children:each>}
     )
   end
@@ -141,7 +141,7 @@ class StandardTagsTest < Test::Unit::TestCase
     assert_renders '', '<r:content part="sidebar" inherit="false" />'
     assert_renders 'Radius Test Page sidebar.', '<r:content part="sidebar" inherit="true" />'
     assert_render_error %{`inherit' attribute of `content' tag must be set to either "true" or "false"}, '<r:content part="sidebar" inherit="weird value" />'
-
+    
     assert_renders '', '<r:content part="part_that_doesnt_exist" inherit="true" />'
   end
   def test_tag_content_with_inherit_and_contextual_attributes
@@ -151,6 +151,14 @@ class StandardTagsTest < Test::Unit::TestCase
     @page = pages(:inheritance_test_page_grandchild)
     assert_renders 'Inheritance Test Page Grandchild inherited body.', '<r:content part="body" inherit="true" contextual="true" />'
   end
+  def test_tag_content_with_inherit_attribute_grandparent
+    @page = pages(:child)
+    assert_renders '', '<r:content part="sidebar" />'
+    assert_renders 'Child sidebar.', '<r:content part="sidebar" inherit="true" />'
+    @page = pages(:parent)
+    assert_renders '', '<r:content part="sidebar" />'
+    assert_renders 'Parent sidebar.', '<r:content part="sidebar" inherit="true" />'
+  end
   
   def test_tag_child_content
     expected = "Radius test child 1 body.\nRadius test child 2 body.\nRadius test child 3 body.\n"
@@ -200,7 +208,13 @@ class StandardTagsTest < Test::Unit::TestCase
     assert_renders 'Monday, January 30, 2006', '<r:date for="published_at" />'
     assert_render_error "Invalid value for 'for' attribute.", '<r:date for="blah" />'
   end
-  
+  def test_tag_date_uses_local_timezone 
+    Radiant::Config["local.timezone"] = "Tokyo"
+    format = "%H:%m"
+    expected = TimeZone["Tokyo"].adjust(@page.published_at).strftime format 
+    assert_renders expected, %Q(<r:date format="#{format}" />) 
+  end
+
   def test_tag_link
     assert_renders '<a href="/radius/">Radius Test Page</a>', '<r:link />'
   end
@@ -301,7 +315,7 @@ class StandardTagsTest < Test::Unit::TestCase
   end
   
   def test_tag_find_and_children
-    assert_renders 'a-great-day-for-ruby another-great-day-for-ruby ', %{<r:find url="/news/"><r:children:each><r:slug /> </r:children:each></r:find>}
+    assert_renders 'a-great-day-for-ruby another-great-day-for-ruby later-that-day next-year-in-ruby ', %{<r:find url="/news/"><r:children:each><r:slug /> </r:children:each></r:find>}
   end
   
   def test_tag_escape_html
@@ -403,6 +417,37 @@ class StandardTagsTest < Test::Unit::TestCase
     assert_renders 'true', '<r:unless_parent>true</r:unless_parent>'
   end
   
+  def test_tag_if_children
+    @page = pages(:homepage)
+    assert_renders 'true', '<r:if_children>true</r:if_children>'
+    @page = pages(:childless)
+    assert_renders '', '<r:if_children>true</r:if_children>'
+  end
+  def test_tag_unless_children
+    @page = pages(:homepage)
+    assert_renders '', '<r:unless_children>true</r:unless_children>'
+    @page = pages(:childless)
+    assert_renders 'true', '<r:unless_children>true</r:unless_children>'
+  end
+  
+  def test_if_dev
+    assert_renders '-dev-', '-<r:if_dev>dev</r:if_dev>-', nil , 'dev.site.com'
+    assert_renders '--', '-<r:if_dev>dev</r:if_dev>-'
+  end
+  def test_if_dev_on_included_page
+    assert_renders '-dev-', '-<r:find url="/devtags/"><r:content part="if_dev" /></r:find>-', nil, 'dev.site.com'
+    assert_renders '--', '-<r:find url="/devtags/"><r:content part="if_dev" /></r:find>-'
+  end
+  
+  def test_unless_dev
+    assert_renders '--', '-<r:unless_dev>not dev</r:unless_dev>-', nil, 'dev.site.com'
+    assert_renders '-not dev-', '-<r:unless_dev>not dev</r:unless_dev>-'
+  end
+  def test_unless_dev_on_included_page
+    assert_renders '--', '-<r:find url="/devtags/"><r:content part="unless_dev" /></r:find>-', nil, 'dev.site.com'
+    assert_renders '-not dev-', '-<r:find url="/devtags/"><r:content part="unless_dev" /></r:find>-'
+  end
+  
   private
   
     def page_children_first_tags(attr = nil)
@@ -415,13 +460,13 @@ class StandardTagsTest < Test::Unit::TestCase
       "<r:children:last#{attr}><r:slug /></r:children:last>"
     end
     
-    
     def page_children_each_tags(attr = nil)
       attr = ' ' + attr unless attr.nil?
       "<r:children:each#{attr}><r:slug /> </r:children:each>"
     end
-  
+    
     def page_eachable_children(page)
       page.children.select(&:published?).reject(&:virtual)
     end
+  
 end

data/vendor/extensions/archive/README

@@ -0,0 +1,29 @@
+= Archive
+
+The Archive extension extracts the Archive pages from their original place
+in the Radiant distribution.
+
+== Archive page
+
+An archive page provides behavior similar to a blog archive or a news
+archive. Child page URLs are altered to be in %Y/%m/%d format
+(2004/05/06).
+    
+An archive page can be used in conjunction with the "Archive Year Index",
+"Archive Month Index", and "Archive Day Index" page types to create year,
+month, and day indexes.
+
+== Archive Index pages
+
+To create a year/month/day index for an archive, create a child page for the
+archive and assign the "Archive [Year/Month/Day] Index" page type to it.
+
+An index page makes following tags available to you:
+
+<r:archive:children>...</r:archive:children>
+  Grants access to a subset of the children of the archive page
+  that match the specific year/month/day which the index page is rendering.
+
+The title and breadcrumb attributes of an index page are rendered using Ruby's
+Time#strftime method.  Please refer to documentation for Time#strftime to
+format these attributes.

data/vendor/extensions/archive/Rakefile

@@ -0,0 +1,25 @@
+require 'rake'
+require 'rake/testtask'
+require 'rake/rdoctask'
+
+desc 'Default: run unit tests.'
+task :default => :test
+
+desc 'Test the archive extension.'
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = true
+end
+
+desc 'Generate documentation for the archive extension.'
+Rake::RDocTask.new(:rdoc) do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title    = 'ArchiveExtension'
+  rdoc.options << '--line-numbers' << '--inline-source'
+  rdoc.rdoc_files.include('README')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end
+
+# Load any custom rakefiles for extension
+Dir[File.dirname(__FILE__) + '/tasks/*.rake'].sort.each { |f| require f }

data/{app → vendor/extensions/archive/app}/models/archive_finder.rb

@@ -1,8 +1,9 @@
 class ArchiveFinder
+  
   def initialize(&block)
     @block = block
   end
-
+  
   def find(method, options = {})
     @block.call(method, options)
   end
@@ -11,7 +12,7 @@ class ArchiveFinder
     def year_finder(finder, year)
       new do |method, options|
         start = Time.local(year)
-	finish = start.next_year
+        finish = start.next_year
         add_condition(options, "published_at >= ? and published_at < ?", start, finish)
         finder.find(method, options)
       end
@@ -20,7 +21,7 @@ class ArchiveFinder
     def month_finder(finder, year, month)
       new do |method, options|
         start = Time.local(year, month)
-	finish = start.next_month
+        finish = start.next_month
         add_condition(options, "published_at >= ? and published_at < ?", start, finish)
         finder.find(method, options)
       end
@@ -29,25 +30,26 @@ class ArchiveFinder
     def day_finder(finder, year, month, day)
       new do |method, options|
         start = Time.local(year, month, day)
-	finish = start.tomorrow
+        finish = start.tomorrow
         add_condition(options, "published_at >= ? and published_at < ?", start, finish)
         finder.find(method, options)
       end
     end
     
     private
-
+      
       def concat_conditions(a, b)
         sql = "(#{ [a.shift, b.shift].compact.join(") AND (") })"
         params = a + b
         [sql, *params]
       end
-    
+      
       def add_condition(options, *condition)
         old = options[:conditions] || []
         conditions = concat_conditions(old, condition)
         options[:conditions] = conditions
         options
       end
+      
   end
 end