webgen 0.5.9 → 0.5.10

data/ChangeLog

@@ -1,3 +1,151 @@
+commit d69d12ea3a034a33c2d176d315fed2bb1340319d
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Mon Aug 10 08:54:33 2009 +0200
+
+    Updated github gemspec
+
+webgen.gemspec
+
+commit 72d67580c5f06c24ceb0802865b792868f7266ed
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Mon Aug 10 08:52:48 2009 +0200
+
+    Updated website for release
+
+website/src/index.page
+website/src/news/index.page
+website/src/news/release_0_5_10.page
+
+commit aeb18e6cd648a5c16aff26bc2b75f04dc3430d4c
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Mon Aug 10 08:28:03 2009 +0200
+
+    Fixed docu problem
+
+doc/manual.page
+
+commit 98907d04b5283ca50fe7b761338d3d132bcf2436
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Mon Aug 10 08:27:35 2009 +0200
+
+    Fixed a small issue introduced with one of the latest commits
+
+lib/webgen/sourcehandler.rb
+
+commit 340cef9a1ea50cb2fe19d0ae86e926b71dd5aad6
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Mon Aug 10 08:26:50 2009 +0200
+
+    Fixed two issues regarding paths
+    
+    * Path.make_absolute now retains the trailing slash of the given path
+    * Path.match now works when the given path is either a String or a Path object
+
+lib/webgen/path.rb
+test/test_path.rb
+test/test_sourcehandler_metainfo.rb
+
+commit f36ecb333e015fe2c773f7b5bf40665d3c965e23
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Sat Aug 8 08:23:05 2009 +0200
+
+    Fixed problem with handling paths of the form NUMBER.REST
+
+doc/manual.page
+lib/webgen/path.rb
+test/test_path.rb
+website/src/news/release_0_5_10.page
+
+commit 58fdc5fc6657a0be95e6d102a32954a55987e8a8
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Sat Aug 8 07:59:12 2009 +0200
+
+    Fixed bug RF#26890: detecting unused paths did not always work correctly
+
+lib/webgen/sourcehandler.rb
+website/src/news/release_0_5_10.page
+
+commit f86b07c252a366a46b443f3ef43a8c9d30ae8e5f
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Fri Aug 7 08:00:20 2009 +0200
+
+    Fixed bug in Path: path with dot in extension and without language part were not handled correctly
+
+lib/webgen/path.rb
+test/test_path.rb
+website/src/news/release_0_5_10.page
+
+commit 95bdc3ca532f5ac8f64f6fb868b9f3a0b8dd7a7b
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Thu Aug 6 10:50:25 2009 +0200
+
+    Fixed bug: matching of directory nodes did not work correctly
+    
+    Matching of paths and nodes now work the same
+
+lib/webgen/node.rb
+lib/webgen/path.rb
+test/test_path.rb
+website/src/news/release_0_5_10.page
+
+commit b7a12a504a798d8451192eb9b5d4be0112145e73
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Wed Aug 5 08:04:10 2009 +0200
+
+    Fixed problem with webgui that was introduced with 0.5.9
+
+data/webgen/webgui/controller/main.rb
+website/src/news/release_0_5_10.page
+
+commit 3689ad96270efcd4999e78469c62399f5657b3ea
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Wed Aug 5 07:57:49 2009 +0200
+
+    Adjusting templates to use xmllint
+
+misc/default.template
+website/src/default.template
+
+commit d6eac08d6283dfe5c93ec216dbc89bc523d79b1a
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Wed Aug 5 07:57:27 2009 +0200
+
+    Implemented content processor xmllint for checking validness of XHTML files
+
+doc/contentprocessor/xmllint.page
+doc/reference_configuration.page
+lib/webgen/contentprocessor.rb
+lib/webgen/contentprocessor/xmllint.rb
+lib/webgen/default_config.rb
+test/test_contentprocessor_xmllint.rb
+website/src/news/release_0_5_10.page
+
+commit bcc62991c0adee88f8aa81a95585614eb83bae32
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Wed Aug 5 07:19:55 2009 +0200
+
+    Fixed problem with invalid HTML
+
+doc/sourcehandler.template
+website/src/news/default.template
+
+commit b25befaa084c40ca26ba7763fc2d6ceeb985c517
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Wed Aug 5 07:19:20 2009 +0200
+
+    Fixed bug in Tag::TikZ: attribute alt was no set on image
+
+lib/webgen/tag/tikz.rb
+test/test_tag_tikz.rb
+
+commit 05edaf062020b425c8bccb530df01f44a7d84dda
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Tue Aug 4 16:24:32 2009 +0200
+
+    Bumped version to 0.5.10
+
+lib/webgen/version.rb
+
 commit 098b647dc9c6e4d534b98c6f3d12b319365bded9
 Author: Thomas Leitner <t_leitner@gmx.at>
 Date:   Sat Jul 25 07:45:26 2009 +0200

