PageTemplate 2.1.0 → 2.1.1

data/Changes

@@ -1,3 +1,15 @@
+CVS:
+    Bugfixes:
+      'else' no longer crashes with CaseCommand. Patch by Jeremy Apthorp
+      Wrong regexp for modifier in parser.rb fixed. Report by anonymous.
+      modifiers are correctly reset when coming out of StackableCommands.
+         (report by Jeremy Apthorp)
+    Parser:
+      Added: Caching capability. If a Source returns a Command, it is used
+             instead of trying to compile it. After every compile,
+             Source#cache(filename,cmds) is called.
+             FileSource has caching, now.
+
 2.1
     Commands:
       Changed: IfCommand now accepts elseif, elsif, else if.

data/Rakefile

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

data/lib/PageTemplate/case.rb

@@ -67,7 +67,7 @@ class PageTemplate
   DefaultGlossary.define(/^case (\w+(?:\.\w+)*)$/) { |match,parser|
     CaseCommand.new(match[1])
   }
-  if PageTemplate.constants.include? 'HTGlossary'
+  if PageTemplate.constants.include?('HTGlossary')
     HTGlossary.define(/^tmpl_case (?:NAME=)?(\w+(?:\.\w+\?)*)$/) { |m,parser|
       CaseCommand.new(m[1])
     }

data/lib/PageTemplate/commands.rb

@@ -485,15 +485,20 @@ class PageTemplate
       # We don't use parser.compile because we need to know when something
       # doesn't exist.
       parser = namespace.parser
-      body = parser.source.get(@value)
+      fn = @value
+      body = parser.source.get(fn)
       unless body
         fn = namespace.get(@value)
         body = parser.source.get(fn) if fn
       end
-      if body
-        parser.parse(body).output(namespace)
+      if body.is_a?(Command)
+        body.output(namespace)
+      elsif body
+        cmds = parser.parse(body)
+	parser.source.cache(fn,cmds)
+	cmds.output(namespace)
       else
-        "[ Template '#{fn || @value}' not found ]"
+        "[ Template '#{fn}' not found ]"
       end
     end
   end

data/lib/PageTemplate/parser.rb

@@ -170,22 +170,34 @@ class PageTemplate
       @paths = @args['include_paths']
       @paths ||= [@args['include_path']].compact
       @paths = [Dir.getwd,'/'] if @paths.empty?
+      @cache = Hash.new(nil)
+      @mtime = Hash.new(0)
     end
 
     # Return the contents of the file +name+, which must be within the
     # include_paths.
     def get(name)
+      fn = get_filename(name)
       begin
-        fn = get_filename(name)
-        if fn
-          return IO.read(fn)
+        case
+	when fn.nil?
+	  nil
+        when @cache.has_key?(fn) && (@mtime[fn] > File.mtime(fn).to_i)
+          cmds = @cache[fn]
+	  cmds.clear_cache
+	  cmds
         else
-          return nil
+          IO.read(fn)
         end
       rescue Exception => er
-        return "[ Unable to open file #{fn} ]"
+        return "[ Unable to open file #{fn} because of #{er.message} ]"
       end
     end
