PageTemplate 2.1.5 → 2.1.6

data/Changes

@@ -1,14 +1,17 @@
-CVS:
+2.1.3:
     Bugfixes:
       HTGlossary didn't survive the change from 2.0 to 2.1. I've
           added unit tests and fixed the HTGlossary bugs. Whoops.
       setup.rb attempted to chmod every directory in its path on install.
           Report and fix by: Lars Olsson
     Changes:
+      __INDEX__ added to LoopCommand objects. It's 0-based, but if a
+          designer wants 1-based, then can do:
+          [% var __INDEX__.succ %]
       If a glossary directive has multiple captures, PT will use
           the first non-nil one.
-      Namespaces now use parser.method_separator. Defined on creation
-          by PageTemplate.new('method_separator' => <regex>).
+      Namespaces now use parser.method_separators. Defined on creation
+          by PageTemplate.new('method_separators' => './').
           Inspired by Jeremy Apthorp and YAML paths.
 
 2.1.2:

data/Rakefile

@@ -54,7 +54,7 @@ end
 
 spec = Gem::Specification.new do |s|
   s.name = "PageTemplate"
-  s.version = "2.1.5"
+  s.version = "2.1.6"
   s.author = "Brian Wisti"
   s.email  = "brianwisti@rubyforge.org"
   s.homepage = "http://coolnamehere.com/products/pagetemplate"

data/lib/PageTemplate/parser.rb

@@ -69,11 +69,18 @@ class PageTemplate
         return @parent.get(val) if @parent
         return nil
       when @object.respond_to?(:has_key?)
-        @values[key] = @object[key]
+        if @object.has_key?(key)
+          @values[key] = @object[key]
+        else
+          return @parent.get(val) if @parent
+          nil
+        end
       when @object.respond_to?(sym = key.to_sym)
         @values[key] = @object.send(sym)
       when key == '__ITEM__'
         @object
+      when @parent
+        return @parent.get(val)
       else
         nil
       end
@@ -348,7 +355,7 @@ class PageTemplate
       when /^(?:elsif|elseif|else if) (.+)$/i
         cmd.elsif($1)
         true
-      when /^else|no|empty$/i
+      when /^(else|no|empty)$/i
         cmd.else
         true
       else

data/test.rb

@@ -409,6 +409,17 @@ module TestPageTemplate
       @@ns = PageTemplate::Namespace.new
     end
 
+    def test_nested_namespaces
+      @@ns.object = {'meat'=>'Caribou Eyes'}
+      p = PageTemplate::Namespace.new
+      @@ns.parent = p
+      p['soda'] = 'Ebola Cola' # Transmetropolitan! Read it!
+      assert_equal(@@ns.get('meat'),'Caribou Eyes',
+          'Namespace#get(meat) did not return correct value!')
+      assert_equal(@@ns.get('soda'),'Ebola Cola',
+          'Namespace#get(meat) did not return parent\'s correct value!')
+    end
+
     def test_clear_cache
       assert(@@ns.clear_cache,
         "Use Namespace#clear_cache to reset a Namespace's values.")

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: PageTemplate
 version: !ruby/object:Gem::Version 
-  version: 2.1.5
+  version: 2.1.6
 date: 2006-01-04 00:00:00 -08:00
 summary: A simple templating system for Web sites.
 require_paths: 
@@ -36,7 +36,6 @@ files:
   - README.txt
   - setup-usage.txt
   - setup.rb
-  - site
   - tdata
   - test-install.rb
   - test.rb
@@ -46,32 +45,6 @@ files:
   - lib/PageTemplate/commands.rb
   - lib/PageTemplate/htglossary.rb
   - lib/PageTemplate/parser.rb