data/VERSION

@@ -1 +1 @@
-0.5.9
+0.5.10

data/data/webgen/webgui/controller/main.rb

@@ -104,8 +104,8 @@ class MainController < Ramaze::Controller
       if !@cur_bundle.nil?
         ws = Webgen::Website.new('unknown', nil) do |config|
           config['sources'] = [
-                               ['/', 'Webgen::Source::Resource', 'webgen-website-bundle-default', '/src/**', '/src'],
-                               ['/', 'Webgen::Source::Resource', 'webgen-website-bundle-' + @cur_bundle, '/src/**', '/src']
+                               ['/', 'Webgen::Source::Resource', 'webgen-website-bundle-default', '/src/**', '/src/'],
+                               ['/', 'Webgen::Source::Resource', 'webgen-website-bundle-' + @cur_bundle, '/src/**', '/src/']
                               ]
           config['output'] = ['MemoryOutput']
           config['website.cache'] = [:memory, '']

data/doc/contentprocessor/xmllint.page

@@ -0,0 +1,14 @@
+---
+title: Webgen::ContentProcessor::Xmllint
+---
+## Description
+
+This content processor uses the `xmllint` program from the ["libxml2" package][1] to check the input
+for well-formedness and/or validness. `xmllint` can validate an XML (and therefore an XHTML) file
+against a DTD, a RelaxNG schema or a WXS schema. For more information about where to put the DTD or
+schema files, have a look at the `libxml2` documentation.
+
+The configuration option `contentprocessor.xmllint.options` can be used to change the default
+command line options that are used for the `xmllint` program.
+
+[1]: http://www.xmlsoft.org

data/doc/manual.page

