PageTemplate 2.2.0 → 2.2.3

data/Changes

@@ -1,4 +1,9 @@
-Latest:
+2.2.3:
+    Bugfixes
+        - NameSpace#set accepted symbols, but Namespace#get would lose them.
+          Now symbol keys are fetched based on symbol.to_s
+        - Undefined iterators were triggering warnings with the -w flag
+2.2.0:
     Bugfixes:
         FileSource#get_filename couldn't consistently work with
         relative or absolute filenames on Windows.

data/README.txt

@@ -56,7 +56,7 @@ Download the gem file from the
 
 Then, use the gem command to install it:
 
-    $ sudo gem install -l PageTemplate-2.0.0.gem
+    $ sudo gem install -l PageTemplate-2.2.3.gem
 
 I think that's all there is to it. I'm new to gems, though, so let me
 know if I missed something.
@@ -73,7 +73,7 @@ http://coolnamehere.com/products/pagetemplate/
 
 The MIT License
 
-Copyright (c) 2002-2005 Brian Wisti, Greg Millam
+Copyright (c) 2002-2006 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:
 

data/Rakefile

@@ -80,3 +80,8 @@ task :gem do
   end
   sh %{rake pkg/PageTemplate-#{spec.version}.gem}
 end
+
+task :export do
+  dirname = "PageTemplate-#{PageTemplate::VERSION}"
+  sh %{cvs export -D now -d #{dirname} PageTemplate}
+end

data/lib/PageTemplate.rb

@@ -29,7 +29,7 @@ require 'PageTemplate/commands'
 # It is a class so that programmers are not confused by being able to
 # do .new on a module
 class PageTemplate
-  VERSION = "2.2.0"
+  VERSION = "2.2.3"
 
   # Passes arguments straight to Parser.new
   #

data/lib/PageTemplate/commands.rb

@@ -402,7 +402,12 @@ class PageTemplate
     def initialize(called_as, value, iterators)
       @called_as = called_as
       @value     = value
-      @iterators = iterators.strip.gsub(/\s+/,' ').split if iterators
+      if iterators
+        @iterators = iterators.strip.gsub(/\s+/, ' ').split
+      else
+        @iterators = nil
+      end
+
       @switched  = false
       @commands  = BlockCommand.new
       @elseCommands = BlockCommand.new

data/lib/PageTemplate/parser.rb

@@ -65,9 +65,14 @@ class PageTemplate
       value = case
       when @values.has_key?(key)
         @values[key]
+      when @values.has_key?(key.to_sym)
+        @values[key.to_sym]
       when !@object
-        return @parent.get(val) if @parent
-        return nil
+        if @parent
+          @parent.get(val)
+        else
+          nil
+        end
       when @object.respond_to?(:has_key?)
         if @object.has_key?(key)
           @values[key] = @object[key]
@@ -214,7 +219,7 @@ class PageTemplate
   # It attempts to be secure by not allowing any access outside of
   # The directories detailed within include_paths
   class FileSource < Source
-    attr_reader :paths
+    attr_accessor :paths
 
     # initialize looks for the following in the args Hash:
     #  * include_paths = a list of file paths
@@ -269,7 +274,9 @@ class PageTemplate
       @paths.each do |path|
         fn = File.join(path,file)
         fn.untaint
-        return fn if File.exists?(fn)
+        if File.exists?(fn)
+          return fn
+        end
       end
       return nil
     end

data/test.rb

@@ -188,6 +188,7 @@ module TestPageTemplate
     def test_get
       assert_equal(@@text, @@fs.get(@@filename),
         "Dir.getwd is a path by default")
+      puts "Looking for #{@@location}"
       assert_equal(@@text, @@fs.get(@@location),
         "Full path is allowed by default")
     end
@@ -345,6 +346,10 @@ module TestPageTemplate
       pt["name"] = "Phil"
       assert(pt.output =~ /Hello, Phil!/,
              "Included files are parsed as templates.")
+      pt.source.paths = [ Dir.getwd ]
+      pt.load("tdata/include.txt")
+      assert(pt.output =~ /variable.txt/,
+             "Filename for includes may include directories")
     end
 
     def test_include_literal
@@ -501,6 +506,9 @@ module TestPageTemplate
       @@ns.set('fruits',{'a'=>'apple','b'=>'banana'})
       assert_equal('banana',@@ns.get('fruits.b'),
         "If an object has_key?(b), it checks get object['b'] rather than send(:b)")
+      @@ns.set(:title, "xyz")
+      assert_equal("xyz", @@ns.get("title"),
+                   "Symbols may be used as Namespace keys")
     end
 
     def test_index

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: PageTemplate
 version: !ruby/object:Gem::Version 
-  version: 2.2.0
-date: 2006-03-02 00:00:00 -08:00
+  version: 2.2.3
+date: 2006-06-20 00:00:00 -07:00
 summary: A simple templating system for Web sites.
 require_paths: 
 - lib
@@ -29,9 +29,9 @@ authors:
 - Brian Wisti
 files: 
 - Changes
-- doc
 - lib
 - MANIFEST
+- pkg
 - Rakefile
 - README.txt
 - setup-usage.txt
@@ -40,165 +40,13 @@ files:
 - tdata
 - test-install.rb
 - test.rb
-- doc/classes
-- doc/created.rid
-- doc/files
-- doc/fr_class_index.html
-- doc/fr_file_index.html
-- doc/fr_method_index.html
-- doc/index.html
-- doc/rdoc-style.css
-- doc/classes/PageTemplate
-- doc/classes/PageTemplate.html
-- doc/classes/PageTemplate.src
-- doc/classes/PageTemplate/BlockCommand.html
-- doc/classes/PageTemplate/BlockCommand.src
-- doc/classes/PageTemplate/CaseCommand.html
-- doc/classes/PageTemplate/CaseCommand.src
-- doc/classes/PageTemplate/Command.html
-- doc/classes/PageTemplate/Command.src
-- doc/classes/PageTemplate/CommentCommand.html
-- doc/classes/PageTemplate/CommentCommand.src
-- doc/classes/PageTemplate/DefaultGlossary.html
-- doc/classes/PageTemplate/DefaultPreprocessor.html
-- doc/classes/PageTemplate/DefaultPreprocessor.src
-- doc/classes/PageTemplate/DefineCommand.html
-- doc/classes/PageTemplate/DefineCommand.src
-- doc/classes/PageTemplate/FileSource.html
-- doc/classes/PageTemplate/FileSource.src
-- doc/classes/PageTemplate/FilterCommand.html
-- doc/classes/PageTemplate/FilterCommand.src
-- doc/classes/PageTemplate/HTGlossary.html
-- doc/classes/PageTemplate/IfCommand.html
-- doc/classes/PageTemplate/IfCommand.src
-- doc/classes/PageTemplate/IncludeCommand.html
-- doc/classes/PageTemplate/IncludeCommand.src
-- doc/classes/PageTemplate/LoopCommand.html
-- doc/classes/PageTemplate/LoopCommand.src
-- doc/classes/PageTemplate/Namespace.html
-- doc/classes/PageTemplate/Namespace.src
-- doc/classes/PageTemplate/NamespaceItem.html
-- doc/classes/PageTemplate/NamespaceItem.src
-- doc/classes/PageTemplate/Parser.html
-- doc/classes/PageTemplate/Parser.src
-- doc/classes/PageTemplate/Preprocessor.html
-- doc/classes/PageTemplate/Source.html
-- doc/classes/PageTemplate/Source.src
-- doc/classes/PageTemplate/StackableCommand.html
-- doc/classes/PageTemplate/StackableCommand.src
-- doc/classes/PageTemplate/StringSource.html
-- doc/classes/PageTemplate/StringSource.src
-- doc/classes/PageTemplate/SyntaxGlossary.html
-- doc/classes/PageTemplate/SyntaxGlossary.src
-- doc/classes/PageTemplate/Template.html
-- doc/classes/PageTemplate/Template.src
-- doc/classes/PageTemplate/TextCommand.html
-- doc/classes/PageTemplate/TextCommand.src
-- doc/classes/PageTemplate/UnknownCommand.html
-- doc/classes/PageTemplate/UnknownCommand.src
-- doc/classes/PageTemplate/ValueCommand.html
-- doc/classes/PageTemplate/ValueCommand.src
-- doc/classes/PageTemplate/BlockCommand.src/M000020.html
-- doc/classes/PageTemplate/BlockCommand.src/M000021.html
-- doc/classes/PageTemplate/BlockCommand.src/M000022.html
-- doc/classes/PageTemplate/BlockCommand.src/M000023.html
-- doc/classes/PageTemplate/BlockCommand.src/M000024.html
-- doc/classes/PageTemplate/CaseCommand.src/M000085.html
-- doc/classes/PageTemplate/CaseCommand.src/M000086.html
-- doc/classes/PageTemplate/CaseCommand.src/M000087.html
-- doc/classes/PageTemplate/CaseCommand.src/M000088.html
-- doc/classes/PageTemplate/CaseCommand.src/M000089.html
-- doc/classes/PageTemplate/CaseCommand.src/M000090.html
-- doc/classes/PageTemplate/Command.src/M000045.html
-- doc/classes/PageTemplate/Command.src/M000046.html
-- doc/classes/PageTemplate/CommentCommand.src/M000028.html
-- doc/classes/PageTemplate/CommentCommand.src/M000029.html
-- doc/classes/PageTemplate/CommentCommand.src/M000030.html
-- doc/classes/PageTemplate/DefaultPreprocessor.src/M000074.html
-- doc/classes/PageTemplate/DefaultPreprocessor.src/M000075.html
-- doc/classes/PageTemplate/DefaultPreprocessor.src/M000076.html
-- doc/classes/PageTemplate/DefaultPreprocessor.src/M000077.html
-- doc/classes/PageTemplate/DefaultPreprocessor.src/M000078.html
-- doc/classes/PageTemplate/DefineCommand.src/M000079.html
-- doc/classes/PageTemplate/DefineCommand.src/M000080.html
-- doc/classes/PageTemplate/FileSource.src/M000016.html
-- doc/classes/PageTemplate/FileSource.src/M000017.html
-- doc/classes/PageTemplate/FileSource.src/M000018.html
-- doc/classes/PageTemplate/FileSource.src/M000019.html
-- doc/classes/PageTemplate/FilterCommand.src/M000065.html
-- doc/classes/PageTemplate/FilterCommand.src/M000066.html
-- doc/classes/PageTemplate/FilterCommand.src/M000067.html
-- doc/classes/PageTemplate/IfCommand.src/M000059.html
-- doc/classes/PageTemplate/IfCommand.src/M000060.html
-- doc/classes/PageTemplate/IfCommand.src/M000061.html
-- doc/classes/PageTemplate/IfCommand.src/M000062.html
-- doc/classes/PageTemplate/IfCommand.src/M000063.html
-- doc/classes/PageTemplate/IfCommand.src/M000064.html
-- doc/classes/PageTemplate/IncludeCommand.src/M000039.html
-- doc/classes/PageTemplate/IncludeCommand.src/M000040.html
-- doc/classes/PageTemplate/IncludeCommand.src/M000041.html
-- doc/classes/PageTemplate/LoopCommand.src/M000011.html
-- doc/classes/PageTemplate/LoopCommand.src/M000012.html
-- doc/classes/PageTemplate/LoopCommand.src/M000013.html
-- doc/classes/PageTemplate/LoopCommand.src/M000014.html
-- doc/classes/PageTemplate/LoopCommand.src/M000015.html
-- doc/classes/PageTemplate/Namespace.src/M000057.html
-- doc/classes/PageTemplate/Namespace.src/M000058.html
-- doc/classes/PageTemplate/NamespaceItem.src/M000002.html
-- doc/classes/PageTemplate/NamespaceItem.src/M000004.html
-- doc/classes/PageTemplate/NamespaceItem.src/M000006.html
-- doc/classes/PageTemplate/NamespaceItem.src/M000008.html
-- doc/classes/PageTemplate/NamespaceItem.src/M000009.html
-- doc/classes/PageTemplate/NamespaceItem.src/M000010.html
-- doc/classes/PageTemplate/Parser.src/M000031.html
-- doc/classes/PageTemplate/Parser.src/M000032.html
-- doc/classes/PageTemplate/Parser.src/M000033.html
-- doc/classes/PageTemplate/Parser.src/M000034.html
-- doc/classes/PageTemplate/Parser.src/M000035.html
-- doc/classes/PageTemplate/Parser.src/M000036.html
-- doc/classes/PageTemplate/Parser.src/M000037.html
-- doc/classes/PageTemplate/Parser.src/M000038.html
-- doc/classes/PageTemplate/Source.src/M000055.html
-- doc/classes/PageTemplate/Source.src/M000056.html
-- doc/classes/PageTemplate/StackableCommand.src/M000081.html
-- doc/classes/PageTemplate/StackableCommand.src/M000082.html
-- doc/classes/PageTemplate/StackableCommand.src/M000083.html
-- doc/classes/PageTemplate/StackableCommand.src/M000084.html
-- doc/classes/PageTemplate/StringSource.src/M000053.html
-- doc/classes/PageTemplate/StringSource.src/M000054.html
-- doc/classes/PageTemplate/SyntaxGlossary.src/M000047.html
-- doc/classes/PageTemplate/SyntaxGlossary.src/M000048.html
-- doc/classes/PageTemplate/SyntaxGlossary.src/M000049.html
-- doc/classes/PageTemplate/SyntaxGlossary.src/M000050.html
-- doc/classes/PageTemplate/SyntaxGlossary.src/M000051.html
-- doc/classes/PageTemplate/SyntaxGlossary.src/M000052.html
-- doc/classes/PageTemplate/Template.src/M000071.html
-- doc/classes/PageTemplate/Template.src/M000072.html
-- doc/classes/PageTemplate/Template.src/M000073.html
-- doc/classes/PageTemplate/TextCommand.src/M000068.html
-- doc/classes/PageTemplate/TextCommand.src/M000069.html
-- doc/classes/PageTemplate/TextCommand.src/M000070.html
-- doc/classes/PageTemplate/UnknownCommand.src/M000025.html
-- doc/classes/PageTemplate/UnknownCommand.src/M000026.html
-- doc/classes/PageTemplate/UnknownCommand.src/M000027.html
-- doc/classes/PageTemplate/ValueCommand.src/M000042.html
-- doc/classes/PageTemplate/ValueCommand.src/M000043.html
-- doc/classes/PageTemplate/ValueCommand.src/M000044.html
-- doc/classes/PageTemplate.src/M000001.html
-- doc/files/lib
-- doc/files/README_txt.html
-- doc/files/lib/PageTemplate
-- doc/files/lib/PageTemplate_rb.html
-- doc/files/lib/PageTemplate/case_rb.html
-- doc/files/lib/PageTemplate/commands_rb.html
-- doc/files/lib/PageTemplate/htglossary_rb.html
-- doc/files/lib/PageTemplate/parser_rb.html
 - lib/PageTemplate
 - lib/PageTemplate.rb
 - lib/PageTemplate/case.rb
 - lib/PageTemplate/commands.rb
 - lib/PageTemplate/htglossary.rb
 - lib/PageTemplate/parser.rb
+- pkg/PageTemplate-2.2.3.gem
 - site/base.css
 - site/footer.txt
 - site/header.txt

data/doc/classes/PageTemplate.html

@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE html 
-     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <title>Class: PageTemplate</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-  <meta http-equiv="Content-Script-Type" content="text/javascript" />
-  <link rel="stylesheet" href=".././rdoc-style.css" type="text/css" media="screen" />
-  <script type="text/javascript">
-  // <![CDATA[
-
-  function popupCode( url ) {
-    window.open(url, "Code", "resizable=yes,scrollbars=yes,toolbar=no,status=no,height=150,width=400")
-  }
-
-  function toggleCode( id ) {
-    if ( document.getElementById )
-      elem = document.getElementById( id );
-    else if ( document.all )
-      elem = eval( "document.all." + id );
-    else
-      return false;
-
-    elemStyle = elem.style;
-    
-    if ( elemStyle.display != "block" ) {
-      elemStyle.display = "block"
-    } else {
-      elemStyle.display = "none"
-    }
-
-    return true;
-  }
-  
-  // Make codeblocks hidden by default
-  document.writeln( "<style type=\"text/css\">div.method-source-code { display: none }</style>" )
-  
-  // ]]>
-  </script>
-
-</head>
-<body>
-
-
-
-    <div id="classHeader">
-        <table class="header-table">
-        <tr class="top-aligned-row">
-          <td><strong>Class</strong></td>
-          <td class="class-name-in-header">PageTemplate</td>
-        </tr>
-        <tr class="top-aligned-row">
-            <td><strong>In:</strong></td>
-            <td>
-                <a href="../files/lib/PageTemplate_rb.html">
-                lib/PageTemplate.rb
-                </a>
-        <br />
-                <a href="../files/lib/PageTemplate/case_rb.html">
-                lib/PageTemplate/case.rb
-                </a>
-        <br />
-                <a href="../files/lib/PageTemplate/commands_rb.html">
-                lib/PageTemplate/commands.rb
-                </a>
-        <br />
-                <a href="../files/lib/PageTemplate/htglossary_rb.html">
-                lib/PageTemplate/htglossary.rb
-                </a>
-        <br />
-                <a href="../files/lib/PageTemplate/parser_rb.html">
-                lib/PageTemplate/parser.rb
-                </a>
-        <br />
-            </td>
-        </tr>
-
-        <tr class="top-aligned-row">
-            <td><strong>Parent:</strong></td>
-            <td>
-                Object
-            </td>
-        </tr>
-        </table>
-    </div>
-  <!-- banner header -->
-
-  <div id="bodyContent">
-
-
-
-  <div id="contextContent">
-
-
-
-   </div>
-
-    <div id="method-list">
-      <h3 class="section-bar">Methods</h3>
-
-      <div class="name-list">
-      <a href="#M000001">new</a>&nbsp;&nbsp;
-      </div>
-    </div>
-
-  </div>
-
-
-    <!-- if includes -->
-
-    <div id="section">
-
-    <div id="class-list">
-      <h3 class="section-bar">Classes and Modules</h3>
-
-      Module <a href="PageTemplate/NamespaceItem.html" class="link">PageTemplate::NamespaceItem</a><br />
-Class <a href="PageTemplate/BlockCommand.html" class="link">PageTemplate::BlockCommand</a><br />
-Class <a href="PageTemplate/CaseCommand.html" class="link">PageTemplate::CaseCommand</a><br />
-Class <a href="PageTemplate/Command.html" class="link">PageTemplate::Command</a><br />
-Class <a href="PageTemplate/CommentCommand.html" class="link">PageTemplate::CommentCommand</a><br />
-Class <a href="PageTemplate/DefaultGlossary.html" class="link">PageTemplate::DefaultGlossary</a><br />
-Class <a href="PageTemplate/DefaultPreprocessor.html" class="link">PageTemplate::DefaultPreprocessor</a><br />
-Class <a href="PageTemplate/DefineCommand.html" class="link">PageTemplate::DefineCommand</a><br />
-Class <a href="PageTemplate/FileSource.html" class="link">PageTemplate::FileSource</a><br />
-Class <a href="PageTemplate/FilterCommand.html" class="link">PageTemplate::FilterCommand</a><br />
-Class <a href="PageTemplate/HTGlossary.html" class="link">PageTemplate::HTGlossary</a><br />
-Class <a href="PageTemplate/IfCommand.html" class="link">PageTemplate::IfCommand</a><br />
-Class <a href="PageTemplate/IncludeCommand.html" class="link">PageTemplate::IncludeCommand</a><br />
-Class <a href="PageTemplate/LoopCommand.html" class="link">PageTemplate::LoopCommand</a><br />
-Class <a href="PageTemplate/Namespace.html" class="link">PageTemplate::Namespace</a><br />
-Class <a href="PageTemplate/Parser.html" class="link">PageTemplate::Parser</a><br />
-Class <a href="PageTemplate/Preprocessor.html" class="link">PageTemplate::Preprocessor</a><br />
-Class <a href="PageTemplate/Source.html" class="link">PageTemplate::Source</a><br />
-Class <a href="PageTemplate/StackableCommand.html" class="link">PageTemplate::StackableCommand</a><br />
-Class <a href="PageTemplate/StringSource.html" class="link">PageTemplate::StringSource</a><br />
-Class <a href="PageTemplate/SyntaxGlossary.html" class="link">PageTemplate::SyntaxGlossary</a><br />
-Class <a href="PageTemplate/Template.html" class="link">PageTemplate::Template</a><br />
-Class <a href="PageTemplate/TextCommand.html" class="link">PageTemplate::TextCommand</a><br />
-Class <a href="PageTemplate/UnknownCommand.html" class="link">PageTemplate::UnknownCommand</a><br />
-Class <a href="PageTemplate/ValueCommand.html" class="link">PageTemplate::ValueCommand</a><br />
-
-    </div>
-
-    <div id="constants-list">
-      <h3 class="section-bar">Constants</h3>
-
-      <div class="name-list">
-        <table summary="Constants">
-        <tr class="top-aligned-row context-row">
-          <td class="context-item-name">VERSION</td>
-          <td>=</td>
-          <td class="context-item-value">&quot;2.2.0&quot;</td>
-        </tr>
-        </table>
-      </div>
-    </div>
-
-
-
-      
-
-
-    <!-- if method_list -->
-    <div id="methods">
-      <h3 class="section-bar">Public Class methods</h3>
-
-      <div id="method-M000001" class="method-detail">
-        <a name="M000001"></a>
-
-        <div class="method-heading">
-          <a href="PageTemplate.src/M000001.html" target="Code" class="method-signature"
-            onclick="popupCode('PageTemplate.src/M000001.html');return false;">
-          <span class="method-name">new</span><span class="method-args">(*args)</span>
-          </a>
-        </div>
-      
-        <div class="method-description">
-          <p>
-Passes arguments straight to <a
-href="PageTemplate/Parser.html#M000032">Parser.new</a>
-</p>
-<p>
-returns: a <a href="PageTemplate/Parser.html">Parser</a> object.
-</p>
-        </div>
-      </div>
-
-
-    </div>
-
-
-  </div>
-
-
-<div id="validator-badges">
-  <p><small><a href="http://validator.w3.org/check/referer">[Validate]</a></small></p>
-</div>
-
-</body>
-</html>