rote 0.3.2 → 0.3.2.2

data/lib/rote/project/Rakefile

@@ -1,7 +1,7 @@
 # Standard Rakefile for custom Rote build
 #
 # Generated from:
-# $Id: Rakefile 143 2005-12-14 19:01:05 +0000 (Wed, 14 Dec 2005) roscopeco $
+# $Id: Rakefile 150 2006-01-02 00:39:41 +0000 (Mon, 02 Jan 2006) roscopeco $
 # 
 begin 
   require 'rubygems'

data/lib/rote/rotetasks.rb

@@ -3,7 +3,7 @@
 # (c)2005 Ross Bamford (and contributors)
 #
 # See 'rote.rb' or LICENSE for licence information.
-# $Id: rotetasks.rb 128 2005-12-12 02:45:24 +0000 (Mon, 12 Dec 2005) roscopeco $
+# $Id: rotetasks.rb 170 2006-01-11 23:38:51 +0000 (Wed, 11 Jan 2006) roscopeco $
 #++
 require 'rake'
 require 'rake/tasklib'
@@ -317,18 +317,30 @@ module Rote
   end #class    
 end #module
 
-## The +monitor+ task requires a few mods to Rake to let us fire
-## and reset task invocations in a loop.
-module Rake # :nodoc: all
+#####
+## Rote adds the following methods to the Rake module.
+## All this cool stuff was contributed by Jonathan Paisley (<jp-www at dcs gla ac uk>)
+module Rake
+
+  #####
+  ## Rote adds the following methods to the Rake::Task class.
   class Task
+    # Reset the _executed_ and _invoked_ flags on this task. 
+    # Used by the +monitor+ task.
     def reset
       @already_invoked = false
       @executed = false
     end
+    
+    # Determine whether this task has been executed in this cycle.
+    # Used by the +monitor+ task.
     def executed?
       @executed
     end
+    
     alias :pre_rote_execute :execute
+    # Execute the task, setting the _executed_ flag.
+    # Used by the +monitor+ task.
     def execute
       @executed = true
       pre_rote_execute

data/test/layouts/nestme.txt

@@ -1 +1 @@
-this: '<%= @content_for_layout %>'
+with nested: '<%= @content_for_layout %>'

data/test/pages/nested/COMMON.rb

@@ -0,0 +1 @@
+layout 'withext.ext'

data/test/pages/nested/inner/COMMON.rb

@@ -0,0 +1,11 @@
+# This should *override* the layout specified by the preceeding
+# COMMON.rb, i.e. nested layout CANNOT be specified from COMMON,
+# This is intentional - COMMON.rb code always overrides the
+# COMMON.rb code from above. Nested layout only happens when 
+# 'layout' is called from page or layout code.
+
+# Obviously we can specify a layout here that uses nesting, since
+# the actual nesting doesn't happen until layout is run. If the 
+# page goes on to specify a layout, however, it will override
+# this one (as with this test).
+layout 'simple'

data/test/pages/nested/inner/nested-override.txt

@@ -0,0 +1,3 @@
+<%# override the COMMON.rb layout with a nested layout #%>
+<% layout 'nestme' %>
+Some text

data/test/test_cache.rb

@@ -9,6 +9,8 @@ $LOAD_PATH.unshift File.expand_path(File.join(File.dirname(__FILE__),'../lib'))
 require 'rake'
 require 'rote/cache'
 
+Rake.cache_enabled = false
+
 module Rote  
   class TestCache < Test::Unit::TestCase
 
@@ -29,19 +31,26 @@ module Rote
     end
     
     def test_rake_task_stack
+      innerex, outerex = false, false
       assert_equal [], Rake.task_stack             
       
       outertask = task :outertask do        
-        assert_equal ['outertask'], Rake.task_stack         
+        assert_equal ['outertask'], Rake.task_stack.map { |t| t.name }                  
         
-        innertask = task :innertask do          
-          assert_equal ['outertask', 'innertask'], Rake.task_stack         
+        innertask = task :innertask do                    
+          assert_equal ['outertask', 'innertask'], Rake.task_stack.map { |t| t.name }
+          innerex = true
         end
         
-        assert_equal ['outertask'], Rake.task_stack         
+        innertask.invoke        
+        assert_equal ['outertask'], Rake.task_stack.map { |t| t.name }
+        outerex = true
       end    
       
-      assert_equal [], Rake.task_stack             
+      outertask.invoke      
+      assert_equal [], Rake.task_stack.map { |t| t.name }
+      assert innerex
+      assert outerex
     end
     
     def test_rake_register_dep_cached_deps
@@ -51,12 +60,12 @@ module Rote
       # there's no current task
       assert_nil Rake.register_dependency('dep')
       assert_equal({}, Rake.cached_dependencies)
-      
+            
       testtask = task :test_register_dep do
         assert_equal(['dep'], Rake.register_dependency('dep'))
       end
       
-      testtask.invoke(false)
+      testtask.invoke
       
       assert_equal({'test_register_dep' => ['dep']}, Rake.cached_dependencies)
     end

data/test/test_filters.rb

@@ -67,11 +67,11 @@ EOM
 
 SYNEXPECT = <<-EOM
   <p>Non-code</p>
-<pre class='ruby'><code>  <span class=\"keyword\">def </span><span class=\"method\">amethod</span><span class=\"punct\">(</span><span class=\"ident\">arg</span><span class=\"punct\">)</span>
+<pre class='ruby'><code class='ruby'>  <span class=\"keyword\">def </span><span class=\"method\">amethod</span><span class=\"punct\">(</span><span class=\"ident\">arg</span><span class=\"punct\">)</span>
     <span class=\"ident\">puts</span> <span class=\"ident\">arg</span>
   <span class=\"keyword\">end</span></code></pre>
   <p>More non-code</p>