@@ -267,6 +267,10 @@ depending on the type of path (the individual parts of a path are explained belo
 
         /parent_path/[sort_info.]basename[.lang][.extension]
 
+    There is one special case: if the file path has only one dot and only numbers are before the
+    dot, then the first part is considered to be the basename and the second part the extension (eg.
+    `53.png`)!
+
 *   The path specifies a fragment (e.g. part of a file). It must contain exactly one hash character
     and it has to follow the scheme (where `/parent_path` needs to be a file path):
 
@@ -329,6 +333,7 @@ Following are some examples of source path names (the acn and alcn parts are exp
 | `/image.png`               | image        | -none-   | Image        |           0 | `/image.png`           | `/image.png`            |
 | `/image.de.png`            | image        | de       | Image        |           0 | `/image.png`           | `/image.de.png`         |
 | `/01.name_of-file.eo.page` | name_of-file | eo       | Name of file |           1 | `/name_of-file.page`   | `/name_of-file.eo.page` |
+| `/53.png`                  | 53           | -none-   | 53           |           0 | `/53.png`              | `/53.png`               |
 | `/archive.tar.bz2`         | archive      | -none-   | Archive      |           0 | `/archive.tar.bz2`     | `/archive.tar.bz2`      |
 | `/archive.de.tar.bz2`      | archive      | de       | Archive      |           0 | `/archive.tar.bz2`     | `/archive.de.tar.bz2`   |
 | `/manual.html#sources`     | manual       | -none-   | Manual       |      -none- | `/manual.html#sources` | `/manual.html#sources`  |

data/doc/reference_configuration.page

@@ -459,6 +459,21 @@ configuration options) and/or how to use it in a webgen tag (for tag configurati
           contentprocessor.tidy.options: "-utf8"
 
 
+*   ### contentprocessor.xmllint.options
+
+    This configuration option can be used to set the command line options for the `xmllint` program
+    which is used by the [content processor `xmllint`]({relocatable: contentprocessor/xmllint.html}).
+
+    * Syntax: `STRING` where `STRING` is the string holding the command line options.
+
+    <%= show_default['contentprocessor.xmllint.options'] %>
+
+    * Example for setting the option in the configuration file:
+
+          contentprocessor.xmllint.options: "--catalogs --noout"
+
+
+
 ## Tag Specific Options
 
 These options are not normally set in the configuration file but given directly as options to the

data/doc/sourcehandler.template

@@ -13,9 +13,11 @@ meta_info = context.website.config['sourcehandler.default_meta_info'][context.co
 if meta_info
 %>
 Following is the default meta information set on any node created by this source handler:
+
 <pre>
 <%= meta_info.to_yaml.gsub(/^---/, '').strip %>
 </pre>
 <% end %>
+
 --- name:content
 <webgen:block name='content' />

data/lib/webgen/contentprocessor.rb

@@ -76,6 +76,7 @@ module Webgen
     autoload :Fragments, 'webgen/contentprocessor/fragments'
     autoload :Head, 'webgen/contentprocessor/head'
     autoload :Tidy, 'webgen/contentprocessor/tidy'
+    autoload :Xmllint, 'webgen/contentprocessor/xmllint'
 
     # Return the list of all available content processors.
     def self.list

data/lib/webgen/contentprocessor/xmllint.rb

@@ -0,0 +1,37 @@
+# -*- encoding: utf-8 -*-
+require 'tempfile'
+
+module Webgen::ContentProcessor
+
+  # Uses the external +xmllint+ program to check if the content is valid (X)HTML.
+  class Xmllint
+
+    include Webgen::Loggable
+
+    # Checks the content of +context+ with the +xmllint+ program for validness.
+    def call(context)
+      error_file = Tempfile.new('webgen-xmllint')
+      error_file.close
+
+      `xmllint --version 2>&1`
+      if $?.exitstatus != 0
+        raise Webgen::CommandNotFoundError.new('xmllint', self.class.name, context.dest_node.alcn)
+      end
+
+      cmd = "xmllint #{context.website.config['contentprocessor.xmllint.options']} - 2>'#{error_file.path}'"
+      result = IO.popen(cmd, 'r+') do |io|
+        io.write(context.content)
+        io.close_write
+        io.read
+      end
+      if $?.exitstatus != 0
+        File.read(error_file.path).scan(/^-:(\d+):(.*?\n)(.*?\n)/).each do |line, error_msg, line_context|
+          log(:warn) { "xmllint reported problems for <#{context.dest_node.alcn}:~#{line}>: #{error_msg.strip} (context: #{line_context.strip})" }
+        end
+      end
+      context
+    end
+
+  end
+
+end

data/lib/webgen/default_config.rb

@@ -140,7 +140,8 @@ config.contentprocessor.map({
                               'rdiscount' => 'Webgen::ContentProcessor::RDiscount',
                               'fragments' => 'Webgen::ContentProcessor::Fragments',
                               'head' => 'Webgen::ContentProcessor::Head',
-                              'tidy' => 'Webgen::ContentProcessor::Tidy'
+                              'tidy' => 'Webgen::ContentProcessor::Tidy',
+                              'xmllint' => 'Webgen::ContentProcessor::Xmllint'
                             }, :doc => 'Content processor name to class map')
 
 Webgen::WebsiteAccess.website.blackboard.add_service(:content_processor_names, Webgen::ContentProcessor.method(:list))
@@ -171,6 +172,8 @@ config.contentprocessor.redcloth.hard_breaks(false, :doc => 'Specifies whether n
 
 config.contentprocessor.tidy.options("-raw", :doc => "The options passed to the tidy command")
 
+config.contentprocessor.xmllint.options("--catalogs --noout --valid", :doc => 'Options passed to the xmllint command')
+
 config.tag.relocatable.path(nil, :doc => 'The path which should be made relocatable', :mandatory => 'default')
 
 config.tag.menu.start_level(1, :doc => 'The level at which the menu starts.')

data/lib/webgen/node.rb

@@ -196,9 +196,9 @@ module Webgen
       "<##{self.class.name}: alcn=#{@alcn}>"
     end
 
-    # Return +true+ if the alcn matches the pattern. See File.fnmatch for useable patterns.
+    # Return +true+ if the alcn matches the pattern. See Webgen::Path.match for more information.
     def =~(pattern)
-      File.fnmatch(pattern, @alcn, File::FNM_DOTMATCH|File::FNM_CASEFOLD|File::FNM_PATHNAME)
+      Webgen::Path.match(@alcn, pattern)
     end
 
     # Sort nodes by using the meta info +sort_info+ (or +title+ if +sort_info+ is not set) of both

data/lib/webgen/path.rb

@@ -73,17 +73,15 @@ module Webgen
     # Make the given +path+ absolute by prepending the absolute directory path +base+ if necessary.
     # Also resolves all '..' and '.' references in +path+.
     def self.make_absolute(base, path)
-      raise(ArgumentError, 'base has to be an absolute path, ie. needs to start with a slash') unless base =~ /\//
-      Pathname.new(path =~ /^\// ? path : File.join(base, path)).cleanpath.to_s
+      raise(ArgumentError, 'base has to be an absolute path, ie. needs to start with a slash') unless base =~ /^\//
+      Pathname.new(path =~ /^\// ? path : File.join(base, path)).cleanpath.to_s + (path =~ /.\/$/ ? '/' : '')
     end
 
-    # Return +true+ if the given +path+ matches the given +pattern+ (trailing slashes of directories
-    # are not respected). For information on which patterns are supported, have a look at the
-    # documentation of File.fnmatch.
+    # Return +true+ if the given +path+ matches the given +pattern+. For information on which
+    # patterns are supported, have a look at the documentation of File.fnmatch.
     def self.match(path, pattern)
-      path = path.to_s.chomp('/') unless path == '/'
-      pattern = pattern.to_s.chomp('/') unless pattern == '/'
-      File.fnmatch(pattern, path, File::FNM_DOTMATCH|File::FNM_CASEFOLD|File::FNM_PATHNAME)
+      pattern += '/' if path.to_s =~ /\/$/ && pattern !~ /\/$|^$/
+      File.fnmatch(pattern, path.to_s, File::FNM_DOTMATCH|File::FNM_CASEFOLD|File::FNM_PATHNAME)
     end
 
 
@@ -279,10 +277,15 @@ module Webgen
       @parent_path = File.join(File.dirname(@path), '/')
       match_data = FILENAME_RE.match(File.basename(@path))
 
-      @meta_info['sort_info'] = (match_data[1].nil? ? nil : match_data[1].to_i)
-      @basename               = match_data[2]
-      @meta_info['lang']      = Webgen::LanguageManager.language_for_code(match_data[3])
-      @ext                    = (@meta_info['lang'].nil? && !match_data[3].nil? ? match_data[3].to_s : '') + match_data[4].to_s
+      if !match_data[1].nil? && match_data[3].nil? && match_data[4].nil? # handle special case of sort_info.basename as basename.ext
+        @basename = match_data[1]
+        @ext = match_data[2]
+      else
+        @meta_info['sort_info'] = (match_data[1].nil? ? nil : match_data[1].to_i)
+        @basename               = match_data[2]
+        @meta_info['lang']      = Webgen::LanguageManager.language_for_code(match_data[3])
+        @ext                    = (@meta_info['lang'].nil? && !match_data[3].nil? ? match_data[3].to_s + '.' : '') + match_data[4].to_s
+      end
     end
 
     # Analyse the path assuming it is a fragment.

data/lib/webgen/sourcehandler.rb

@@ -130,7 +130,7 @@ module Webgen
 
           nodes_to_delete.each {|node| website.tree.delete_node(node)}
           used_paths.merge(paths_to_use)
-          paths = create_nodes_from_paths(used_paths.to_a.sort)
+          paths = create_nodes_from_paths(used_paths).collect {|n| n.node_info[:src]}
           unused_paths.merge(used_paths - paths)
           website.tree.node_access[:alcn].each {|name, node| website.tree.delete_node(node) if node.flagged?(:reinit)}
           website.cache.reset_volatile_cache
@@ -203,23 +203,23 @@ module Webgen
         end
       end
 
-      # Use the source handlers to create nodes for the +paths+ in the <tt>website.tree</tt>.
+      # Use the source handlers to create nodes for the +paths+ in the <tt>website.tree</tt> and
+      # return the nodes that have been created.
       def create_nodes_from_paths(paths)
-        used_paths = Set.new
+        nodes = Set.new
         website.config['sourcehandler.invoke'].sort.each do |priority, shns|
           shns.each do |shn|
             sh = website.cache.instance(shn)
             handler_paths = paths_for_handler(shn, paths)
-            used_paths.merge(handler_paths)
             handler_paths.sort {|a,b| a.path.length <=> b.path.length}.each do |path|
               if !website.tree[path.parent_path]
-                used_paths.merge(create_nodes_from_paths([path.parent_path]))
+                nodes.merge(create_nodes_from_paths([path.parent_path]))
               end
-              create_nodes(path, sh)
+              nodes += create_nodes(path, sh)
             end
           end
         end
-        used_paths
+        nodes
       end
 
       # Prepare everything to create from the +path+ using the +source_handler+. If a block is
@@ -236,9 +236,8 @@ module Webgen
                  else
                    source_handler.create_node(path)
                  end
-        nodes.flatten.compact.each do |node|
-          website.blackboard.dispatch_msg(:after_node_created, node)
-        end
+        nodes = nodes.flatten.compact
+        nodes.each {|node| website.blackboard.dispatch_msg(:after_node_created, node)}
         nodes
       rescue Webgen::Error => e
         e.alcn = path unless e.alcn

data/lib/webgen/tag/tikz.rb

@@ -53,7 +53,7 @@ EOF
           end
         end
       end.first
-      attrs = param('tag.tikz.img_attr').collect {|name,value| "#{name.to_s}=\"#{value}\"" }.sort.unshift('').join(' ')
+      attrs = {'alt' => ''}.merge(param('tag.tikz.img_attr')).collect {|name,value| "#{name.to_s}=\"#{value}\"" }.sort.unshift('').join(' ')
       "<img src=\"#{context.dest_node.route_to(node)}\"#{attrs} />"
     end
 

data/lib/webgen/version.rb

@@ -3,6 +3,6 @@
 module Webgen
 
   # The version of webgen.
-  VERSION = '0.5.9'
+  VERSION = '0.5.10'
 
 end

data/misc/default.template

@@ -1,3 +1,4 @@
+--- pipeline:erb,tags,blocks,head,xmllint
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="{lang:}" lang="{lang:}">
 

data/test/test_contentprocessor_xmllint.rb

@@ -0,0 +1,38 @@
+# -*- encoding: utf-8 -*-
+
+require 'test/unit'
+require 'helper'
+require 'webgen/contentprocessor'
+
+class TestContentProcessorXmllint < Test::Unit::TestCase
+
+  include Test::WebsiteHelper
+
+  def test_call
+    obj = Webgen::ContentProcessor::Xmllint.new
+    root = Webgen::Node.new(Webgen::Tree.new.dummy_root, '/', '/')
+    node = Webgen::Node.new(root, '/test', 'test')
+    context = Webgen::Context.new(:content => "", :chain => [node])
+
+    tmp, ENV['PATH'] = ENV['PATH'], '/sbin'
+    assert_raise(Webgen::CommandNotFoundError) { obj.call(context) }
+    ENV['PATH'] = tmp
+
+    output = StringIO.new('')
+    @website.logger = ::Logger.new(output)
+    @website.logger.level = Logger::WARN
+
+    context.content = data = 'test'
+    obj.call(context)
+    assert_equal(data, context.content)
+    output.rewind; assert_match(/<\/test:~1>/, output.read)
+
+    output.string = ''
+    context.content = data = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">' +
+      '<html xmlns="http://www.w3.org/1999/xhtml"><head><title>title</title></head><body></body></html>'
+    obj.call(context)
+    assert_equal(data, context.content)
+    assert_equal(0, output.string.length)
+  end
+
+end

data/test/test_path.rb

@@ -38,6 +38,8 @@ class TestPath < Test::Unit::TestCase
                     '/dir/',  'default', nil, 'png', 'default.png', 'default.png', '/dir/default.png', '/dir/default.png', nil, 'Default')
     check_proc.call(Webgen::Path.new('/default.deu.png'),
                     '/', 'default', 'de', 'png', 'default.png', 'default.de.png', '/default.png', '/default.de.png', nil, 'Default')
+    check_proc.call(Webgen::Path.new('/default.tar.bz2'),
+                    '/', 'default', nil, 'tar.bz2', 'default.tar.bz2', 'default.tar.bz2', '/default.tar.bz2', '/default.tar.bz2', nil, 'Default')
     check_proc.call(Webgen::Path.new('/default.en.tar.bz2'),
                     '/', 'default', 'en', 'tar.bz2', 'default.tar.bz2', 'default.en.tar.bz2', '/default.tar.bz2', '/default.en.tar.bz2', nil, 'Default')
     check_proc.call(Webgen::Path.new('/default.deu.'),
@@ -52,6 +54,13 @@ class TestPath < Test::Unit::TestCase
                     '/', '.htaccess', 'en', '', '.htaccess', '.htaccess.en', '/.htaccess', '/.htaccess.en', nil, '.htaccess')
     check_proc.call(Webgen::Path.new('/.htaccess.en.page'),
                     '/', '.htaccess', 'en', 'page', '.htaccess.page', '.htaccess.en.page', '/.htaccess.page', '/.htaccess.en.page', nil, '.htaccess')
+    check_proc.call(Webgen::Path.new('/5.png'),
+                    '/', '5', nil, 'png', '5.png', '5.png', '/5.png', '/5.png', nil, '5')
+    check_proc.call(Webgen::Path.new('/5.de.png'),
+                    '/', 'de', nil, 'png', 'de.png', 'de.png', '/de.png', '/de.png', 5, 'De')
+    check_proc.call(Webgen::Path.new('/5.66.png'),
+                    '/', '66', nil, 'png', '66.png', '66.png', '/66.png', '/66.png', 5, '66')
+
 
     # Check fragment paths
     assert_raises(RuntimeError) { Webgen::Path.new("/#hallo")}
@@ -183,10 +192,13 @@ class TestPath < Test::Unit::TestCase
     assert(Webgen::Path.match(path, '/dir/'))
     assert(Webgen::Path.match(path, '/dir'))
     assert(Webgen::Path.match(path, '/*/'))
+    assert(Webgen::Path.match(path, '/*'))
 
-    path = '/dir'
-    assert(Webgen::Path.match(path, '/dir/'))
-    assert(Webgen::Path.match(path, '/dir'))
+    path = '/file'
+    assert(!Webgen::Path.match(path, '/file/'))
+    assert(Webgen::Path.match(path, '/file'))
+    assert(!Webgen::Path.match(path, '/*/'))
+    assert(Webgen::Path.match(path, '/*'))
 
     path = '/'
     assert(Webgen::Path.match(path, '/'))
@@ -194,12 +206,20 @@ class TestPath < Test::Unit::TestCase
 
     path = ''
     assert(!Webgen::Path.match(path, '/'))
+
+    path = Webgen::Path.new('/dir/')
+    assert(Webgen::Path.match(path, '/dir/'))
+    assert(Webgen::Path.match(path, '/dir'))
+    assert(Webgen::Path.match(path, '/*/'))
+    assert(Webgen::Path.match(path, '/*'))
   end
 
   def test_apath
     assert_raise(ArgumentError) { Webgen::Path.make_absolute('test', 'test') }
+    assert_raise(ArgumentError) { Webgen::Path.make_absolute('test/', 'test') }
     assert_equal('/', Webgen::Path.make_absolute('/', '/'))
     assert_equal('/dir', Webgen::Path.make_absolute('/other', '/dir'))
+    assert_equal('/dir/', Webgen::Path.make_absolute('/other', '/dir/'))
     assert_equal('/other/dir', Webgen::Path.make_absolute('/other', 'dir'))
     assert_equal('/test/dir', Webgen::Path.make_absolute('/other', '../test/dir'))
     assert_equal('/', Webgen::Path.make_absolute('/', '/..'))

data/test/test_sourcehandler_metainfo.rb

@@ -42,7 +42,7 @@ EOF
 
   def test_create_node
     assert_equal({'/default.*' => {'title' => 'new title', 'before' => 'valbef'},
-                 '/*' => {'title' => 'test'}}, @node.node_info[:mi_paths])
+                 '/*/' => {'title' => 'test'}}, @node.node_info[:mi_paths])
     assert_equal({'/default.css' => {'after' => 'valaft'},
                  '/other.page' => {'title' => 'Not Other'}}, @node.node_info[:mi_alcn])
   end

data/test/test_tag_tikz.rb

@@ -30,13 +30,13 @@ class TestTagTikZ < Test::Unit::TestCase
     context = Webgen::Context.new(:chain => [node])
 
     output = call(context, '\tikz \draw (0,0) -- (0,1);', 'test.png', [], '', '72 72', false, {})
-    assert_equal('<img src="test.png" />', output)
+    assert_equal('<img src="test.png" alt="" />', output)
     assert(root.tree['/test.png'])
     assert_not_nil(root.tree['/test.png'].content)
     root.tree.delete_node('/test.png')
 
     output = call(context, '\tikz \asdfasdfasf', 'test.png', [], '', '72 72', false, {})
-    assert_equal('<img src="test.png" />', output)
+    assert_equal('<img src="test.png" alt="" />', output)
     assert(root.tree['/test.png'])
     assert_raise(Webgen::RenderError) { root.tree['/test.png'].content }
     root.tree.delete_node('/test.png')
@@ -48,7 +48,7 @@ class TestTagTikZ < Test::Unit::TestCase
     root.tree.delete_node('/images/test.gif')
 
     output = call(context, '\tikz \draw (0,0) -- (0,1);', 'images/../img/test.png', [], '', '300 72', true, {})
-    assert_equal('<img src="img/test.png" />', output)
+    assert_equal('<img src="img/test.png" alt="" />', output)
     assert(root.tree['/img/test.png'])
     assert_not_nil(root.tree['/img/test.png'].content)
     root.tree.delete_node('/img/test.png')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: webgen
 version: !ruby/object:Gem::Version 
-  version: 0.5.9
+  version: 0.5.10
 platform: ruby
 authors: 
 - Thomas Leitner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-25 00:00:00 +02:00
+date: 2009-08-10 00:00:00 +02:00
 default_executable: webgen
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -319,6 +319,7 @@ files:
 - doc/contentprocessor/sass.page
 - doc/contentprocessor/tags.page
 - doc/contentprocessor/tidy.page
+- doc/contentprocessor/xmllint.page
 - doc/contentprocessor.template
 - doc/extensions.metainfo
 - doc/extensions.page
@@ -382,6 +383,7 @@ files:
 - lib/webgen/contentprocessor/sass.rb
 - lib/webgen/contentprocessor/tags.rb
 - lib/webgen/contentprocessor/tidy.rb
+- lib/webgen/contentprocessor/xmllint.rb
 - lib/webgen/contentprocessor.rb
 - lib/webgen/context/nodes.rb
 - lib/webgen/context/render.rb
@@ -470,6 +472,7 @@ files:
 - test/test_contentprocessor_sass.rb
 - test/test_contentprocessor_tags.rb
 - test/test_contentprocessor_tidy.rb
+- test/test_contentprocessor_xmllint.rb
 - test/test_context.rb
 - test/test_error.rb
 - test/test_languages.rb