webgen 0.4.5 → 0.4.6

data/doc/src/examples/website_templates/index.page

@@ -0,0 +1,24 @@
+---
+title: Index
+directoryName: Website Templates
+---
+h2. List of website templates
+
+The website templates open in an iframe when you use the menu items. Use the links provided below to
+open the website templates directly (fullscreen).
+
+Following is the list of all available website templates:
+
+
+* <a href='default/index.html'>default</a>
+
+  * *Author*: Thomas Leitner
+  * *Description*: This is the default website template. It only contains the basic files and is a good starting place for any website.
+* <a href='personal_hp/index.html'>personal_hp</a>
+
+  * *Author*: Thomas Leitner
+  * *Description*: This template can be used for personal homepages. It provides the most common pages found on personal homepages.
+* <a href='project/index.html'>project</a>
+
+  * *Author*: Thomas Leitner
+  * *Description*: This template provides the basic files for a website for a software project. You just need to fill in the correct data in the provided files and there you go!

data/doc/src/examples/website_templates/personal_hp.page

@@ -0,0 +1,5 @@
+---
+title: personal_hp
+inMenu: true
+--- content, html
+<object type='text/html' data='personal_hp/index.html' width='100%' height='600px' />

data/doc/src/examples/website_templates/project.page

@@ -0,0 +1,5 @@
+---
+title: project
+inMenu: true
+--- content, html
+<object type='text/html' data='project/index.html' width='100%' height='600px' />

data/doc/src/news.page

@@ -4,6 +4,14 @@ inMenu: true
 ---
 h2. News
 
