PageTemplate 1.2.0 → 2.0.0

data/Changes

@@ -1,3 +1,27 @@
+2.0
+    Major changes:
+      Entire code refactored and rewritten.
+      Parser now iterative
+    Commands:
+      Changed: Everything is encapsulated in the PageTemplate class
+      Changed: If, IfElse, Unless, UnlessElse commands merged
+      Changed: Loop, LoopElse merged
+      Changed: else/end logic placed into Commands
+      Fixed: Loop MetaVariables
+      Added: ValueCommand supports 'preprocessors'. var variable :processor
+      Added: 'case' command added: optional in PageTemplate/case.rb
+    Namespace:
+      Fixed: false or nil variables previously caused PT to search up.
+      Added: ability to have 'var.name.name2' variable access.
+    Parser:
+      Changed: Syntax::Glossary became SyntaxGlossary
+      Changed: Syntax::Parser became just Parser
+      Changed: Parser is now primarily a compiler instead of a template object.
+      Changed: else/end logic placed into Commands instead of parser.
+      Changed: Iterative process should be faster
+      Removed: Use of a disk cache when 'use_cache' is true
+      Added:   Ability to compile files without setting PageTemplate's current
+               @commands to the result.
 1.2
     - Added: UnlessCommand (including '[%unless foo %]' syntax)
     - Added: Loop Metavariables __FIRST__, __LAST__, and __ODD__

data/MANIFEST

@@ -1,4 +1,3 @@
 MANIFEST
 README.txt
-TC_PageTemplate.rb
 install.rb

data/README.txt

@@ -13,7 +13,8 @@ As a side note: if you are using PageTemplate in your projects, or
 add features to your copy, I'd love to hear about it.  If you feel like
 it.
 
-Brian Wisti (brian@coolnamehere.com)
+Brian Wisti (brianwisti@rubyforge.org)
+Greg Millam (walker@rubyforge.org)
 http://www.coolnamehere.com/products/pagetemplate/
 
 == Features
@@ -35,13 +36,13 @@ http://www.coolnamehere.com/products/pagetemplate/
 De-Compress archive and enter its top directory.
 Then type:
 
-    $ ruby install.rb config
-    $ ruby install.rb setup
    ($ su)
-    # ruby install.rb install
+    # ruby setup.rb 
 
 You can also install files into your favorite directory
-by supplying install.rb some options. Try "ruby install.rb --help".
+by supplying setup.rb some options. Try "ruby setup.rb --help".
+Since we don't really know how setup.rb works, we've included
+the English-language version of the setup usage file. Enjoy.
 
 === Install With Rake
 
@@ -55,7 +56,7 @@ Download the gem file from the
 
 Then, use the gem command to install it:
 
-    $ sudo gem install -l PageTemplate-1.1.1.gem
+    $ sudo gem install -l PageTemplate-2.0.0.gem
 
 I think that's all there is to it. I'm new to gems, though, so let me
 know if I missed something.
@@ -72,7 +73,7 @@ http://coolnamehere.com/products/pagetemplate/
 
 The MIT License
 
-Copyright (c) 2002-2005 Brian Wisti
+Copyright (c) 2002-2005 Brian Wisti, Greg Millam
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
@@ -82,4 +83,5 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 
 
-Brian Wisti (brian@coolnamehere.com)
+Brian Wisti (brianwisti@rubyforge.org)
+Greg Millam (walker@rubyforge.org)

data/Rakefile

@@ -8,21 +8,39 @@ 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}
+  ruby %{-w -Ilib test.rb}
+end
+
+task :oldTests do
+  ruby %{-w -Ilib TC_PageTemplate.rb}
+end
+
+task :missingTests do
+  filename = "../missing-tests.rb"
+  sh %{cd lib && ZenTest PageTemplate.rb PageTemplate/*.rb ../test.rb > #{filename}}
+  puts "Missing tests are in #{filename}"
+end
+
+task :newTests do
+  filename = "test.rb"
+  if File.exists?(filename)
+    puts "File exists"
+  else
+    puts "File does not exist."
+    sh %{cd lib && ZenTest PageTemplate.rb PageTemplate/*.rb > ../#{filename}}
+  end
+  puts "Tests are in #{filename}"
 end
 
 task :install do
-  ruby %{install.rb config}
-  ruby %{install.rb setup}
-  ruby %{install.rb install}
+  ruby %{setup.rb}
 end
 
 task :doc do
-  sh %{rdoc lib/PageTemplate.rb README.txt}
+  sh %{rdoc lib/PageTemplate.rb README.txt lib/PageTemplate/*.rb}
 end
 
 task :cnh_doc do
@@ -31,16 +49,16 @@ end
 
 spec = Gem::Specification.new do |s|
   s.name = "PageTemplate"
-  s.version = "1.2.0"
+  s.version = "2.0.0"
   s.author = "Brian Wisti"
-  s.email  = "brian@coolnamehere.com"
+  s.email  = "brianwisti@rubyforge.org"
   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.test_file    = "test.rb"
   s.has_rdoc     = true
   s.extra_rdoc_files = ["README.txt"]
 end
@@ -50,5 +68,8 @@ Rake::GemPackageTask.new(spec) do |pkg|
 end
 
 task :gem do
+  if File.exists?("CVS")
+    raise RuntimeError, "Trying to make a gem in CVS directory!"
+  end
   sh %{rake pkg/PageTemplate-#{spec.version}.gem}
 end

data/lib/PageTemplate/case.rb

@@ -0,0 +1,72 @@
+# case.rb
+#
+# This is a demonstration of adding a non-default command to
+# PageTemplate's default glossary.
+#
+# Note that it adds itself to the glossary =).
+
+class PageTemplate
+  # CaseCommand provides switch-command functionality.
+  # [% case variable %]
+  # [% when literal1 %]
+  # [% when literal2 %]
+  # [% when literal3 %]
+  # [% else %]
+  # [% end %]
+  class CaseCommand < StackableCommand
+    attr_reader :current_case
+
+    # +command+ is a variable that is evaluated against the namespace
+    # on execution, and then tested against the literals of when. It
+    # must return a string literal.
+    def initialize(command)
+      /^case ((\w+)(\.\w+)*)$/i =~ command
+      @called_as = 'case'
+      @value = $1
+      @blocks = {}
+      @current_case = nil
+      @default = BlockCommand.new
+    end
+    # Adds a command to the current case, or to the 'else'
+    def add(command)
+      unless @current_case
+        @default.add command
+      else
+        @blocks[@current_case].add command
+      end
+    end
+    # 'when' and 'else' modify this command.
+    def modifies?(cmd)
+      case cmd
+      when /^when (.+)$/
+        @current_case = $1
+        @blocks[$1] = BlockCommand.new unless @blocks.has_key?($1)
+        true
+      when /^else$/
+        @current_case = nil
+        true
+      else
+        false
+      end
+    end
+    # If namespace.get(@value) exists in the 'when' clauses, then
+    # print out that block.
+    def output(namespace=nil)
+      val = namespace.get(@value)
+      if @blocks.has_key?(val)
+        @blocks[val].output(namespace)
+      else
+        @default.output(namespace)
+      end
+    end
+    def to_s
+      str = "[ Case: "
+      @blocks.each do |key,val|
+        str << " #{key}: [#{val}]"
+      end
+      str << " else #{@default.to_s}"
+      str << " ]"
+    end
+  end
+  DEFAULTGLOSSARY.define(/^case (\w+)(\.\w+)*$/,CaseCommand)
+end