PageTemplate 2.1.2 → 2.1.3

data/Changes

@@ -1,3 +1,16 @@
+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:
+      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>).
+          Inspired by Jeremy Apthorp and YAML paths.
+
 2.1.2:
     Bugfixes:
       Added File.chmod statements to setup.rb to fix rake install.

data/Rakefile

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

data/lib/PageTemplate/commands.rb

@@ -413,6 +413,7 @@ class PageTemplate
           ns['__FIRST__'] = (i == 1) ? true : false
           ns['__LAST__'] = (i == len) ? true : false
           ns['__ODD__'] = odd
+          ns['__INDEX__'] = i-1
           odd = ! odd
           i += 1
           @commands.output(ns)
@@ -426,6 +427,7 @@ class PageTemplate
           ns['__FIRST__'] = (i == 1) ? true : false
           ns['__LAST__'] = (i == len) ? true : false
           ns['__ODD__'] = odd
+          ns['__INDEX__'] = i-1
           odd = ! odd
           ns[iterator] = item
           i += 1
@@ -437,6 +439,7 @@ class PageTemplate
           ns['__FIRST__'] = (i == 1) ? true : false
           ns['__LAST__'] = (i == len) ? true : false
           ns['__ODD__'] = odd
+          ns['__INDEX__'] = i-1
           @iterators.each_with_index do |iterator,index|
             ns[iterator] = list[index]
           end

data/lib/PageTemplate/htglossary.rb

@@ -7,39 +7,49 @@
 
 class PageTemplate
   class HTGlossary < SyntaxGlossary
-    @directive = /<!--(.+?)-->/m
+    # @directive = /<(?:!--\s*(tmpl.+?)\s*--|(TMPL.+?)(?:\/)?)>/mi
+    @directive = /(?:<\s*((?:\/?)TMPL_.*?)>|<!--\s*((?:\/?)TMPL.+?)\s*-->)/i
 
