webgen 0.4.6 → 0.4.7

data/ChangeLog

@@ -1,44 +1,46 @@
 ----------------------------------------------------------------------
-r171:  thomasleitner | 2007-09-08 11:38:30 +0200
+r395:  thomasleitner | 2007-12-31 10:38:24 +0100
 Changed paths:
-  M  /local/webgen/trunk/THANKS
+  M  /local/webgen/trunk/TODO
   M  /local/webgen/trunk/doc/src/default.template
+  M  /local/webgen/trunk/doc/src/documentation/plugins/core/filehandler.page
   M  /local/webgen/trunk/doc/src/news.page
+  M  /local/webgen/trunk/doc/src/project.todo
+  M  /local/webgen/trunk/lib/webgen/plugins/filehandlers/filehandler.rb
 
-* added news entry for 0.4.6 release
-* updated THANKS file
+* fixed bug T025: Core/FileHandler and file handler plugins are now aware of hidden files if Core/FileHandler:useHiddenFiles is set to true
+* updated documentation
 ----------------------------------------------------------------------
-r170:  thomasleitner | 2007-09-08 11:28:35 +0200
+r394:  thomasleitner | 2007-12-31 10:33:18 +0100
 Changed paths:
-  M  /local/webgen/trunk/lib/webgen/plugins/filehandlers/page.rb
+  M  /local/webgen/trunk/lib/webgen/plugins/filehandlers/gallery.rb
+  M  /local/webgen/trunk/test/unittests/tc_filehandler_gallery.rb
 
-* bug fix by Andrea Ferro for meta info handling in File/PageHandler
+* fixed failing File/ThumbnailWriter test case
 ----------------------------------------------------------------------
-r169:  thomasleitner | 2007-09-08 11:24:53 +0200
+r353:  thomasleitner | 2007-12-17 07:58:15 +0100
 Changed paths:
-  M  /local/webgen/trunk/lib/webgen/config.rb
+  M  /local/webgen/trunk/data/webgen/gallery_styles/slides/collage.rb
+  M  /local/webgen/trunk/data/webgen/gallery_styles/slides/gallery_gallery.template
+  M  /local/webgen/trunk/data/webgen/gallery_styles/slides/gallery_image.template
+  M  /local/webgen/trunk/data/webgen/gallery_styles/slides/gallery_main.template
+  M  /local/webgen/trunk/doc/src/documentation/plugins/file/galleryhandler.page
+  M  /local/webgen/trunk/doc/src/project.todo
+  M  /local/webgen/trunk/lib/webgen/plugins/filehandlers/gallery.rb
+  M  /local/webgen/trunk/test/unittests/tc_filehandler_gallery.rb
 
-* bumped version number to 0.4.6
+* fixed bug T027: File/GalleryHandler is now multi-lingual aware, ie. it is possible to create a gallery in multiple languages, updated docu and tests accordingly
 ----------------------------------------------------------------------
-r168:  thomasleitner | 2007-09-08 11:24:06 +0200
+r352:  thomasleitner | 2007-12-15 09:34:01 +0100
 Changed paths:
-  M  /local/webgen/branches/head/data/webgen/plugins/core/filehandler.plugin/docu_filehandler.page
-  M  /local/webgen/branches/head/data/webgen/plugins/core/filehandler.plugin/filehandler.rb
-  M  /local/webgen/branches/head/lib/webgen/node.rb
-  M  /local/webgen/branches/head/test/unittests/tc_node.rb
-  M  /local/webgen/trunk/doc/src/documentation/plugins/core/filehandler.page
-  M  /local/webgen/trunk/lib/webgen/node.rb
-  M  /local/webgen/trunk/lib/webgen/plugins/filehandlers/filehandler.rb
-  M  /local/webgen/trunk/lib/webgen/plugins/filehandlers/gallery.rb
-  M  /local/webgen/trunk/lib/webgen/plugins/filehandlers/page.rb
+  M  /local/webgen/trunk/doc/src/documentation/plugins/file/galleryhandler.page
+  M  /local/webgen/trunk/doc/src/project.todo
 
-* fixed bug RF#13757 in trunk and head: src path with special characters is now handled correctly
-* documented which characters must not be used in directory and file names
+* fixed typo spotted by Phil Hughes
 ----------------------------------------------------------------------
-r159:  thomasleitner | 2007-08-20 11:49:35 +0200
+r325:  thomasleitner | 2007-12-07 16:25:52 +0100
 Changed paths:
-  A  /local
-  A  /local/webgen (from /mirror/webgen:158)
-
+  A  /local/webgen (from /mirror/webgen:322)
 
+* fresh start
 ----------------------------------------------------------------------

data/TODO

