PageTemplate 1.1.2 → 1.2.0

data/CVS/Entries

@@ -0,0 +1,10 @@
+/MANIFEST/1.1.1.1/Wed Mar  9 01:30:10 2005//
+/config.save/1.1.1.1/Wed Mar  9 01:30:10 2005//
+/install.rb/1.1.1.1/Wed Mar  9 01:30:10 2005//
+/test-install.rb/1.1.1.1/Wed Mar  9 01:30:10 2005//
+D/lib////
+D/tdata////
+/Changes/1.1/Fri Mar 11 08:56:02 2005//
+/README.txt/1.2/Fri Mar 11 01:48:29 2005//
+/Rakefile/1.2/Fri Mar 11 09:01:10 2005//
+/TC_PageTemplate.rb/1.12/Fri Mar 11 19:04:51 2005//

data/CVS/Repository

@@ -0,0 +1 @@
+PageTemplate

data/CVS/Root

@@ -0,0 +1 @@
+/home/wisti/CVS

data/Changes

@@ -0,0 +1,13 @@
+1.2
+    - Added: UnlessCommand (including '[%unless foo %]' syntax)
+    - Added: Loop Metavariables __FIRST__, __LAST__, and __ODD__
+    - Added: CommentCommand (including '[%-- blah --%]' syntax)
+    - Added: IncludeCommands allow multiple include paths
+    - Changed: VariableCommands access via 'obj.respond_to?' rather than 'obj.class.has_method?'
+    - Fixed: Unhandled SecurityError when 'include' is called in a mod_ruby environment
+    - Fixed: MANIFEST file being installed to rubylib directory
+    - Fixed: Returns a failure string when include fails, rather than raising an exception.
+1.1
+    - Added: IncludeCommand
+1.0
+    - Moved to Rubyforge

data/Changes~

@@ -0,0 +1,7 @@
+1.2
+    - Added: UnlessCommand
+    - Fixed: 
+1.1
+    - Added: IncludeCommand
+1.0
+    - Moved to Rubyforge

data/InstalledFiles

@@ -0,0 +1,7 @@
+/usr/local/lib/ruby/site_ruby/1.8/
+/usr/local/lib/ruby/site_ruby/1.8/
+/usr/local/lib/ruby/site_ruby/1.8/CVS
+/usr/local/lib/ruby/site_ruby/1.8/CVS
+/usr/local/lib/ruby/site_ruby/1.8/CVS
+/usr/local/lib/ruby/site_ruby/1.8/
+/usr/local/lib/ruby/site_ruby/1.8/

data/README.txt

@@ -19,7 +19,7 @@ http://www.coolnamehere.com/products/pagetemplate/
 == Features
 
 * Variable substitution
-* If and If/Else structures
+* If, Unless, and If/Else structures
 * Loops and Loop/Else structures
 * Customizable Syntax
 * Include content from external files (new in 1.1)

data/Rakefile

@@ -31,7 +31,7 @@ end
 
 spec = Gem::Specification.new do |s|
   s.name = "PageTemplate"
-  s.version = "1.1.2"
+  s.version = "1.2.0"
   s.author = "Brian Wisti"
   s.email  = "brian@coolnamehere.com"
   s.homepage = "http://coolnamehere.com/products/pagetemplate"

data/Rakefile~