-    default { |command,parser|
-      TextCommand.new("<!--#{command}-->",parser)
+    default { |command|
+      puts "default: #{command}"
+      TextCommand.new("<!--#{command}-->")
     }
 
     define(/^tmpl_var (?:name=)?"?((?:\w+)(?:\.\w+\??)*)"?(?:\s+processor="?(\w+)"?)?$/i) {
-      |match,parser|
+      |match|
       # Value, Preprocessor, Parser
-      ValueCommand.new(match[1],match[2],parser)
+      ValueCommand.new(match[1],match[2])
     }
 
     define(/^(tmpl_if|tmpl_unless) (?:name=)?"?((\w+)(\.\w+\??)*)"?$/i) {
-      |match,parser|
+      |match|
       # Called_As, Value, parser
-      IfCommand.new(match[1],match[2],parser)
+      IfCommand.new(match[1],match[2])
     }
 
     define(/^(tmpl_loop) (?:name=)"?(\w+(?:\.\w+\??)*)"?(?:\s+iterators?="?((?:\s*\w+)+)"?)?$/i) {
-      |match,parser|
+      |match|
       # Called_As, Value, Iterators
       LoopCommand.new(match[1],match[2],match[3])
     }
 
     define(/^tmpl_include (?:name=|file=)?"?((\w+)(?:\.\w+\??)*)"?$/i) {
-      |match,parser|
+      |match|
       # Value, parser
-      IncludeCommand.new(match[1],parser)
+      IncludeCommand.new(match[1])
     }
 
     # Command#else's expect only to be called
+    modifier(:elsif) { |cmd,command|
+      if command =~ /^\s*tmpl_else\s*$/i
+        cmd.else
+        true
+      else
+        false
+      end
+    }
     modifier(:else) { |cmd,command|
-      if command =~ /^tmpl_else$/i
+      if command =~ /^\s*tmpl_else\s*$/i
         cmd.else
         true
       else
@@ -47,7 +57,7 @@ class PageTemplate
       end
     }
     modifier(:end) { |cmd,command|
-      if command =~ /^\/\s*#{cmd.called_as}$/i
+      if command =~ /^\s*\/\s*#{cmd.called_as}\s*$/i
         cmd.end
         true
       else

data/lib/PageTemplate/parser.rb

@@ -53,41 +53,52 @@ class PageTemplate
     # (and further results) to premit accessing attributes of objects.
     def get(val,clean_rescue=true)
       args = parser.args
-      clean_rescue = !args['raise_on_error'] if clean_rescue
       @values ||= {}
       @object ||= nil
-      # Is it ours, or is it cached?
-      key, rest = val.split(/\./,2)
+
+      clean_rescue = !args['raise_on_error'] if clean_rescue
+
+      val.gsub!(/[#{Regexp.escape(parser.method_separators)}]/,'.')
+
+      key, rest = val.split(/\./, 2)
+
       value = case
       when @values.has_key?(key)
         @values[key]
-      when @object.respond_to?(:has_key?) && @object.has_key?(key)
+      when !@object
+        return @parent.get(val) if @parent
+        return nil
+      when @object.respond_to?(:has_key?)
         @values[key] = @object[key]
-      when @object.respond_to?(key.to_sym)
-        # This sets the cache and returns the value, too!
-        @values[key] = @object.send(key)
-      when @object && key == '__ITEM__'
+      when @object.respond_to?(sym = key.to_sym)
+        @values[key] = @object.send(sym)
+      when key == '__ITEM__'
         @object
-      when @parent
-        # Return what the parent gets
-        return @parent.get(val)
       else
-        # We're the global namespace
         nil
       end
 
       if rest
+        names = [key]
         rest.split(/\./).each do |i|
+          names << i
+          name = names.join('.')
           begin
-            value = case
-            when value.respond_to?(:has_key?) && value.has_key?(i)
-              value[i]
-            when value.respond_to?(:[]) && i =~ /^\d+$/
-              value[i.to_i]
-            when value.respond_to?(i)
-              value.send(i)
+            value = if @values.has_key?(name)
+              @values[name]
             else
-              nil
+              @values[name] = value = case
+              when @values.has_key?(name)
+                @values[name]
+              when value.respond_to?(:has_key?) # Hash
+                value[i]
+              when value.respond_to?(:[]) && i =~ /^\d+$/ # Array
+                value[i.to_i]
+              when value.respond_to?(i) # Just a method
+                value.send(i)
+              else
+                nil
+              end
             end
           rescue NoMethodError => er
             return nil
@@ -193,11 +204,15 @@ class PageTemplate
         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
+
+    # Return the absolute pathname of the first name +file+
+    # found in the include_paths.
     def get_filename(file)
       file = file.gsub(/\.\.\//,'') 
       file.untaint
@@ -312,6 +327,7 @@ class PageTemplate
 
     # Command#else's expect only to be called
     modifier(:else) { |cmd,command|
+      puts "Uh, whoops? #{command}" if command =~ /tmpl/mi
       case command
       when /^(else|no|empty)$/i
         cmd.else
@@ -428,7 +444,7 @@ class PageTemplate
   class Parser
     attr_reader :preprocessor, :default_processor
     attr_reader :glossary, :namespace, :source
-    attr_reader :args, :commands
+    attr_reader :args, :commands, :method_separators
 
     # This is corny, but recent_parser returns the most recently created
     # Parser.
@@ -451,6 +467,7 @@ class PageTemplate
       @glossary     = args['glossary'] || DefaultGlossary
       @preprocessor = args['preprocessor'] || DefaultPreprocessor
       @default_processor = args['default_processor'] || :unescaped
+      @method_separators = args['method_separators'] || './'
       @source       = (args['source'] || FileSource).new(@args)
       @commands     = nil
     end
@@ -486,7 +503,7 @@ class PageTemplate
       closer = nil
       while (m = rx.match(body))
         pre = m.pre_match
-        command = m[1].strip.gsub(/\s+/,' ')
+        command = m[1..-1].compact.first.strip.gsub(/\s+/,' ')
         body = m.post_match
         
         # Convert all pre-text to a TextCommand

data/lib/PageTemplate.rb

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

data/setup-usage.txt

@@ -4,7 +4,7 @@ Installing Programs with setup.rb
 Quick Start
 -----------
     
-  Type this (You might needs super user previledge):
+  Type this (You might needs super user privilege):
 
       ($ su)
        # ruby setup.rb

data/setup.rb

@@ -452,8 +452,10 @@ module FileOperations
     end
     dirs.each_index do |idx|
       path = dirs[0..idx].join('')
-      Dir.mkdir path unless File.dir?(path)
-      File.chmod(0755,path)
+      unless File.dir?(path)
+        Dir.mkdir path
+        File.chmod(0755,path)
+      end
     end
   end
 
@@ -1012,12 +1014,16 @@ class ToplevelInstallerMulti < ToplevelInstaller
   #
 
   def each_selected_installers
-    Dir.mkdir 'packages' unless File.dir?('packages')
-    File.chmod(0755,'packages')
+    unless File.dir?('packages')
+      Dir.mkdir 'packages'
+      File.chmod(0755,'packages')
+    end
     @selected.each do |pack|
       $stderr.puts "Processing the package `#{pack}' ..." if @options['verbose']
-      Dir.mkdir "packages/#{pack}" unless File.dir?("packages/#{pack}")
-      File.chmod(0755,"packages/#{pack}")
+      unless File.dir?("packages/#{pack}")
+        Dir.mkdir "packages/#{pack}"
+        File.chmod(0755,"packages/#{pack}")
+      end
       Dir.chdir "packages/#{pack}"
       yield @installers[pack]
       Dir.chdir '../..'
@@ -1333,8 +1339,10 @@ class Installer
     return unless File.dir?("#{@srcdir}/#{rel}")
 
     dir = File.basename(rel)
-    Dir.mkdir dir unless File.dir?(dir)
-    File.chmod(0755,dir)
+    unless File.dir?(dir)
+      Dir.mkdir dir
+      File.chmod(0755,dir)
+    end
     prevdir = Dir.pwd
     Dir.chdir dir
     $stderr.puts '---> ' + rel if verbose?

data/test.rb

@@ -654,6 +654,40 @@ module TestPageTemplate
     end
   end
 
+  class TestHTGlossary < Test::Unit::TestCase
+    def setup
+      begin
+        require 'PageTemplate/htglossary'
+        @parser = PageTemplate::Parser.new('glossary' => PageTemplate::HTGlossary)
+      rescue Exception => er
+        puts "error: #{er}"
+        @parser = nil
+      end
+    end
+    def test_comment_style
+      assert(@parser,'HTGlossary parser was not created')
+      tmpl = @parser.parse('<!-- TMPL_VAR foo -->')
+      tmpl['foo'] = 'bar'
+      assert_equal('bar',tmpl.output,'A TMPL_VAR command by itself')
+      tmpl = @parser.parse('<!-- TMPL_IF foo -->foo<!--TMPL_ELSE-->bar<!-- /TMPL_IF -->')
+      tmpl['foo'] = true
+      assert_equal('foo',tmpl.output,'TMPL_IF does not work in comment style')
+      tmpl['foo'] = false
+      assert_equal('bar',tmpl.output,'TMPL_IF does not work in comment style')
+    end
+    def test_tag_style
+      assert(@parser,'HTGlossary parser was not created')
+      tmpl = @parser.parse('<TMPL_VAR foo>')
+      tmpl['foo'] = 'bar'
+      assert_equal('bar',tmpl.output,'A TMPL_VAR command by itself')
+      tmpl = @parser.parse('<TMPL_IF foo>foo<TMPL_ELSE>bar</TMPL_IF>')
+      tmpl['foo'] = true
+      assert_equal('foo',tmpl.output,'TMPL_IF does not work in comment style')
+      tmpl['foo'] = false
+      assert_equal('bar',tmpl.output,'TMPL_IF does not work in comment style')
+    end
+  end
+
   class TestValueCommand < Test::Unit::TestCase
     def test_output
       p = PageTemplate::Parser.new()

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.10
+rubygems_version: 0.8.11
 specification_version: 1
 name: PageTemplate
 version: !ruby/object:Gem::Version 
-  version: 2.1.2
-date: 2005-08-04
+  version: 2.1.3
+date: 2005-10-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: 
+  - Changes
   - lib
-  - setup-usage.txt
+  - MANIFEST
   - Rakefile
-  - tdata
-  - Changes
-  - test.rb
   - README.txt
+  - setup-usage.txt
   - setup.rb
-  - MANIFEST
+  - tdata
   - test-install.rb
+  - test.rb
   - lib/PageTemplate
   - lib/PageTemplate.rb
-  - lib/PageTemplate/parser.rb
+  - lib/PageTemplate/case.rb
   - lib/PageTemplate/commands.rb
   - lib/PageTemplate/htglossary.rb
-  - lib/PageTemplate/case.rb
+  - lib/PageTemplate/parser.rb
   - tdata/dummy.txt
 test_files: 
   - test.rb