+h3(#news-2007-09-08). 08.09.2007 - webgen 0.4.6
+
+This is a bug fix release:
+
+* fixed bug in handling of meta information in File/Pagehandler (thanks to Andrea Ferro)
+* fixed bug in handling of directory and file names with special characters (see Bug #13757)
+
+
 h3(#news-2007-06-29). 29.06.2007 - webgen 0.4.5
 
 This release contains some bug fixes:

data/lib/webgen/config.rb

@@ -24,7 +24,7 @@ require 'rbconfig'
 
 module Webgen
 
-  VERSION = [0, 4, 5]
+  VERSION = [0, 4, 6]
   AUTHOR = 'Thomas Leitner <t_leitner@gmx.at>'
   SUMMARY = "webgen is a templated based static Web site generator."
   DESCRIPTION = "webgen is a Web site generator implemented in Ruby. " \

data/lib/webgen/node.rb

@@ -123,7 +123,7 @@ class Node
     elsif @path =~ ABSOLUTE_URL
       @path
     else
-      full_path.sub( /^#{Node.root( self ).path}/, '/' )
+      full_path.sub( /^#{Regexp.escape(Node.root( self ).path)}/, '/' )
     end
   end
 
@@ -151,11 +151,11 @@ class Node
   # matched portion or +nil+. Used by #resolve_node.
   def =~( path )
     md = if is_directory?
-           /^#{@path.chomp('/')}(\/|$)/ =~ path                  #' #emacs hack
+           /^#{Regexp.escape(@path.chomp('/'))}(\/|$)/ =~ path                  #' #emacs hack
          elsif is_fragment?
-           /^#{@path}$/ =~ path
+           /^#{Regexp.escape(@path)}$/ =~ path
          else
-           /^#{@path}(?=#|$)/ =~ path
+           /^#{Regexp.escape(@path)}(?=#|$)/ =~ path
          end
     if md then $& end
   end

data/lib/webgen/plugins/filehandlers/filehandler.rb

@@ -225,7 +225,7 @@ module FileHandlers
         log(:info) { "Not using these files for #{handler.class.plugin_name} as they do not exist or are excluded: #{diff.inspect}" } if diff.length > 0
         common.each  do |file|
           log(:info) { "Creating node(s) for file <#{file}>..." }
-          create_node( file.sub( /^#{root_node.node_info[:src]}/, '' ), root_node, handler )
+          create_node( file.sub( /^#{Regexp.escape(root_node.node_info[:src])}/, '' ), root_node, handler )
         end
       end
 

data/lib/webgen/plugins/filehandlers/gallery.rb

@@ -237,7 +237,7 @@ module FileHandlers
       end
 
       @path = File.dirname( file )
-      images = Dir.glob( File.join( @path, param( 'images' )), File::FNM_CASEFOLD ).collect {|i| i.sub( /#{@path + File::SEPARATOR}/, '' ) }
+      images = Dir.glob( File.join( @path, param( 'images' )), File::FNM_CASEFOLD ).collect {|i| i.sub( /#{Regexp.escape(@path + File::SEPARATOR)}/, '' ) }
       images.sort! do |a,b|
         aoi = @imagedata[a].nil? ? 0 : @imagedata[a]['orderInfo'].to_s.to_i || 0
         boi = @imagedata[b].nil? ? 0 : @imagedata[b]['orderInfo'].to_s.to_i || 0

data/lib/webgen/plugins/filehandlers/page.rb

@@ -68,7 +68,7 @@ module FileHandlers
 
       # Overwritten to also handle matching of the page name and the local page name.
       def =~( path )
-        md = /^(#{@path}|#{@node_info[:local_pagename]}|#{@node_info[:pagename]})(?=#|$)/ =~ path
+        md = /^(#{Regexp.escape(@path)}|#{Regexp.escape(@node_info[:local_pagename])}|#{Regexp.escape(@node_info[:pagename])})(?=#|$)/ =~ path
         ( md ? $& : nil )
       end
 
@@ -131,7 +131,7 @@ module FileHandlers
         return nil
       end
 
-      data.meta_info.update( meta_info )
+      data.meta_info.update( meta_info.merge( data.meta_info ) )
       analysed_name = analyse_file_name( filename, data.meta_info['lang'] )
 
       data.meta_info['lang'] ||= analysed_name.lang

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: webgen
 version: !ruby/object:Gem::Version 
-  version: 0.4.5
-date: 2007-06-29 00:00:00 +02:00
+  version: 0.4.6
+date: 2007-09-08 00:00:00 +02:00
 summary: webgen is a templated based static Web site generator.
 require_paths: 
 - lib
@@ -473,10 +473,223 @@ files:
 - test/unittests/tc_treewalker.rb
 - test/unittests/tc_website.rb
 - doc/config.yaml
+- doc/examples
+- doc/examples/website_styles
+- doc/examples/website_styles/1024px
+- doc/examples/website_styles/1024px/config.yaml
+- doc/examples/website_styles/1024px/README
+- doc/examples/website_styles/1024px/src
+- doc/examples/website_styles/1024px/src/about.page
+- doc/examples/website_styles/1024px/src/default.css
+- doc/examples/website_styles/1024px/src/default.template
+- doc/examples/website_styles/1024px/src/download.page
+- doc/examples/website_styles/1024px/src/features.page
+- doc/examples/website_styles/1024px/src/images
+- doc/examples/website_styles/1024px/src/images/background.gif
+- doc/examples/website_styles/1024px/src/index.page
+- doc/examples/website_styles/1024px/src/screenshots.page
+- doc/examples/website_styles/andreas00
+- doc/examples/website_styles/andreas00/config.yaml
+- doc/examples/website_styles/andreas00/README
+- doc/examples/website_styles/andreas00/src
+- doc/examples/website_styles/andreas00/src/about.page
+- doc/examples/website_styles/andreas00/src/default.css
+- doc/examples/website_styles/andreas00/src/default.template
+- doc/examples/website_styles/andreas00/src/download.page
+- doc/examples/website_styles/andreas00/src/features.page
+- doc/examples/website_styles/andreas00/src/images
+- doc/examples/website_styles/andreas00/src/images/bg.gif
+- doc/examples/website_styles/andreas00/src/images/front.jpg
+- doc/examples/website_styles/andreas00/src/images/menubg.gif
+- doc/examples/website_styles/andreas00/src/images/menubg2.gif
+- doc/examples/website_styles/andreas00/src/index.page
+- doc/examples/website_styles/andreas00/src/screenshots.page
+- doc/examples/website_styles/andreas01
+- doc/examples/website_styles/andreas01/config.yaml
+- doc/examples/website_styles/andreas01/README
+- doc/examples/website_styles/andreas01/src
+- doc/examples/website_styles/andreas01/src/about.page
+- doc/examples/website_styles/andreas01/src/default.css
+- doc/examples/website_styles/andreas01/src/default.template
+- doc/examples/website_styles/andreas01/src/download.page
+- doc/examples/website_styles/andreas01/src/features.page
+- doc/examples/website_styles/andreas01/src/images
+- doc/examples/website_styles/andreas01/src/images/bg.gif
+- doc/examples/website_styles/andreas01/src/images/front.jpg
+- doc/examples/website_styles/andreas01/src/index.page
+- doc/examples/website_styles/andreas01/src/print.css
+- doc/examples/website_styles/andreas01/src/screenshots.page
+- doc/examples/website_styles/andreas03
+- doc/examples/website_styles/andreas03/config.yaml
+- doc/examples/website_styles/andreas03/README
+- doc/examples/website_styles/andreas03/src
+- doc/examples/website_styles/andreas03/src/about.page
+- doc/examples/website_styles/andreas03/src/default.css
+- doc/examples/website_styles/andreas03/src/default.template
+- doc/examples/website_styles/andreas03/src/download.page
+- doc/examples/website_styles/andreas03/src/features.page
+- doc/examples/website_styles/andreas03/src/images
+- doc/examples/website_styles/andreas03/src/images/bodybg.png
+- doc/examples/website_styles/andreas03/src/images/contbg.png
+- doc/examples/website_styles/andreas03/src/images/footerbg.png
+- doc/examples/website_styles/andreas03/src/images/gradient1.png
+- doc/examples/website_styles/andreas03/src/images/gradient2.png
+- doc/examples/website_styles/andreas03/src/index.page
+- doc/examples/website_styles/andreas03/src/screenshots.page
+- doc/examples/website_styles/andreas04
+- doc/examples/website_styles/andreas04/config.yaml
+- doc/examples/website_styles/andreas04/README
+- doc/examples/website_styles/andreas04/src
+- doc/examples/website_styles/andreas04/src/about.page
+- doc/examples/website_styles/andreas04/src/default.css
+- doc/examples/website_styles/andreas04/src/default.template
+- doc/examples/website_styles/andreas04/src/download.page
+- doc/examples/website_styles/andreas04/src/features.page
+- doc/examples/website_styles/andreas04/src/images
+- doc/examples/website_styles/andreas04/src/images/blinkarrow.gif
+- doc/examples/website_styles/andreas04/src/images/bodybg.png
+- doc/examples/website_styles/andreas04/src/images/contentbg.png
+- doc/examples/website_styles/andreas04/src/images/entrybg.png
+- doc/examples/website_styles/andreas04/src/images/flash.gif
+- doc/examples/website_styles/andreas04/src/images/flash2.gif
+- doc/examples/website_styles/andreas04/src/images/globe.gif
+- doc/examples/website_styles/andreas04/src/images/globebottom.gif
+- doc/examples/website_styles/andreas04/src/images/linkarrow.gif
+- doc/examples/website_styles/andreas04/src/images/menuhover.png
+- doc/examples/website_styles/andreas04/src/index.page
+- doc/examples/website_styles/andreas04/src/screenshots.page
+- doc/examples/website_styles/andreas05
+- doc/examples/website_styles/andreas05/config.yaml
+- doc/examples/website_styles/andreas05/README
+- doc/examples/website_styles/andreas05/src
+- doc/examples/website_styles/andreas05/src/about.page
+- doc/examples/website_styles/andreas05/src/default.css
+- doc/examples/website_styles/andreas05/src/default.template
+- doc/examples/website_styles/andreas05/src/download.page
+- doc/examples/website_styles/andreas05/src/features.page
+- doc/examples/website_styles/andreas05/src/images
+- doc/examples/website_styles/andreas05/src/images/bodybg.gif
+- doc/examples/website_styles/andreas05/src/images/front.png
+- doc/examples/website_styles/andreas05/src/index.page
+- doc/examples/website_styles/andreas05/src/screenshots.page
+- doc/examples/website_styles/andreas06
+- doc/examples/website_styles/andreas06/config.yaml
+- doc/examples/website_styles/andreas06/README
+- doc/examples/website_styles/andreas06/src
+- doc/examples/website_styles/andreas06/src/about.page
+- doc/examples/website_styles/andreas06/src/default.css
+- doc/examples/website_styles/andreas06/src/default.template
+- doc/examples/website_styles/andreas06/src/download.page
+- doc/examples/website_styles/andreas06/src/features.page
+- doc/examples/website_styles/andreas06/src/images
+- doc/examples/website_styles/andreas06/src/images/bodybg.gif
+- doc/examples/website_styles/andreas06/src/images/boxbg.gif
+- doc/examples/website_styles/andreas06/src/images/greypx.gif
+- doc/examples/website_styles/andreas06/src/images/header.jpg
+- doc/examples/website_styles/andreas06/src/images/innerbg.gif
+- doc/examples/website_styles/andreas06/src/images/leaves.jpg
+- doc/examples/website_styles/andreas06/src/images/tabs.gif
+- doc/examples/website_styles/andreas06/src/index.page
+- doc/examples/website_styles/andreas06/src/screenshots.page
+- doc/examples/website_styles/andreas07
+- doc/examples/website_styles/andreas07/config.yaml
+- doc/examples/website_styles/andreas07/README
+- doc/examples/website_styles/andreas07/src
+- doc/examples/website_styles/andreas07/src/about.page
+- doc/examples/website_styles/andreas07/src/browserfix.css
+- doc/examples/website_styles/andreas07/src/default.css
+- doc/examples/website_styles/andreas07/src/default.template
+- doc/examples/website_styles/andreas07/src/download.page
+- doc/examples/website_styles/andreas07/src/features.page
+- doc/examples/website_styles/andreas07/src/images
+- doc/examples/website_styles/andreas07/src/images/bodybg.gif
+- doc/examples/website_styles/andreas07/src/images/sidebarbg.gif
+- doc/examples/website_styles/andreas07/src/index.page
+- doc/examples/website_styles/andreas07/src/screenshots.page
+- doc/examples/website_styles/andreas08
+- doc/examples/website_styles/andreas08/config.yaml
+- doc/examples/website_styles/andreas08/README
+- doc/examples/website_styles/andreas08/src
+- doc/examples/website_styles/andreas08/src/about.page
+- doc/examples/website_styles/andreas08/src/default.css
+- doc/examples/website_styles/andreas08/src/default.template
+- doc/examples/website_styles/andreas08/src/download.page
+- doc/examples/website_styles/andreas08/src/features.page
+- doc/examples/website_styles/andreas08/src/index.page
+- doc/examples/website_styles/andreas08/src/screenshots.page
+- doc/examples/website_styles/andreas09
+- doc/examples/website_styles/andreas09/config.yaml
+- doc/examples/website_styles/andreas09/README
+- doc/examples/website_styles/andreas09/src
+- doc/examples/website_styles/andreas09/src/about.page
+- doc/examples/website_styles/andreas09/src/default.css
+- doc/examples/website_styles/andreas09/src/default.template
+- doc/examples/website_styles/andreas09/src/download.page
+- doc/examples/website_styles/andreas09/src/features.page
+- doc/examples/website_styles/andreas09/src/images
+- doc/examples/website_styles/andreas09/src/images/bodybg-black.jpg
+- doc/examples/website_styles/andreas09/src/images/bodybg-green.jpg
+- doc/examples/website_styles/andreas09/src/images/bodybg-orange.jpg
+- doc/examples/website_styles/andreas09/src/images/bodybg-purple.jpg
+- doc/examples/website_styles/andreas09/src/images/bodybg-red.jpg
+- doc/examples/website_styles/andreas09/src/images/bodybg.jpg
+- doc/examples/website_styles/andreas09/src/images/footerbg.jpg
+- doc/examples/website_styles/andreas09/src/images/menuhover-black.jpg
+- doc/examples/website_styles/andreas09/src/images/menuhover-green.jpg
+- doc/examples/website_styles/andreas09/src/images/menuhover-orange.jpg
+- doc/examples/website_styles/andreas09/src/images/menuhover-purple.jpg
+- doc/examples/website_styles/andreas09/src/images/menuhover-red.jpg
+- doc/examples/website_styles/andreas09/src/images/menuhover.jpg
+- doc/examples/website_styles/andreas09/src/index.page
+- doc/examples/website_styles/andreas09/src/screenshots.page
+- doc/examples/website_styles/default
+- doc/examples/website_styles/default/config.yaml
+- doc/examples/website_styles/default/README
+- doc/examples/website_styles/default/src
+- doc/examples/website_styles/default/src/about.page
+- doc/examples/website_styles/default/src/default.css
+- doc/examples/website_styles/default/src/default.template
+- doc/examples/website_styles/default/src/download.page
+- doc/examples/website_styles/default/src/features.page
+- doc/examples/website_styles/default/src/index.page
+- doc/examples/website_styles/default/src/screenshots.page
+- doc/examples/website_templates
+- doc/examples/website_templates/default
+- doc/examples/website_templates/default/config.yaml
+- doc/examples/website_templates/default/README
+- doc/examples/website_templates/default/src
+- doc/examples/website_templates/default/src/default.css
+- doc/examples/website_templates/default/src/default.template
+- doc/examples/website_templates/default/src/index.page
+- doc/examples/website_templates/personal_hp
+- doc/examples/website_templates/personal_hp/config.yaml
+- doc/examples/website_templates/personal_hp/README
+- doc/examples/website_templates/personal_hp/src
+- doc/examples/website_templates/personal_hp/src/about.page
+- doc/examples/website_templates/personal_hp/src/default.css
+- doc/examples/website_templates/personal_hp/src/default.template
+- doc/examples/website_templates/personal_hp/src/index.page
+- doc/examples/website_templates/personal_hp/src/links.page
+- doc/examples/website_templates/personal_hp/src/projects.page
+- doc/examples/website_templates/project
+- doc/examples/website_templates/project/config.yaml
+- doc/examples/website_templates/project/README
+- doc/examples/website_templates/project/src
+- doc/examples/website_templates/project/src/about.page
+- doc/examples/website_templates/project/src/default.css
+- doc/examples/website_templates/project/src/default.template
+- doc/examples/website_templates/project/src/download.page
+- doc/examples/website_templates/project/src/features.page
+- doc/examples/website_templates/project/src/index.page
+- doc/examples/website_templates/project/src/screenshots.page
 - doc/metainfo.yaml
 - doc/plugin
 - doc/plugin/emoticon.rb
 - doc/plugin/extension.rb
+- doc/plugin/gallery
+- doc/plugin/gallery/default
+- doc/plugin/gallery/slides
+- doc/plugin/gallery/slides/collage.rb
 - doc/plugin/listpluginparameters.rb
 - doc/plugin/resources.rb
 - doc/src
@@ -562,6 +775,18 @@ files:
 - doc/src/examples/example_sites/index.page
 - doc/src/examples/example_sites/personal.zip
 - doc/src/examples/example_sites/photo_gallery.zip
+- doc/src/examples/gallery_styles
+- doc/src/examples/gallery_styles/default
+- doc/src/examples/gallery_styles/default/default.gallery
+- doc/src/examples/gallery_styles/default/gallery_gallery.template
+- doc/src/examples/gallery_styles/default/gallery_image.template
+- doc/src/examples/gallery_styles/default/gallery_main.template
+- doc/src/examples/gallery_styles/index.page
+- doc/src/examples/gallery_styles/slides
+- doc/src/examples/gallery_styles/slides/gallery_gallery.template
+- doc/src/examples/gallery_styles/slides/gallery_image.template
+- doc/src/examples/gallery_styles/slides/gallery_main.template
+- doc/src/examples/gallery_styles/slides/slides.gallery
 - doc/src/examples/images
 - doc/src/examples/images/image01.jpg
 - doc/src/examples/images/image02.jpg
@@ -582,6 +807,35 @@ files:
 - doc/src/examples/images/image17.jpg
 - doc/src/examples/images/image18.jpg
 - doc/src/examples/index.page
+- doc/src/examples/sipttra_styles
+- doc/src/examples/sipttra_styles/default
+- doc/src/examples/sipttra_styles/default/css
+- doc/src/examples/sipttra_styles/default/css/sipttra.rcss
+- doc/src/examples/sipttra_styles/default/default.template
+- doc/src/examples/sipttra_styles/default/index.todo
+- doc/src/examples/sipttra_styles/default/js
+- doc/src/examples/sipttra_styles/default/js/sipttra.js
+- doc/src/examples/sipttra_styles/default/sipttra.template
+- doc/src/examples/sipttra_styles/default.page
+- doc/src/examples/sipttra_styles/index.page
+- doc/src/examples/website_styles
+- doc/src/examples/website_styles/1024px.page
+- doc/src/examples/website_styles/andreas00.page
+- doc/src/examples/website_styles/andreas01.page
+- doc/src/examples/website_styles/andreas03.page
+- doc/src/examples/website_styles/andreas04.page
+- doc/src/examples/website_styles/andreas05.page
+- doc/src/examples/website_styles/andreas06.page
+- doc/src/examples/website_styles/andreas07.page
+- doc/src/examples/website_styles/andreas08.page
+- doc/src/examples/website_styles/andreas09.page
+- doc/src/examples/website_styles/default.page
+- doc/src/examples/website_styles/index.page
+- doc/src/examples/website_templates
+- doc/src/examples/website_templates/default.page
+- doc/src/examples/website_templates/index.page
+- doc/src/examples/website_templates/personal_hp.page
+- doc/src/examples/website_templates/project.page
 - doc/src/features.page
 - doc/src/images
 - doc/src/images/bodybg.jpg