@@ -0,0 +1,54 @@
+# -*- ruby -*-
+
+require 'rubygems'
+Gem::manage_gems
+require 'rake/gempackagetask'
+
+task :default => [:all, :test]
+
+task :all do
+  ruby %{-c lib/PageTemplate.rb}
+  ruby %{-c TC_PageTemplate.rb}
+end
+
+task :test do
+  ruby %{-w TC_PageTemplate.rb}
+end
+
+task :install do
+  ruby %{install.rb config}
+  ruby %{install.rb setup}
+  ruby %{install.rb install}
+end
+
+task :doc do
+  sh %{rdoc lib/PageTemplate.rb README.txt}
+end
+
+task :cnh_doc do
+  sh %{cp -R --remove-destination doc /home/wisti/Sites/coolnamehere/extras/doc/PageTemplate}
+end
+
+spec = Gem::Specification.new do |s|
+  s.name = "PageTemplate"
+  s.version = "1.1.2"
+  s.author = "Brian Wisti"
+  s.email  = "brian@coolnamehere.com"
+  s.homepage = "http://coolnamehere.com/products/pagetemplate"
+  s.platform = Gem::Platform::RUBY
+  s.summary  = "A simple templating system for Web sites."
+  s.files = Dir.glob("**/*")
+  s.require_path = "lib"
+  s.autorequire  = "PageTemplate.rb"
+  s.test_file    = "TC_PageTemplate.rb"
+  s.has_rdoc     = true
+  s.extra_rdoc_files = ["README.txt"]
+end
+
+Rake::GemPackageTask.new(spec) do |pkg|
+  pkg.need_tar = true
+end
+
+task :gem do
+  sh %{rake pkg/PageTemplate-#{spec.version}.gem}
+end

data/TC_PageTemplate.rb

@@ -60,6 +60,16 @@ class TC_Command < Test::Unit::TestCase
   
 end
 
+class TC_CommentCommand < Test::Unit::TestCase
+  @@command = CommentCommand.new()
+
+  def testCommentCommand
+    assert_equal(nil, @@command.output,
+                 "CommentCommands don't have any output")
+  end
+
+end
+
 class TC_BlockCommand < Test::Unit::TestCase
   @@command = BlockCommand.new()
   
@@ -125,6 +135,24 @@ class TC_IfCommand < Test::Unit::TestCase
   end
 end
 
+class TC_UnlessCommand < Test::Unit::TestCase
+  def testOutput
+    aCommand = TextCommand.new("Dude!")
+    bCommand = TextCommand.new("Sweet!")
+    commandBlock = BlockCommand.new()
+    commandBlock.add(aCommand)
+    commandBlock.add(bCommand)
+    ns = Namespace.new()
+    ns["testing"] = false
+
+    # First test for output with false condition
+    unlessCommand = UnlessCommand.new("testing", commandBlock)
+    assert_equal("Dude!Sweet!", unlessCommand.output(ns))
+    ns["testing"] = true
+    assert_nil(unlessCommand.output(ns))
+  end
+end
+
 class TC_IfElseCommand < Test::Unit::TestCase
   
   def testOutput
@@ -349,14 +377,17 @@ end
 
 class TC_SyntaxGlossary < Test::Unit::TestCase
   @@syntax = Syntax::Glossary.new( /\[%(.+?)%\]/,
-                                   'value'      => /var (\w+)/,
-                                   'ifopen'     => /if (\w+)/,
-                                   'ifclose'    => /endif/,
-                                   'ifbranch'   => /else/,
-                                   'loopopen'   => /in (\w+)/,
-                                   'loopclose'  => /endin/,
-                                   'loopbranch' => /no/,
-                                   'include'    => /include (\w+)/
+                                   'value'       => /var (\w+)/,
+                                   'ifopen'      => /if (\w+)/,
+                                   'ifclose'     => /endif/,
+                                   'unlessopen'  => /unless (\w+)/,
+                                   'unlessclose' => /endunless/,
+                                   'ifbranch'    => /else/,
+                                   'loopopen'    => /in (\w+)/,
+                                   'loopclose'   => /endin/,
+                                   'loopbranch'  => /no/,
+                                   'include'     => /include (\w+)/,
+                                   'comment'     => /--.+?--/
                                    )
   
   def testGlossary
@@ -380,6 +411,7 @@ class TC_SyntaxGlossary < Test::Unit::TestCase
     assert_equal(["loopclose", nil], @@syntax.lookup("endin"))
     assert_equal(["loopbranch", nil], @@syntax.lookup("no"))
     assert_equal(["include", "foo"], @@syntax.lookup("include foo"))
+    assert_equal(["comment", nil], @@syntax.lookup("-- blarg! --"))
     assert_nil(@@syntax.lookup("foo"))
     assert_nil(@@syntax.lookup("foo bar"))
   end
@@ -430,6 +462,29 @@ class TC_SyntaxParser < Test::Unit::TestCase
     ]
     
     assert_equal(mResult, @@parser.parse(multiline))