@@ -1,5 +1,6 @@
 ---- CURRENT ----
 
+* bug in menu style section: should work although page is not in menu, should either be totally independent from Tag/Menu or better integrated
 * modify WebSite to allow better use (factor out loading of plugins into own method, do not call init in #render method, ...)
 * show error message when configuration file is invalid (Webgen::WebSite)
 * add a common class to the menu element (either a or span, depending on Fil/DefaultFileHandler:linkToCurrentPage) for easier referencing in CSS styles (update menu CSS style afterwards for horiz-dd, vert-dd, ...)

data/VERSION

@@ -1 +1 @@
-0.4.6
+0.4.7

data/data/webgen/gallery_styles/slides/collage.rb

@@ -71,7 +71,7 @@ module Collage
     #######
 
     def collage_title( ginfo )
-      ginfo['title'].tr( ' ', '_' )
+      ginfo['filename'].tr( ' ', '_' )
     end
 
     def collage_name( ginfo )

data/data/webgen/gallery_styles/slides/gallery_gallery.template

@@ -14,7 +14,7 @@ else
     <% if ginfo.prev_gallery %>
     <a href="{relocatable: <%= ginfo.prev_gallery.pagename %>}">
       &lt;&lt; previous gallery
-      <span class="thumb thumb-<%= ginfo['title'].tr(' ', '_') %>">
+      <span class="thumb thumb-<%= ginfo['filename'].tr(' ', '_') %>">
         <%= ginfo.prev_gallery.thumbnail('style'=>'vertical-align: middle', 'class'=>'webgen-gallery-thumbnail') %>
       </span>
     </a>
@@ -29,7 +29,7 @@ else
     <% if ginfo.next_gallery %>
     <a href="{relocatable: <%= ginfo.next_gallery.pagename %>}">
       next gallery &gt;&gt;
-      <span class="thumb thumb-<%= ginfo['title'].tr(' ', '_') %>">
+      <span class="thumb thumb-<%= ginfo['filename'].tr(' ', '_') %>">
         <%= ginfo.next_gallery.thumbnail('style'=>'vertical-align: middle', 'class'=>'webgen-gallery-thumbnail') %>
       </span>
     </a>
@@ -44,7 +44,7 @@ else
   <% row_index.upto( [row_index + 4, ginfo.cur_gallery.images.length - 1].min ) do |col_index|%>
     <td align="center">
       <a href="{relocatable: <%= ginfo.cur_gallery.images[col_index].pagename %>}">
-        <span class="thumb thumb-<%= ginfo['title'].tr(' ', '_') %>">
+        <span class="thumb thumb-<%= ginfo['filename'].tr(' ', '_') %>">
           <%= ginfo.cur_gallery.images[col_index].thumbnail('class'=>'webgen-gallery-thumbnail') %>
        </span>
        <br />

data/data/webgen/gallery_styles/slides/gallery_image.template

@@ -14,7 +14,7 @@ else
     <% if ginfo.prev_image %>
     <a href="{relocatable: <%= ginfo.prev_image.pagename %>}">
       &lt;&lt; previous image
-      <span class="thumb thumb-<%= ginfo['title'].tr(' ', '_') %>">
+      <span class="thumb thumb-<%= ginfo['filename'].tr(' ', '_') %>">
         <%= ginfo.prev_image.thumbnail('style'=>'vertical-align: middle', 'class'=>'webgen-gallery-thumbnail') %>
       </span>
     </a>
@@ -22,7 +22,7 @@ else
   </td>
   <td style="width: 34%; padding: 2px;" valign="top" align="center">
     <a href="{relocatable: <%= ginfo.cur_gallery.pagename %>}">
-      <span class="thumb thumb-<%= ginfo['title'].tr(' ', '_') %>">
+      <span class="thumb thumb-<%= ginfo['filename'].tr(' ', '_') %>">
         <%= ginfo.cur_gallery.thumbnail('class'=>'webgen-gallery-thumbnail') %>
       </span>
       ^<%= ginfo.cur_gallery.title %>^
@@ -32,7 +32,7 @@ else
     <% if ginfo.next_image %>
     <a href="{relocatable: <%= ginfo.next_image.pagename %>}">
       next image &gt;&gt;
-      <span class="thumb thumb-<%= ginfo['title'].tr(' ', '_') %>">
+      <span class="thumb thumb-<%= ginfo['filename'].tr(' ', '_') %>">
         <%= ginfo.next_image.thumbnail('style'=>'vertical-align: middle', 'class'=>'webgen-gallery-thumbnail') %>
       </span>
     </a>

data/data/webgen/gallery_styles/slides/gallery_main.template

@@ -15,7 +15,7 @@ else
   <% row_index.upto( [row_index + 4, ginfo.galleries.length - 1].min ) do |col_index| %>
     <td align="center">
       <a href="{relocatable: <%= ginfo.galleries[col_index].pagename %>}">
-        <span class="thumb thumb-<%= ginfo['title'].tr(' ', '_') %>">
+        <span class="thumb thumb-<%= ginfo['filename'].tr(' ', '_') %>">
           <%= ginfo.galleries[col_index].thumbnail('class'=>'webgen-gallery-thumbnail') %>
         </span>
         <br />

data/doc/plugin/gallery/slides/collage.rb

@@ -71,7 +71,7 @@ module Collage
     #######
 
     def collage_title( ginfo )
-      ginfo['title'].tr( ' ', '_' )
+      ginfo['filename'].tr( ' ', '_' )
     end
 
     def collage_name( ginfo )

data/doc/src/default.template

@@ -48,6 +48,10 @@
 
         <div id="rightside">
           <h1>Latest news</h1>
+          <p><strong>2007-12-31: </strong>
+            Minor release with feature enhancements.
+            <a href="{relocatable: news.en.page#news-2007-12-31}">More...</a>
+          </p>
           <p><strong>2007-09-08: </strong>
             Small bug fix release.
             <a href="{relocatable: news.en.page#news-2007-09-08}">More...</a>
@@ -56,10 +60,6 @@
             Some bug fixes and one small feature enhancement.
             <a href="{relocatable: news.en.page#news-2007-06-29}">More...</a>
           </p>
-          <p><strong>2007-05-20: </strong>
-            Fixed bug which prevented installation via Rubygems.
-            <a href="{relocatable: news.en.page#news-2007-05-20}">More...</a>
-          </p>
 
           <h1>Links</h1>
           <ul class="linklist">

data/doc/src/documentation/plugins/contentconverter/haml.page

@@ -0,0 +1,21 @@
+---
+title: Haml
+inMenu: true
+template: /plugin.template
+plugin: ContentConverter/Haml
+---
+h2(#description). Description
+
+
+Converts content written using Haml markup
+("Homepage":http://haml.hamptoncatlin.com/) to HTML.
+
+
+h2(#caveat). Caveat
+
+
+This plugin is only available if you have installed the
+"haml":http://haml.hamptoncatlin.com/ library. The preferred way to do this is via
+Rubygems:
+
+  gem install haml

data/doc/src/documentation/plugins/contentconverter/sass.page

@@ -0,0 +1,36 @@
+---
+title: Sass
+inMenu: true
+template: /plugin.template
+plugin: ContentConverter/Sass
+---
+h2(#description). Description
+
+
+Converts content written using Sass markup ("Homepage":http://haml.hamptoncatlin.com/) to CSS. This
+content converter is only useful for writing CSS page files. You have to make sure to change the
+output name style sothat the extension @css@ is used and to stop the template chain - see the
+example below!
+
+You can use the following page file as a template for your sass files:
+
+<pre>
+\---
+outputNameStyle: [:name, [., :lang], .css]
+template: ~
+validator: ~
+\--- content, sass
+p
+  :background-color grey
+  :padding 5px
+</pre>
+
+
+h2(#caveat). Caveat
+
+
+This plugin is only available if you have installed the
+"haml":http://haml.hamptoncatlin.com/ library. The preferred way to do this is via
+Rubygems:
+
+  gem install haml

data/doc/src/documentation/plugins/core/filehandler.page

@@ -27,7 +27,7 @@ h2(#filehandling). Handling of files in the source directory
 Following is the list of rules how files in the source directory are handled by webgen:
 
 # All file/directory names in the source directory are fetched (actually, only those file/directory
-  names without a leading dot)
+  names without a leading dot unless {param: Core/FileHandler:useHiddenFiles} is set to @true@)
 # Those files which match an {param: Core/FileHandler:ignorePaths} pattern are excluded
 # The path patterns for each file handler plugin are matched against the remaining files and all
   matching files are then handled by the file handler plugin

data/doc/src/documentation/plugins/file/galleryhandler.page

@@ -81,8 +81,12 @@ using the name of a gallery handler parameter as key you can override its value.
 following keys are used by the gallery handler:
 
 * *title*: The title of the gallery. If this key is not specified, the capitalized file name is used.
+* *filename*: The base filename used for creating the page files. If not specified it is created from
+  the title.
+* *lang*: The language used by the gallery. If not specified, the default language is used.
 * *mainPageMetaInfo*: Used for setting additional meta information for the main page.
 * *galleryPagesMetaInfo*: Used for setting additional meta information for the gallery pages.
+* *imagePagesMetaInfo*: Used for setting additional meta information for all image pages.
 * *layouter*: Plugin used for additional gallery tasks, has to be registered under
   @GalleryLayouter/<layouter-name>@
 * *thumbnailSize*: The size of the thumbnails, can also be set individually for each image.
@@ -98,6 +102,11 @@ be used the whole image gallery. These images have to be somewhere in the websit
 You can/should not specify images outside the source directory as these images are not automatically
 copied to the output directory and automatic thumbnail creation may not work correctly!
 
+If you want to create a multi-lingual gallery, you need to create two gallery files which specify
+the same @filename@ key and different @lang@ keys. It's best to first create one gallery file, fill
+in all the information and then copy it and change the @filename@ and @lang@ keys as well as all the
+other language specific information like titles and descriptions.
+
 All other key-value pairs specified are not used by webgen. However, as layouter plugins have access
 to the whole configuration section they may use their own configuration keys.
 
@@ -163,7 +172,7 @@ example/dir1/img1.jpg:
     title: Test title
     description: Long description of image
 
-example/img2.jpg
+example/img2.jpg:
     title: Title2 of pic
     mykey: mydata
 </pre>

data/doc/src/examples/gallery_styles/slides/gallery_gallery.template

@@ -14,7 +14,7 @@ else
     <% if ginfo.prev_gallery %>
     <a href="{relocatable: <%= ginfo.prev_gallery.pagename %>}">
       &lt;&lt; previous gallery
-      <span class="thumb thumb-<%= ginfo['title'].tr(' ', '_') %>">
+      <span class="thumb thumb-<%= ginfo['filename'].tr(' ', '_') %>">
         <%= ginfo.prev_gallery.thumbnail('style'=>'vertical-align: middle', 'class'=>'webgen-gallery-thumbnail') %>
       </span>
     </a>
@@ -29,7 +29,7 @@ else
     <% if ginfo.next_gallery %>
     <a href="{relocatable: <%= ginfo.next_gallery.pagename %>}">
       next gallery &gt;&gt;
-      <span class="thumb thumb-<%= ginfo['title'].tr(' ', '_') %>">
+      <span class="thumb thumb-<%= ginfo['filename'].tr(' ', '_') %>">
         <%= ginfo.next_gallery.thumbnail('style'=>'vertical-align: middle', 'class'=>'webgen-gallery-thumbnail') %>
       </span>
     </a>
@@ -44,7 +44,7 @@ else
   <% row_index.upto( [row_index + 4, ginfo.cur_gallery.images.length - 1].min ) do |col_index|%>
     <td align="center">
       <a href="{relocatable: <%= ginfo.cur_gallery.images[col_index].pagename %>}">
-        <span class="thumb thumb-<%= ginfo['title'].tr(' ', '_') %>">
+        <span class="thumb thumb-<%= ginfo['filename'].tr(' ', '_') %>">
           <%= ginfo.cur_gallery.images[col_index].thumbnail('class'=>'webgen-gallery-thumbnail') %>
        </span>
        <br />

data/doc/src/examples/gallery_styles/slides/gallery_image.template

@@ -14,7 +14,7 @@ else
     <% if ginfo.prev_image %>
     <a href="{relocatable: <%= ginfo.prev_image.pagename %>}">
       &lt;&lt; previous image
-      <span class="thumb thumb-<%= ginfo['title'].tr(' ', '_') %>">
+      <span class="thumb thumb-<%= ginfo['filename'].tr(' ', '_') %>">
         <%= ginfo.prev_image.thumbnail('style'=>'vertical-align: middle', 'class'=>'webgen-gallery-thumbnail') %>
       </span>
     </a>
@@ -22,7 +22,7 @@ else
   </td>
   <td style="width: 34%; padding: 2px;" valign="top" align="center">
     <a href="{relocatable: <%= ginfo.cur_gallery.pagename %>}">
-      <span class="thumb thumb-<%= ginfo['title'].tr(' ', '_') %>">
+      <span class="thumb thumb-<%= ginfo['filename'].tr(' ', '_') %>">
         <%= ginfo.cur_gallery.thumbnail('class'=>'webgen-gallery-thumbnail') %>
       </span>
       ^<%= ginfo.cur_gallery.title %>^
@@ -32,7 +32,7 @@ else
     <% if ginfo.next_image %>
     <a href="{relocatable: <%= ginfo.next_image.pagename %>}">
       next image &gt;&gt;
-      <span class="thumb thumb-<%= ginfo['title'].tr(' ', '_') %>">
+      <span class="thumb thumb-<%= ginfo['filename'].tr(' ', '_') %>">
         <%= ginfo.next_image.thumbnail('style'=>'vertical-align: middle', 'class'=>'webgen-gallery-thumbnail') %>
       </span>
     </a>

data/doc/src/examples/gallery_styles/slides/gallery_main.template

@@ -15,7 +15,7 @@ else
   <% row_index.upto( [row_index + 4, ginfo.galleries.length - 1].min ) do |col_index| %>
     <td align="center">
       <a href="{relocatable: <%= ginfo.galleries[col_index].pagename %>}">
-        <span class="thumb thumb-<%= ginfo['title'].tr(' ', '_') %>">
+        <span class="thumb thumb-<%= ginfo['filename'].tr(' ', '_') %>">
           <%= ginfo.galleries[col_index].thumbnail('class'=>'webgen-gallery-thumbnail') %>
         </span>
         <br />

data/doc/src/news.page

@@ -4,6 +4,18 @@ inMenu: true
 ---
 h2. News
 
+
+h3(#news-2007-12-31). 31.12.2007 - webgen 0.4.7
+
+Minor release with feature enhancements:
+
+* added support for Haml markup {plugin: ContentConverter/Haml}
+* added support for Sass markup {plugin: ContentConverter/Sass}
+* gallery file handler is now multilingual aware
+* hidden files can now be used by the file handler plugins if the parameter {param:
+  Core/FileHandler:useHiddenFiles} is set to true
+
+
 h3(#news-2007-09-08). 08.09.2007 - webgen 0.4.6
 
 This is a bug fix release:

data/doc/src/project.todo

@@ -9,6 +9,8 @@ The following category defines all milestones for webgen:
 
 ###### Milestones ######
 
+* Dez07 (2007-12-31) Bug fixes and small enhancements
+
 * Jun07 (2007-06-30) Bug fixes
 
 * Apr07 (2007-04-30) Bug fixes and small enhancements
@@ -35,16 +37,18 @@ Categories for implementation issues:
 ###### Implementation (open) ######
 
 
-* T002 [F] add localization support for all files
-  See also FR#7891
+## Implementation (closed) ##
 
 * T003 [F] add additional tests for sipttra implementation
+  done in the next major version of webgen 0.5.0
 
 * T023 [F] Add the possibility to add a prefix to webgen tags
   If the prefix is wg then a tag should look like \\{wg:menu:} or \\{wg:relocatable: default.css}
+  this is available in the next major version 0.5.0
 
-
-## Implementation (closed) ##
+* T002 [F] add localization support for all files
+  See also FR#7891
+  This is available in the next major version 0.5.0
 
 * T004 [Feb07] use HTML as default format for templates
   See also FR#7893
@@ -68,6 +72,14 @@ Categories for implementation issues:
 
 ## Bugs (closed) ##
 
+* T026 [Dez07] make Core/FileHandler aware of hidden files
+  use a parameter to enable usage of hidden files or enable it by default
+
+  now using a parameter Core/FileHandler:useHiddenFiles which is false by default
+
+* T027 [Dez07]  make gallery file handler multi-lingual aware
+  see mail exchange with Phil Hughes
+
 * T005 [Feb07] check all styles for correctly selected menu items
   style issues because of new span element when File/DefaultHandler:linkToCurrentPage is false
 
@@ -116,12 +128,12 @@ Category for documentation issues:
 ###### Documentation (open) ######
 
 
+## Documentation (closed) ##
+
 * T014 [F] add plugin developer documentation
   - document how to write various plugins (file handler, tag, CLI command, ...)
   - caveat when using classes in modules
-
-
-## Documentation (closed) ##
+  --> done in version 0.5.0
 
 * T010 [Feb07] add some example sites
   It was requested that one should be able to download some zipped examples sites from the examples

data/lib/webgen/config.rb

@@ -24,7 +24,7 @@ require 'rbconfig'
 
 module Webgen
 
-  VERSION = [0, 4, 6]
+  VERSION = [0, 4, 7]
   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/plugins/contentconverters/haml.rb

@@ -0,0 +1,71 @@
+#
+#--
+#
+# $Id: markdown.rb 531 2006-11-17 17:56:14Z thomas $
+#
+# webgen: template based static website generator
+# Copyright (C) 2004 Thomas Leitner
+#
+# This program is free software; you can redistribute it and/or modify it under the terms of the GNU
+# General Public License as published by the Free Software Foundation; either version 2 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with this program; if not,
+# write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+#++
+#
+
+load_optional_part( 'content-converter-haml-sass',
+                    :needed_gems => ['haml'],
+                    :error_msg => "Haml and sass not available as content format as the haml library could not be loaded",
+                    :info => "Haml/Sass can be used as content format" ) do
+
+  require 'haml'
+  load_plugin 'webgen/plugins/contentconverters/default'
+
+  module ContentConverters
+
+    class HamlConverter < DefaultContentConverter
+
+      infos( :name => 'ContentConverter/Haml',
+             :author => Webgen::AUTHOR,
+             :summary => "Handles content formatted in Haml format"
+             )
+
+      register_handler 'haml'
+
+      def call( content )
+        Haml::Engine.new( content ).render
+      rescue Exception => e
+        log(:error) { "Error converting Haml text to HTML: #{e.message}" }
+        content
+      end
+
+    end
+
+    class SassConverter < DefaultContentConverter
+
+      infos( :name => 'ContentConverter/Sass',
+             :author => Webgen::AUTHOR,
+             :summary => "Handles content formatted in Sass format"
+             )
+
+      register_handler 'sass'
+
+      def call( content )
+        Sass::Engine.new( content ).render
+      rescue Exception => e
+        log(:error) { "Error converting Sass text to HTML: #{e.message}" }
+        content
+      end
+
+    end
+
+  end
+
+end

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

@@ -54,6 +54,8 @@ module FileHandlers
     param 'defaultMetaInfo', {}, 'The keys for this hash are the names of file handlers, the ' +
       'values hashes with meta data.'
 
+    param 'useHiddenFiles', false, 'Files starting with a dot can also used by the file handler plugins if set to true.'
+
     depends_on 'Core/Configuration'
 
     include Listener
@@ -283,7 +285,7 @@ module FileHandlers
 
     # Returns an array of files of the source directory matching +pattern+
     def files_for_pattern( pattern )
-      files = Dir.glob( File.join( param( 'srcDir', 'Core/Configuration' ), pattern ), File::FNM_CASEFOLD ).to_set
+      files = Dir.glob( File.join( param( 'srcDir', 'Core/Configuration' ), pattern ), (param('useHiddenFiles') ? File::FNM_DOTMATCH : 0) | File::FNM_CASEFOLD ).to_set
       files.delete( File.join( param( 'srcDir', 'Core/Configuration' ), '/' ) )
       files.collect!  do |f|
         f = f.sub( /([^.])\.{1,2}$/, '\1' ) # remove '.' and '..' from end of paths

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

@@ -139,7 +139,7 @@ module FileHandlers
       # The main page object if it exists; otherwise +nil+.
       attr_accessor :mainpage
 
-      # The whole data hahs for the image gallery.
+      # The whole data hash for the image gallery.
       attr_reader :data
 
       def initialize( gallery_data, gIndex = nil, iIndex = nil )
@@ -247,6 +247,8 @@ module FileHandlers
       end
 
       @filedata['title'] ||= File.basename( file, '.*' ).capitalize
+      @filedata['filename'] ||= @filedata['title'].downcase
+      @filedata['lang'] ||= param( 'lang', 'Core/Configuration' )
       log(:info) { "Creating gallery for file <#{file}> with #{images.length} images" }
       ginfo = create_gallery( images, parent )
       @plugin_manager["GalleryLayouter/#{@filedata['layouter']}"].handle_gallery( ginfo, parent ) if @filedata.has_key?('layouter') && @plugin_manager["GalleryLayouter/#{@filedata['layouter']}"]
@@ -268,6 +270,7 @@ module FileHandlers
     end
 
     def page_data( metainfo )
+      metainfo['lang'] = @filedata['lang']
       temp = metainfo.to_yaml
       temp = "---\n" + temp unless /^---\s*$/ =~ temp
       "#{temp}\n---\n"
@@ -293,7 +296,7 @@ module FileHandlers
       gallery_data['imagesPerPage'] = param('imagesPerPage'),
 
       if main_page_used
-        main_node = create_page_node( gallery_file_name( main_data['title'] ), parent, page_data( main_data ) )
+        main_node = create_page_node( gallery_file_name( @filedata['filename'] ), parent, page_data( main_data ) )
         main_page = GalleryInfo::MainPage.new( main_node.path, main_data )
         main_node.node_info[:ginfo] = GalleryInfo.new( gallery_data )
         main_node.node_info[:ginfo].mainpage = main_page
@@ -328,15 +331,17 @@ module FileHandlers
         data = (@filedata['galleryPagesMetaInfo'] || {}).dup
         data['template'] ||= param( 'galleryPageTemplate' )
         data['orderInfo'] += gIndex if data['orderInfo']
-        data['title'] = @filedata['title'] + ' ' + gIndex.to_s
+        data['title'] = (data['title'] || @filedata['title']) + ' ' + gIndex.to_s
+        filename = @filedata['filename'] + ' ' + gIndex.to_s
 
         if images.length <= param( 'imagesPerPage' ) && gIndex == 1
           template = data['template']
           data.update( main_page_data )
           data['template'] = template
+          filename = @filedata['filename']
         end
 
-        node = create_page_node( gallery_file_name( data['title'] ), parent, page_data( data ) )
+        node = create_page_node( gallery_file_name( filename ), parent, page_data( data ) )
         gal_images = create_image_pages( images[i..(i + picsPerPage - 1)], parent )
         gallery = GalleryInfo::Gallery.new( node.path, data, gal_images.collect {|n,i| i} )
         galleries << [node, gallery, gal_images]
@@ -351,7 +356,8 @@ module FileHandlers
     def create_image_pages( images, parent )
       imageList = []
       images.each do |image|
-        data = (@imagedata[image] || {}).dup
+        data = (@filedata['imagePagesMetaInfo'] || {}).dup
+        data.update( @imagedata[image] || {} )
         data['template'] ||= param( 'imagePageTemplate' )
         data['title'] ||= "Image #{File.basename( image )}"
         data['thumbnailSize'] ||= @filedata['thumbnailSize']
@@ -364,7 +370,7 @@ module FileHandlers
           data['thumbnail'] ||= thumbnail_for( image, data, parent )
         end
 
-        filename = @filedata['title'] + ' ' + image
+        filename = @filedata['filename'] + ' ' + image
         node = create_page_node( gallery_file_name( filename ), parent, page_data( data ) )
         image = GalleryInfo::Image.new( node.path, data, image )
         imageList << [node, image]
@@ -435,7 +441,7 @@ module FileHandlers
 
       def create_node( file, parent, meta_info, thumbnailSize = nil, method = nil )
         name = 'tn_' + File.basename( file ).tr( ' ', '_' )
-        if !(node = parent.find {|c| c =~ name })
+        if !parent || !(node = parent.find {|c| c =~ name })
           node = Node.new( parent, name )
           node.meta_info.update( meta_info )
           node['title'] = node.path

data/test/unittests/tc_filehandler_gallery.rb

@@ -88,41 +88,41 @@ class GalleryFileHandlerTest < Webgen::PluginTestCase
 
     # with a main page
     assert_nil( @plugin.create_node( fixture_path( 'test.gallery' ), root, {} ) )
-    assert_not_nil( root.resolve_node( 'Test.page' ) )
-    assert_not_nil( root.resolve_node( 'Test_1.page' ) )
-    assert_not_nil( root.resolve_node( 'Test_2.page' ) )
-    assert_not_nil( root.resolve_node( 'Test_test1_jpg.page' ) )
-    assert_not_nil( root.resolve_node( 'Test_test2_jpg.page' ) )
-    assert_not_nil( root.resolve_node( 'Test_test3_jpg.page' ) )
-    assert_not_nil( root.resolve_node( 'Test_test4_jpg.page' ) )
-
-    node = root.resolve_node( 'Test_test3_jpg.page' )
+    assert_not_nil( root.resolve_node( 'test.page' ) )
+    assert_not_nil( root.resolve_node( 'test_1.page' ) )
+    assert_not_nil( root.resolve_node( 'test_2.page' ) )
+    assert_not_nil( root.resolve_node( 'test_test1_jpg.page' ) )
+    assert_not_nil( root.resolve_node( 'test_test2_jpg.page' ) )
+    assert_not_nil( root.resolve_node( 'test_test3_jpg.page' ) )
+    assert_not_nil( root.resolve_node( 'test_test4_jpg.page' ) )
+
+    node = root.resolve_node( 'test_test3_jpg.page' )
     assert_kind_of( ginfoclass, node.node_info[:ginfo] )
     assert_equal( 'test3.jpg', node.node_info[:ginfo].cur_image.filename )
     assert_equal( node.path, node.node_info[:ginfo].cur_image.pagename )
     assert_equal( 'gallery_image.template', node['template'] )
 
-    node = root.resolve_node( 'Test_2.page' )
+    node = root.resolve_node( 'test_2.page' )
     assert_kind_of( ginfoclass, node.node_info[:ginfo] )
     assert_equal( node.path, node.node_info[:ginfo].cur_gallery.pagename )
     assert_equal( 'gallery_gallery.template', node['template'] )
 
-    node = root.resolve_node( 'Test.page' )
+    node = root.resolve_node( 'test.page' )
     assert_kind_of( ginfoclass, node.node_info[:ginfo] )
     assert_equal( 'gallery_main.template', node['template'] )
 
     # without a main page
     root.del_children
     @plugin.create_node( fixture_path( 'test1.gallery' ), root, {} )
-    assert_not_nil( root.resolve_node( 'Test1.page' ) )
-    assert_nil( root.resolve_node( 'Test1_1.page' ) )
-    assert_nil( root.resolve_node( 'Test1_2.page' ) )
-    assert_not_nil( root.resolve_node( 'Test1_test1_jpg.page' ) )
-    assert_not_nil( root.resolve_node( 'Test1_test2_jpg.page' ) )
-    assert_not_nil( root.resolve_node( 'Test1_test3_jpg.page' ) )
-    assert_not_nil( root.resolve_node( 'Test1_test4_jpg.page' ) )
-
-    node = root.resolve_node( 'Test1.page' )
+    assert_not_nil( root.resolve_node( 'test1.page' ) )
+    assert_nil( root.resolve_node( 'test1_1.page' ) )
+    assert_nil( root.resolve_node( 'test1_2.page' ) )
+    assert_not_nil( root.resolve_node( 'test1_test1_jpg.page' ) )
+    assert_not_nil( root.resolve_node( 'test1_test2_jpg.page' ) )
+    assert_not_nil( root.resolve_node( 'test1_test3_jpg.page' ) )
+    assert_not_nil( root.resolve_node( 'test1_test4_jpg.page' ) )
+
+    node = root.resolve_node( 'test1.page' )
     assert_kind_of( ginfoclass, node.node_info[:ginfo] )
     assert_equal( 'gallery_gallery.template', node['template'] )
   end
@@ -156,7 +156,7 @@ begin
       tn_node = root.resolve_node( 'tn_test1.jpg' )
       assert_not_nil( tn_node )
       assert_equal( fixture_path( 'test1.jpg' ), tn_node.node_info[:thumbnail_file] )
-      assert_equal( tn_node.absolute_path, root.resolve_node( 'Test_test1_jpg.page' ).node_info[:ginfo].cur_image.data['thumbnail'] )
+      assert_equal( tn_node.absolute_path, root.resolve_node( 'test_test1_jpg.page' ).node_info[:ginfo].cur_image.data['thumbnail'] )
     end
 
   end

metadata

@@ -1,33 +1,43 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.2
-specification_version: 1
 name: webgen
 version: !ruby/object:Gem::Version 
-  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
-email: t_leitner@gmx.at
-homepage: http://webgen.rubyforge.org
-rubyforge_project: webgen
-description: webgen is a Web site generator implemented in Ruby. It is used to generate static Web pages from templates and page description files.
-autorequire: 
-default_executable: webgen
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 0.4.7
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Thomas Leitner
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2007-12-31 00:00:00 +01:00
+default_executable: webgen
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: cmdparse
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 2.0.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: RedCloth
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 3.0.0
+    version: 
+description: webgen is a Web site generator implemented in Ruby. It is used to generate static Web pages from templates and page description files.
+email: t_leitner@gmx.at
+executables: 
+- webgen
+extensions: []
+
+extra_rdoc_files: 
+- README
 files: 
 - setup.rb
 - TODO
@@ -51,6 +61,7 @@ files:
 - lib/webgen/node.rb
 - lib/webgen/plugin.rb
 - lib/webgen/plugins/contentconverters/default.rb
+- lib/webgen/plugins/contentconverters/haml.rb
 - lib/webgen/plugins/contentconverters/html.rb
 - lib/webgen/plugins/contentconverters/markdown.rb
 - lib/webgen/plugins/contentconverters/maruku.rb
@@ -705,10 +716,12 @@ files:
 - doc/src/documentation/plugins
 - doc/src/documentation/plugins/contentconverter
 - doc/src/documentation/plugins/contentconverter/default.page
+- doc/src/documentation/plugins/contentconverter/haml.page
 - doc/src/documentation/plugins/contentconverter/html.page
 - doc/src/documentation/plugins/contentconverter/markdown.page
 - doc/src/documentation/plugins/contentconverter/maruku.page
 - doc/src/documentation/plugins/contentconverter/rdoc.page
+- doc/src/documentation/plugins/contentconverter/sass.page
 - doc/src/documentation/plugins/contentconverter/textile.page
 - doc/src/documentation/plugins/contentconverter/xmlbuilder.page
 - doc/src/documentation/plugins/core
@@ -854,36 +867,33 @@ files:
 - doc/src/sipttra.template
 - man/man1
 - man/man1/webgen.1
-test_files: []
-
+has_rdoc: true
+homepage: http://webgen.rubyforge.org
+post_install_message: 
 rdoc_options: 
 - --line-numbers
 - -m
 - README
-extra_rdoc_files: 
-- README
-executables: 
-- webgen
-extensions: []
-
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: cmdparse
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 2.0.0
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: RedCloth
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 3.0.0
-    version: 
+rubyforge_project: webgen
+rubygems_version: 1.0.1
+signing_key: 
+specification_version: 2
+summary: webgen is a templated based static Web site generator.
+test_files: []
+