-<pre class='ruby'><code>  <span class=\"keyword\">def </span><span class=\"method\">amethod_too</span><span class=\"punct\">(</span><span class=\"ident\">arg</span><span class=\"punct\">)</span>
+<pre class='ruby'><code class='ruby'>  <span class=\"keyword\">def </span><span class=\"method\">amethod_too</span><span class=\"punct\">(</span><span class=\"ident\">arg</span><span class=\"punct\">)</span>
     <span class=\"ident\">puts</span> <span class=\"ident\">arg</span>
   <span class=\"keyword\">end</span></code></pre>
 EOM

data/test/test_page.rb

@@ -70,21 +70,24 @@ module Rote
       assert_equal 'justtext.txt', p.template_name
     end
     
-    def test_layout_name
+    def test_base_layout_name
       p = new_test_page('justtext')
-      assert_nil p.layout_name
+      assert_nil p.base_layout_name
                     
       p = new_test_page('withcode')
-      assert_equal 'simple.txt', p.layout_name            
+      assert_equal 'simple.txt', p.base_layout_name            
     end
     
     def test_layout_names
-      p = new_test_page('justtext')
-      assert p.layout_names.empty?
-                    
+      # no layout
+      p = new_test_page('justtext')      
+      assert p.layout_names.empty?      
+                 
+      # with page code   
       p = new_test_page('withcode')
       assert_equal ['simple.txt'], p.layout_names            
 
+      # nested
       p = new_test_page('nestedlayout')
       assert_equal ['nestme.txt'], p.layout_names
       
@@ -99,12 +102,20 @@ module Rote
       assert_equal 'test/pages/justtext.txt', p.template_filename
     end
     
-    def test_layout_filename
+    def test_base_layout_filename
       p = new_test_page('justtext')
-      assert_nil p.layout_filename
+      assert_nil p.base_layout_filename
                     
       p = new_test_page('withcode')
-      assert_equal 'test/layouts/simple.txt', p.layout_filename
+      assert_equal 'test/layouts/simple.txt', p.base_layout_filename
+
+      # nested layout is ignored
+      p = new_test_page('nestedlayout')
+      assert_equal 'test/layouts/nestme.txt', p.base_layout_filename
+      
+      # even after rendering
+      p.render
+      assert_equal 'test/layouts/nestme.txt', p.base_layout_filename
     end
     
     def test_ruby_filename
@@ -143,6 +154,41 @@ module Rote
       assert_equal 'layout <%= @content_for_layout %> for a change.', p.layout_text.chomp
     end
     
+    ############## filters ################
+    def test_page_filter
+      p = new_test_page('justtext')      
+      assert p.page_filters.empty?
+      
+      # test with nil
+      p.page_filter(nil)
+      assert p.page_filters.empty?
+      
+      # test with filter
+      p.page_filter("filter")
+      assert_equal ["filter"], p.page_filters
+      
+      # test with block
+      p.page_filter { "filter" }
+      assert_instance_of Rote::Filters::TextFilter, p.page_filters[1]      
+    end
+
+    def test_post_filter
+      p = new_test_page('justtext')      
+      assert p.post_filters.empty?
+      
+      # test with nil
+      p.post_filter(nil)
+      assert p.post_filters.empty?
+      
+      # test with filter
+      p.post_filter("filter")
+      assert_equal ["filter"], p.post_filters
+      
+      # test with block
+      p.post_filter { "filter" }
+      assert_instance_of Rote::Filters::TextFilter, p.post_filters[1]      
+    end
+    
     ############## render #################
     def test_render_text    
       t = new_test_page('justtext').render.chomp
@@ -156,7 +202,16 @@ module Rote
     
     def test_render_layout_code  
       t = new_test_page('nestedlayout').render.chomp
-      assert_equal "layout this: 'some text and some other text' for a change.", t
+      assert_equal "layout with nested: 'some text and some other text' for a change.", t
+
+    end    
+    
+    # Make sure that layout nesting applies only in layout code,
+    # not common or page code. See comments in nested/COMMON.rb(s) and
+    # nested/inner/nested-override.txt
+    def test_layout_overrides_in_common_rb  
+      t = new_test_page('nested/inner/nested-override').render.chomp
+      assert_equal "layout with nested: '\n\nSome text\n' for a change.", t
     end    
     
     ############## broken render #################

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: rote
 version: !ruby/object:Gem::Version 
-  version: 0.3.2
-date: 2006-01-05 00:00:00 +00:00
+  version: 0.3.2.2
+date: 2006-01-12 00:00:00 +00:00
 summary: Adds template-based doc support to Rake.
 require_paths: 
 - lib
@@ -79,12 +79,17 @@ files:
 - test/pages/badlayout.rb
 - test/pages/samedir.rb
 - test/pages/COMMON.rb
+- test/pages/nested
 - test/pages/custext.txt
 - test/pages/withcode.rb
 - test/pages/justtext.txt
 - test/pages/badlayout.txt
 - test/pages/nestedlayout.txt
 - test/pages/withcode.txt
+- test/pages/nested/COMMON.rb
+- test/pages/nested/inner
+- test/pages/nested/inner/COMMON.rb
+- test/pages/nested/inner/nested-override.txt
 - test/layouts/nestme.rb
 - test/layouts/nestme.txt
 - test/layouts/simple.rb