+
+    multiline = [
+      "Hello [%var world%\]",
+      "[%unless return%]",
+      "Welcome!",
+      "[%endunless%]"
+    ]
+    
+    mResult = [
+      [1, "Hello "],
+      [1, ["value", "world"]],
+      [1, ""],
+      [2, ""],
+      [2, ["unlessopen", "return"]],
+      [2, ""],
+      [3, "Welcome!"],
+      [4, ""],
+      [4, ["unlessclose", nil]],
+      [4, ""]
+    ]
+    
+    assert_equal(mResult, @@parser.parse(multiline))
+
   end
   
   def testCompile
@@ -440,12 +495,21 @@ class TC_SyntaxParser < Test::Unit::TestCase
       "[%endif%]"
     ]
     assert(@@parser.compile(@@parser.parse(directives)))
+
+    directives = [
+      "Hello [%var world%]",
+      "[%unless return%]",
+      "Welcome!",
+      "[%endunless%]"
+    ]
+    assert(@@parser.compile(@@parser.parse(directives)))
   end
   
   def testBuild
     assert(@@parser.build("tdata/p/b1.txt"))
     # Make sure nothing panics if we ask for the commands again.
     assert(@@parser.build("tdata/p/b1.txt"))
+    assert(@@parser.build("tdata/p/b2.txt"))
   end
 end
 
@@ -513,6 +577,11 @@ class TC_PageTemplate < Test::Unit::TestCase
     cmpFile = File.open("tdata/nm.txt").read()
     assert_equal(cmpFile, @@template.output())
   end
+
+  def testOutputCommentMarkup
+    @@template.load("tdata/cm.txt")
+    assert(@@template.output !~ /\[%--/)
+  end
   
   def testOutputValueMarkup
     
@@ -530,6 +599,14 @@ class TC_PageTemplate < Test::Unit::TestCase
     assert(@@template.output =~ /<h1>title%\]<\/h1>/)
   end
   
+  def testOutputUnlessMarkup
+    @@template['return'] = true
+    @@template.load("tdata/p/b2.txt")
+    assert(@@template.output !~ /Welcome/)
+    @@template['return'] = false
+    assert(@@template.output =~ /Welcome/)
+  end
+
   def testOutputIfMarkup
     @@template['flag'] = true
     @@template.load("tdata/i1.txt")
@@ -621,6 +698,30 @@ class TC_PageTemplate < Test::Unit::TestCase
     assert(@@template.output !~ /<li>.*?<\/li>/)
   end
   
+  def testLoopMetavariables
+    @@template.load("tdata/metadata.1.txt")
+    myLoop = []
+    1.upto(5) { |v| myLoop << {'v' => v} }
+    
+    @@template['loop'] = myLoop
+    assert(@@template.output =~ /<li>--1--<\/li>/,
+           "__FIRST__ is set for the first iteration through a loop")
+    assert(@@template.output =~ /<li>5<\/li>/,
+           "__FIRST__ is unset after the first iteration through a loop")
+
+    @@template.load("tdata/metadata.2.txt")
+    assert(@@template.output =~ /<li>--5--<\/li>/,
+           "__LAST__ is set for the last iteration through a loop")
+    assert(@@template.output =~ /<li>1<\/li>/,
+           "__LAST__ is unset before the last iteration through a loop")
+
+    @@template.load("tdata/metadata.3.txt")
+    assert(@@template.output =~ /<li>--1--<\/li>/,
+           "__ODD__ is set for odd-numbered iterations through a loop (1st, 3rd, etc)")
+    assert(@@template.output =~ /<li>2<\/li>/,
+           "__ODD__ is unset for even-numbered iterations through a loop (2nd, 4th, etc)")
+  end
+  
   def testOutputNestedLoopMarkup
     @@template.load("tdata/l2.txt")
     