+    def cache(name,cmds)
+      fn = get_filename(name)
+      @cache[fn] = cmds.dup
+      @mtime[fn] = Time.now.to_i
+    end
     def get_filename(file)
       file = file.gsub(/\.\.\//,'') 
       file.untaint
@@ -301,7 +313,7 @@ class PageTemplate
     # Command#else's expect only to be called
     modifier(:else) { |cmd,command|
       case command
-      when /^else|no|empty$/i
+      when /^(else|no|empty)$/i
         cmd.else
         true
       else
@@ -341,7 +353,7 @@ class PageTemplate
         cmd.when($1)
         true
       when /^else$/i
-        cmd.else($1)
+        cmd.else
         true
       else
         false
@@ -353,34 +365,41 @@ class PageTemplate
   # A preprocessor is used to process or otherwise prepare output for
   # printing by Valuecommand
   #
-  # Preprocessors must be singletons, and take a string to convert in
-  # some form.
+  # Preprocessors must be objects, that take a string to convert in
+  # some form. Typically singletons.
   class Preprocessor
   end
 
-  # DefaultPreprocessor is a preprocessor with simple processors.
-  class DefaultPreprocessor < Preprocessor
-    # Just the string itself.
-    def DefaultPreprocessor.process(str)
-      str
-    end
-    # Reverse the string. (Just to demonstrate preprocessor)
-    def DefaultPreprocessor.reverse(str)
-      str.reverse
-    end
-    # HTML's escapeURI
-    def DefaultPreprocessor.escapeURI(string)
-      string.gsub(/([^ a-zA-Z0-9_.-]+)/n) do
+  class DefaultPreprocessor
+    class << self
+      # Default, unescaped string.
+      def unescaped(str)
+        str
+      end
+      # :process, for backwards compatability.
+      alias_method :process, :unescaped
+      # Reverse the string. Don't see any use for this :D.
+      def reverse(str)
+        str.reverse
+      end
+      # escape URIs into %20-style escapes.
+      def escapeURI(string)
+        string.gsub(/([^ a-zA-Z0-9_.-]+)/n) do
         '%' + $1.unpack('H2' * $1.size).join('%').upcase
-      end.tr(' ','+')
-    end
-    # escape HTML.
-    def DefaultPreprocessor.escapeHTML(string)
-      str = string.gsub(/&/n, '&amp;')
-      str.gsub!(/\"/n, '&quot;')
-      str.gsub!(/>/n, '&gt;')
-      str.gsub!(/</n, '&lt;')
-      str
+        end.tr(' ', '+')
+      end
+      # Escape all HTML
+      def escapeHTML(string)
+        str = string.gsub(/&/n, '&amp;')
+        str.gsub!(/\"/n, '&quot;')
+        str.gsub!(/>/n, '&gt;')
+        str.gsub!(/</n, '&lt;')
+        str
+      end
+      # Escape HTML, but also turn newlines into <br />s
+      def simple(str)
+        escapeHTML(str).gsub(/\r\n|\n/,"<br />\n")
+      end
     end
   end
 
@@ -431,7 +450,7 @@ class PageTemplate
       @parent       = args['namespace'] || nil
       @glossary     = args['glossary'] || DefaultGlossary
       @preprocessor = args['preprocessor'] || DefaultPreprocessor
-      @default_processor = args['default_processor'] || :process
+      @default_processor = args['default_processor'] || :unescaped
       @source       = (args['source'] || FileSource).new(@args)
       @commands     = nil
     end
@@ -443,10 +462,17 @@ class PageTemplate
     # Load +name+ from a template, but do not save it.
     def compile(name)
       body = @source.get(name)
-      if body
-        parse(body)
+      case
+      when body.is_a?(Command)
+        body
+      when body
+        cmds = parse(body)
+        @source.cache(name,cmds) if @source.respond_to?(:cache)
+        cmds
       else
-        TextCommand.new("[ Template '#{name}' not found ]")
+        cmds = Template.new(self)
+        cmds.add TextCommand.new("[ Template '#{name}' not found ]")
+        cmds
       end
     end
     # Compile a Template (BlockCommand) from a string. Does not save
@@ -478,6 +504,8 @@ class PageTemplate
           cmd = stack.pop
           last = stack.last
           last.add(cmd)
+          modifier = last.class.modifier
+          closer = last.class.closer
           next
         end
 

data/lib/PageTemplate.rb

@@ -21,6 +21,7 @@
 ############################################################
 
 require 'PageTemplate/parser'
+require 'PageTemplate/preprocessor'
 require 'PageTemplate/commands'
 
 # PageTemplate is just the namespace for all of its real code, so as

data/test.rb

@@ -508,6 +508,20 @@ module TestPageTemplate
       assert_equal(true, @@ns.true?("dude"),
         "If a flag is set to pretty much anything but false, then Namespace#true? returns true.")
     end
+    class Foo
+      def initialize(str)
+        @str = str
+      end
+      def bar
+        @str
+      end
+    end
+    def test_deep_true_eh
+      @@ns['foo'] = Foo.new('fizbit')
+      assert(@@ns.true?('foo.bar'),"foo.bar must be true")
+      assert(@@ns.true?('foo.bar.reverse'))
+      assert_equal(@@ns.get('foo.bar.reverse'),'tibzif')
+    end
   end
 
   class TestParser < Test::Unit::TestCase
@@ -536,7 +550,7 @@ module TestPageTemplate
     end
 
     def test_default_processor
-      assert_equal(:process, @@p.default_processor)
+      assert_equal(:unescaped, @@p.default_processor)
     end
 
     def test_load

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.8
+rubygems_version: 0.8.11
 specification_version: 1
 name: PageTemplate
 version: !ruby/object:Gem::Version 
-  version: 2.1.0
-date: 2005-05-01
+  version: 2.1.1
+date: 2005-07-30 00:00:00 -07:00
 summary: A simple templating system for Web sites.
 require_paths: 
   - lib
@@ -24,25 +24,27 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
         version: 0.0.0
   version: 
 platform: ruby
+signing_key: 
+cert_chain: 
 authors: 
   - Brian Wisti
 files: 
-  - README.txt
-  - setup.rb
-  - MANIFEST
-  - lib
-  - Changes
-  - setup-usage.txt
   - test-install.rb
+  - test.rb
+  - setup-usage.txt
+  - Changes
+  - MANIFEST
+  - setup.rb
+  - README.txt
   - Rakefile
+  - lib
   - tdata
-  - test.rb
-  - lib/PageTemplate.rb
   - lib/PageTemplate
-  - lib/PageTemplate/parser.rb
+  - lib/PageTemplate.rb
   - lib/PageTemplate/case.rb
   - lib/PageTemplate/commands.rb
   - lib/PageTemplate/htglossary.rb
+  - lib/PageTemplate/parser.rb
   - tdata/dummy.txt
 test_files: 
   - test.rb