-  - site/base.css
-  - site/footer.txt
-  - site/header.txt
-  - site/html
-  - site/Makefile
-  - site/MySubpageRenderer.rb
-  - site/PageNavRenderer.rb
-  - site/RedClothRenderer.rb
-  - site/Site.rb
-  - site/SiteNewsRenderer.rb
-  - site/src
-  - site/XhtmlTemplateRenderer.rb
-  - site/html/base.css
-  - site/html/designer.html
-  - site/html/index.html
-  - site/html/install.html
-  - site/html/programmer.html
-  - site/html/SiteMap.html
-  - site/html/version2.html
-  - site/src/designer
-  - site/src/index
-  - site/src/install
-  - site/src/metadata.txt
-  - site/src/programmer
-  - site/src/SiteMap
-  - site/src/version2
   - tdata/dummy.txt
 test_files: 
   - test.rb

data/site/Makefile

@@ -1,15 +0,0 @@
-all: site css
-css:
-	cp base.css html/
-site:
-	ruby Site.rb
-images: site
-	mkdir html/images
-	cp extras/images/* html/images/
-doc:
-	cp -R extras/doc/PageTemplate html/doc
-clean:
-	rm -rf html
-
-test-install:
-	sudo cp -Rf html/* /var/www/html

data/site/MySubpageRenderer.rb

@@ -1,43 +0,0 @@
-require 'ZenWeb/GenericRenderer'
-
-=begin
-
-= Class SubpageRenderer
-
-Generates a list of known subpages in a format compatible with
-TextToHtmlRenderer.
-
-=== Methods
-
-=end
-
-class MySubpageRenderer < GenericRenderer
-
-=begin
-
-     --- SubpageRenderer#render(content)
-
-     Renders a list of known subpages in a format compatible with
-     TextToHtmlRenderer. Adds the list to the end of the content.
-
-=end
-
-  def render(content)
-    subpages = @document.subpages.clone
-    if (subpages.length > 0) then
-      push("\n\n")
-      push("<h2>Subpages:</h2>\n\n")
-      subpages.each_index { | index |
-	url      = subpages[index]
-	doc      = @website[url]
-	title    = doc.fulltitle
-
-	push("* <A HREF=\"#{url}\">#{title}</A>\n")
-      }
-      push("\n")
-    end
-
-    return content + self.result
-  end
-end
-

data/site/PageNavRenderer.rb

@@ -1,37 +0,0 @@
-require 'ZenWeb/GenericRenderer'
-
-class PageNavRenderer < GenericRenderer
-  def render(content)
-    # I know there's a quicker way to do this, but I'm in a hurry.
-    this_url = @document.url
-    doc_order = @sitemap.doc_order
-    this_index = doc_order.index(this_url)
-    forward = backward = " "
-
-    last_url = doc_order[this_index - 1]
-    last_page = @sitemap.documents[last_url]
-    if last_page and File.dirname(last_url) == File.dirname(this_url)
-      title = last_page.title
-      url = File.basename(last_url)
-      backward = "<p>&lt;- <a href='#{url}'>#{title}</a></p>\n"
-    end
-
-    next_url = doc_order[this_index + 1]
-    next_page = @sitemap.documents[next_url]
-    if next_page and File.dirname(next_url) == File.dirname(this_url)
-      title = next_page.title
-      url = File.basename(next_url)
-      forward = "<p><a href='#{url}'>#{title}</a>- &gt;</p>\n"
-    end
-
-    push("<table width='100%' border='0'><tr>\n")
-    push("<td>#{backward}</td>\n")
-    push("<td align='right'>#{forward}</td>\n")
-    push("</tr></table>\n")
-
-    push(content)
-
-    return self.result
-  end
-end
-

data/site/RedClothRenderer.rb

@@ -1,20 +0,0 @@
-require 'ZenWeb/GenericRenderer'
-
-# Hands content off to the RedCloth text formatter for rendering.
-#
-# + Set Attributes in the 'RedClothAttributes' metadata.
-#     + filter_html   -- HTML not created by RedCloth is escaped
-#     + filter_styles -- style markup specifier is disabled
-# + See http://www.whytheluckystiff.net/ruby/redcloth/
-class RedClothRenderer < GenericRenderer
-  require 'redcloth'
-  
-  def render(content)
-    attributes = []
-    if @document.metadata.has_key?('RedClothAttributes')
-      attributes = @document['RedClothAttributes']
-    end
-    rc = RedCloth::new(content, attributes)
-    return rc.to_html(:textile)
-  end
-end

data/site/Site.rb

@@ -1,11 +0,0 @@
-#!/usr/local/bin/ruby
-
-require 'ZenWeb'
-
-data_dir = "src"
-html_dir = "html"
-sitemap  = "/SiteMap.html"
-url      = "/"
-
-website = ZenWebsite.new(sitemap, data_dir, html_dir)
-website.renderSite

data/site/SiteNewsRenderer.rb

@@ -1,23 +0,0 @@
-require 'ZenWeb/GenericRenderer'
-
-class SiteNewsRenderer < GenericRenderer
-  require 'yaml'
-
-  def render(content)
-    newsfile = 'news.yml'
-    newsitems = YAML.load(File.open(newsfile).read())
-    limit = @document['NewsLimit']
-
-    if newsitems
-      newsitems.each do |item|
-        push("\n<div class='newsitem'>\n\nh3. #{item['title']}\n\np(date). #{item['date']}\n\n#{item['content']}\n</div>\n")
-        if limit
-          limit -= 1
-          break if limit == 0
-        end
-      end
-    end
-
-    return self.result
-  end
-end

data/site/XhtmlTemplateRenderer.rb

@@ -1,141 +0,0 @@
-require 'ZenWeb/HtmlRenderer'
-
-=begin
-
-= Class HtmlTemplateRenderer
-
-Generates a consistant HTML page header and footer, including a
-navigation bar, title, subtitle, and appropriate META tags.
-
-=== Methods
-
-=end
-
-class XhtmlTemplateRenderer < HtmlRenderer
-
-=begin
-
---- HtmlTemplateRenderer#render(content)
-
-    Renders a standardized HTML header and footer. This currently also
-    includes a navigation bar and a list of subpages, which will
-    probably be broken out to their own renderers soon.
-
-    Metadata variables used:
-
-    + author
-    + banner - graphic at the top of the page, usually a logo
-    + bgcolor - defaults to not being defined
-    + copyright
-    + description
-    + dtd (default: 'DTD HTML 4.0 Transitional')
-    + email - used in a mailto in metadata
-    + keywords
-    + rating (default: 'general')
-    + stylesheet - reference to a CSS file
-    + style - CSS code directly (for smaller snippets)
-    + subtitle
-    + title (default: 'Unknown Title')
-    + icbm - longitude and latitude for geourl.org
-    + icbm_title - defaults to the page title
-
-=end
-
-  def render(content)
-    author      = @document['author']
-    banner      = @document['banner']
-    bgcolor     = @document['bgcolor']
-    dtd		= @document['dtd'] || 'DTD HTML 4.0 Transitional'
-    copyright   = @document['copyright']
-    description = @document['description']
-    email       = @document['email']
-    keywords    = @document['keywords']
-    rating      = @document['rating'] || 'general'
-    stylesheet  = @document['stylesheet']
-    subtitle    = @document['subtitle']
-    title       = @document['title'] || 'Unknown Title'
-    icbm        = @document['icbm']
-    icbm_title  = @document['icbm_title'] || @document['title']
-    charset     = @document['charset']
-    style       = @document['style']
-
-    titletext   = @document.fulltitle
-
-    # TODO: iterate over a list of metas and add them in one nicely organized block
-
-    # header
-    push([
-	   '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">',
-	   "<head>\n",
-	   "<title>#{titletext}</title>\n",
-	   stylesheet ? "<link rel=\"STYLESHEET\" href=\"#{stylesheet}\" type=\"text/css\" title=\"#{stylesheet}\">\n" : [],
-	   style ? "<style>\n#{style}\n</style>" : [],
-	   "</head>\n",
-	   "<body>\n"
-	 ])
-
-    self.navbar
-
-    if banner then
-      push("<img src=\"#{banner}\" /><br />\n")
-      unless (subtitle) then
-	push("<h3>#{title}</h3>\n")
-      end
-    else
-      push("<h1>#{title}</h1>\n")
-    end
-
-    push([
-	   subtitle ? "<h2>#{subtitle}</h2>\n" : [],
-	   "<hr />\n\n",
-	   content,
-	   "<hr />\n\n",
-	 ])
-
-    self.navbar
-
-    push("\n</body>\n</html>\n")
-
-    return self.result
-  end
-
-=begin
-
---- HtmlTemplateRenderer#navbar
-
-    Generates a navbar that contains a link to the sitemap, search
-    page (if any), and a fake "breadcrumbs" trail which is really just
-    a list of all of the parent titles up the chain to the top.
-
-=end
-
-  def navbar
-
-    sep = " / "
-    search  = @website["/Search.html"]
-
-    push([
-	   "<p class=\"navbar\">\n",
-	   "<a href=\"#{@sitemap.url}\">Sitemap</a>",
-	   search ? " | <a href=\"#{search.url}\"><em>Search</em></a>" : [],
-	   " || ",
-	 ])
-
-    path = []
-    current = @document
-    while current and current != current.parent do
-      current = current.parent
-      path.unshift(current) if current
-    end
-
-    push([
-	   path.map{|doc| ["<a href=\"#{doc.url}\">#{doc['title']}</a>\n", sep]},
-	   @document['title'],
-	   "</p>\n",
-	 ])
-
-    return []
-  end
-
-end
-

data/site/base.css

@@ -1,4 +0,0 @@
-body {
-    background-color: white;
-    color: black;
-}

data/site/footer.txt

@@ -1,2 +0,0 @@
-<hr />
-<p>Copyright 2002 - 2005 Brian Wisti and Greg Millam</p>

data/site/header.txt

@@ -1,2 +0,0 @@
-<h1>PageTemplate</h1>
-<hr />

data/site/html/SiteMap.html

@@ -1,43 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-<HEAD>
-<TITLE>SiteMap: There are 6 pages in this website.</TITLE>
-<LINK REL="STYLESHEET" HREF="base.css" type="text/css" title="base.css">
-<META NAME="rating" CONTENT="general">
-<META NAME="GENERATOR" CONTENT="ZenWeb v. 2.17.0 http://www.zenspider.com/ZSS/Products/ZenWeb/">
-<META NAME="keywords" CONTENT="sitemap, website">
-<META NAME="description" CONTENT="This page links to every page in the website.">
-<link rel="up" href="index.html" title="PageTemplate">
-<link rel="contents" href="" title="SiteMap">
-<link rel="top" href="index.html" title="PageTemplate">
-</HEAD>
-<BODY>
-<h1>Yo!</h1>
-<hr />
-<P class="navbar">
-<A HREF="">Sitemap</A> || <A HREF="index.html">PageTemplate</A>
- / SiteMap</P>
-<H1>SiteMap</H1>
-<H2>There are 6 pages in this website.</H2>
-<HR SIZE="3" NOSHADE>
-
-<UL>
-  <LI><A HREF="index.html">PageTemplate</A></LI>
-  <LI><A HREF="install.html">Getting It</A></LI>
-  <LI><A HREF="designer.html">The Designer's Perspective</A></LI>
-  <LI><A HREF="programmer.html">The Programmer's Perspective</A></LI>
-  <LI><A HREF="version2.html">PageTemplate Version 2: What's New?</A></LI>
-  <LI><A HREF="">SiteMap: There are 6 pages in this website.</A></LI>
-</UL>
-<HR SIZE="3" NOSHADE>
-
-<P class="navbar">
-<A HREF="">Sitemap</A> || <A HREF="index.html">PageTemplate</A>
- / SiteMap</P>
-
-<h1>Yo!</h1>
-<hr />
-<h1>Yo!</h1>
-<hr />
-</BODY>
-</HTML>