@@ -734,9 +835,7 @@ class TC_PageTemplate < Test::Unit::TestCase
            'creator'=> 'Tom Waits'}]}
     ]
     
-    page = PageTemplate.new(
-                            'filename' => "tdata/complex.txt"
-                            )
+    page = PageTemplate.new('filename' => "tdata/complex.txt")
     page.setParameter("title", title)
     page.setParameter("ifTest", 1)
     page.setParameter("languages", languages)
@@ -749,8 +848,7 @@ class TC_PageTemplate < Test::Unit::TestCase
   end
   
   def testCachedTemplate
-    assert(ct = PageTemplate.new(
-                                 'filename' => "tdata/complex.txt",
+    assert(ct = PageTemplate.new('filename' => "tdata/complex.txt",
                                  'use_cache' => true
                                  ))
     
@@ -804,7 +902,6 @@ class TC_Include < Test::Unit::TestCase
   def testIncludeCommand()
     ns = Namespace.new()
 
-
     incCommand = IncludeCommand.new("tdata/include.1.txt")
     text = File.open("tdata/include.1.txt").read()
     assert_equal(text, incCommand.output(ns),
@@ -822,22 +919,43 @@ class TC_Include < Test::Unit::TestCase
     incCommand = IncludeCommand.new("tdata/include.3.txt")
     assert_equal(pt.output(), incCommand.output(ns),
                  "Include Commands can parse standard Template markup")
-
   end
 
   def testIncludePath
-    incCommand = IncludeCommand.new("include.4.txt", "tdata")
+    incCommand = IncludeCommand.new("include.4.txt", [ "tdata" ])
     text = File.open("tdata/include.4.out.txt").read()
     assert_equal(text, incCommand.output,
-                 "IncludeCommand accepts an include path as a second arg")
+                 "IncludeCommand accepts an array of paths as a second arg")
+
+    incCommand = IncludeCommand.new("include.4.txt", [ "/etc", "tdata" ])
+    text = File.open("tdata/include.4.out.txt").read()
+    assert_equal(text, incCommand.output,
+                 "IncludeCommand accepts an array of paths as a second arg")
 
     pt = PageTemplate.new('include_path' => "tdata")
-    pt.load("tdata/include.4.txt")
-    pt["file"] = "include.4b.txt"
+    pt.load("tdata/include.4b.txt")
+    pt["file"] = "include.4a.txt"
     text = File.open("tdata/include.4.out.txt").read()
     assert_equal(text, pt.output,
                  "Include Commands can be given a variable name as an argument")
 
+    pt = PageTemplate.new('include_path' => "tdata")
+    pt.load("tdata/include.4b.txt")
+    pt["file"] = "secret-of-life.txt"
+    text = File.open("tdata/include.4.nf.out.txt").read()
+    assert_equal(text, pt.output,
+                 "Include Commands will output a warning if file isn't found.")
+
+    # Support for multiple include paths.
+    pt = PageTemplate.new()
+    assert_equal([ Dir.getwd() ], pt.path)
+    assert(pt.add_path('tdata'),
+           "Use #add_path(path) to add an include path.")
+    assert_equal([ Dir.getwd(), 'tdata'], pt.path)
+    pt.add_path('tdata/inc-1')
+    assert_equal([ Dir.getwd, "tdata", "tdata/inc-1"], pt.path)
+    pt = PageTemplate.new('include_path' => %w{tdata tdata/inc-1})
+    assert_equal([ Dir.getwd, "tdata", "tdata/inc-1"], pt.path)
   end
 
   def testIncludeSyntax