webgen 0.4.2 → 0.4.3

data/doc/src/examples/website_styles/1024px.page

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

data/doc/src/examples/website_styles/andreas00.page

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

data/doc/src/examples/website_styles/andreas01.page

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

data/doc/src/examples/website_styles/andreas03.page

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

data/doc/src/examples/website_styles/andreas04.page

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

data/doc/src/examples/website_styles/andreas05.page

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

data/doc/src/examples/website_styles/andreas06.page

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

data/doc/src/examples/website_styles/andreas07.page

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

data/doc/src/examples/website_styles/andreas08.page

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

data/doc/src/examples/website_styles/andreas09.page

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

data/doc/src/examples/website_styles/default.page

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

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

@@ -0,0 +1,76 @@
+---
+title: Index
+directoryName: Website Styles
+---
+h2. List of website styles
+
+The website styles open in an iframe when you use the menu items. Use the links provided below to
+open the website styles directly (fullscreen).
+
+Following is the list of all available website styles:
+
+
+* <a href='1024px/index.html'>1024px</a>
+
+  * *Author*: Andreas Viklund (adapted for webgen by Thomas Leitner)
+  * *Copyright*: http://andreasviklund.com/about/copyright/
+  * *Description*: Open source web design template by Andreas Viklund. Features a simple blue and grey two column interface, with a left or a right sidebar. Have a look at the homepage to see the original template and what can be done with it.
+  * *Homepage*: http://andreasviklund.com/templates
+* <a href='andreas00/index.html'>andreas00</a>
+
+  * *Author*: Andreas Viklund (adapted for webgen by Thomas Leitner)
+  * *Copyright*: http://andreasviklund.com/about/copyright/
+  * *Description*: Open source web design template by Andreas Viklund. Features a one-, two- or three-column interface in white and grey with many predefined styles for menus, tables, forms, ... Have a look at the homepage to see the original template and what can be done with it.
+  * *Homepage*: http://andreasviklund.com/templates
+* <a href='andreas01/index.html'>andreas01</a>
+
+  * *Author*: Andreas Viklund (adapted for webgen by Thomas Leitner)
+  * *Copyright*: http://andreasviklund.com/about/copyright/
+  * *Description*: Open source web design template by Andreas Viklund. Features a simple two- or three-column interface with many predefined styles. Similar to style andreas00. Have a look at the available styles in the CSS file and visit the homepage to see the original template and what can be done with it.
+  * *Homepage*: http://andreasviklund.com/templates
+* <a href='andreas03/index.html'>andreas03</a>
+
+  * *Author*: Andreas Viklund (adapted for webgen by Thomas Leitner)
+  * *Copyright*: http://andreasviklund.com/about/copyright/
+  * *Description*: Open source web design template by Andreas Viklund. An accessible 2-column template in blue, grey and white which loads fast and works in all common browsers. Would be a good one for a blog! Have a look at the available styles in the CSS file and visit the homepage to see the original template and what can be done with it.
+  * *Homepage*: http://andreasviklund.com/templates
+* <a href='andreas04/index.html'>andreas04</a>
+
+  * *Author*: Andreas Viklund (adapted for webgen by Thomas Leitner)
+  * *Copyright*: http://andreasviklund.com/about/copyright/
+  * *Description*: Open source web design template by Andreas Viklund. A simple two-column fluid width template in orange and grey using animated GIFs. Can be used for normal websites but it is probably best used for a blog! Have a look at the available styles in the CSS file and visit the homepage to see the original template and what can be done with it.
+  * *Homepage*: http://andreasviklund.com/templates
+* <a href='andreas05/index.html'>andreas05</a>
+
+  * *Author*: Andreas Viklund (adapted for webgen by Thomas Leitner)
+  * *Copyright*: http://andreasviklund.com/about/copyright/
+  * *Description*: Open source web design template by Andreas Viklund. Simplicity is the main feature of this design. No advanced features and no effects are used which makes it great for small sites. Have a look at the available styles in the CSS file and visit the homepage to see the original template and what can be done with it.
+  * *Homepage*: http://andreasviklund.com/templates
+* <a href='andreas06/index.html'>andreas06</a>
+
+  * *Author*: Andreas Viklund (adapted for webgen by Thomas Leitner)
+  * *Copyright*: http://andreasviklund.com/about/copyright/
+  * *Description*: Open source web design template by Andreas Viklund. A fall/autumn design in orange and blue with menu tabs and many in-built styles to use. Have a look at the available styles in the CSS file and visit the homepage to see the original template and what can be done with it.
+  * *Homepage*: http://andreasviklund.com/templates
+* <a href='andreas07/index.html'>andreas07</a>
+
+  * *Author*: Andreas Viklund (adapted for webgen by Thomas Leitner)
+  * *Copyright*: http://andreasviklund.com/about/copyright/
+  * *Description*: Open source web design template by Andreas Viklund. A very simple design with minimalistic use of .classes or IDs in the CSS file. Uses a fixed position site menu, good for small or personal sites. Have a look at the available styles in the CSS file and visit the homepage to see the original template and what can be done with it.
+  * *Homepage*: http://andreasviklund.com/templates
+* <a href='andreas08/index.html'>andreas08</a>
+
+  * *Author*: Andreas Viklund (adapted for webgen by Thomas Leitner)
+  * *Copyright*: http://andreasviklund.com/about/copyright/
+  * *Description*: Open source web design template by Andreas Viklund. Very simple and basic template without images in light blue and white. Have a look at the available styles in the CSS file and visit the homepage to see the original template and what can be done with it.
+  * *Homepage*: http://andreasviklund.com/templates
+* <a href='andreas09/index.html'>andreas09</a>
+
+  * *Author*: Andreas Viklund (adapted for webgen by Thomas Leitner)
+  * *Copyright*: http://andreasviklund.com/about/copyright/
+  * *Description*: Open source web design template by Andreas Viklund. Features a two or three column layout in various colors (blue, green, orange, purple, red and black) with many styles. Have a look at the available styles in the CSS file and visit the homepage to see the original template and what can be done with it.
+  * *Homepage*: http://andreasviklund.com/templates
+* <a href='default/index.html'>default</a>
+
+  * *Author*: Thomas Leitner
+  * *Description*: Provides a minimalistic default style. The style defines a horizontal header, a horizontal bar with the breadcrumb trail and the language menu, then a menu on the left and a footer.

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

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

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

@@ -5,6 +5,30 @@ inMenu: true
 h2. News
 
 
+h3(#news-2007-05-19). 19.05.2007 - webgen 0.4.3
+
+I got mails about webgen not working with Ruby 1.8.6 on Windows anymore. It seems that a bug in the
+1.8.6 release prevents webgen from correctly finding directories. However, this bug has already been
+fixed which means that webgen should work again with the next One-Click-Installer for Windows. Until
+then I recommend using webgen with the latest 1.8.5 version on Windows (I found that it is no
+problem to have two versions of Ruby installed on Windows using the One-Click-Installer).
+
+And now on to the new features and other changes:
+
+* Updated exifr support to version 0.10 - versions lower than 0.10 are not supported anymore!
+* redcloth is now a dependency sothat all the examples and website templates really work out-of-the-box!
+* Removed website style @plain@ due to incompatible license.
+* Added submitted plugin {plugin: Tag/HtmlMetaInfo} from Andrea Censi - thanks!
+* Added submitted plugin {plugin: Tag/News} from Jeremy Hinegardner - thanks!
+* Added submitted plugin {plugin: ContentConverter/Maruku} from Andrea Censi - thanks!
+
+Closed bugs:
+
+* Page and template files can now be written using either Windows, Mac or Unix EOL encodings!
+* Fixed order of webgen data directory discovery - local data directories are preferred now!
+* File/TemplateHandler will not use the default metainfo from File/PageHandler anymore!
+
+
 h3(#news-2007-02-28). 28.02.2007 - webgen 0.4.2
 
 

data/doc/src/project.todo

@@ -9,6 +9,12 @@ The following category defines all milestones for webgen:
 
 ###### Milestones ######
 
+* Apr07 (2007-04-30) Bug fixes and small enhancements
+  - include submitted plugins
+  - fix issues that have arisen since the last release
+
+  This release gets a little bit delayed since I do not have enough time in April, will be released
+  in May!
 
 * Feb07 (2007-02-28) Bug fixes and small enhancements
   - include patches/requests created since 0.4.1 release
@@ -32,6 +38,9 @@ Categories for implementation issues:
 
 * T003 [F] add additional tests for sipttra implementation
 
+* 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}
+
 
 ## Implementation (closed) ##
 
@@ -45,6 +54,13 @@ Categories for implementation issues:
 
 * T001 [Feb07] add support for sipttra files
 
+* T017 [Apr07] add the parameters from MenuStyle/Vertical to MenuStyle/Horizontal
+  added @startLevel@ and @maxLevels@ parameters to MenuStyle/Horizontal - the other parameters
+  from MenuStyle/Vertical aren't useful for MenuStyle/Horizontal
+
+* T018 [Apr07] add the submitted plugins from Andrea Censi and Jeremy Hinegardner
+  Also see FR#9707, Added Tag/HtmlMetaInfo from Andrea Censi, Tag/News from Jeremy Hinegardner,
+  ContentConverter/Maruku from Andrea Censi
 
 ###### Bugs (open) ######
 
@@ -68,6 +84,24 @@ Categories for implementation issues:
   Make TreeWalker work as in 0.3.8 again, name it 'Misc/TreeWalker' and call it after building and
   before writing tree
 
+* T016 [Apr07] fix order of data directory discovery
+  webgen searches now for a local directory first, then for a global one
+
+* T020 [Apr07] File/TemplateHandler should not use the default metainfo from File/PageHandler
+
+* T022 [Apr07] Remove plain website style due to incompatible license
+
+* T021 [Apr07] Problem with templates/example sites not working out of the box due to missing Textile support
+  Either
+
+  * Update templates to not use Textile sothat they work out of the box or
+  * include redcloth as dependency
+
+  Since not using Textile makes the templates/examples not very 'nice' to view, redcloth is now a dependency
+  of webgen.
+
+* T019 [Apr07] normalize EOL encoding to \n so that page files with any EOL encoding work properly
+  \r and \r\n are now converted to \n sothat the $ operator for regular expressions works correctly
 
 Category for documentation issues:
 

data/lib/webgen/config.rb

@@ -24,7 +24,7 @@ require 'rbconfig'
 
 module Webgen
 
-  VERSION = [0, 4, 2]
+  VERSION = [0, 4, 3]
   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. " \
@@ -40,9 +40,9 @@ module Webgen
   # Returns the data directory for webgen.
   def self.data_dir
     unless defined?( @@data_dir )
-      @@data_dir = File.expand_path( File.join( Config::CONFIG["datadir"], "webgen" ) )
+      @@data_dir =  File.expand_path( File.join( File.dirname( __FILE__ ), '..', '..', 'data', 'webgen') )
 
-      @@data_dir =  File.expand_path( File.join( File.dirname( __FILE__ ), '..', '..', 'data', 'webgen') ) if !File.exists?( @@data_dir )
+      @@data_dir = File.expand_path( File.join( Config::CONFIG["datadir"], "webgen" ) ) if !File.exists?( @@data_dir )
 
       raise "Could not find webgen data directory! This is a bug, report it please!" unless File.directory?( @@data_dir )
     end

data/lib/webgen/content.rb

@@ -139,7 +139,7 @@ class WebPageData
 
   def parse( data )
     @blocks = {}
-    blocks = data.scan( /(?:(?:^--- *(?:(\w+) *(?:, *(\w+) *)?)?$)|\A)(.*?)(?:(?=^---.*?$)|\Z)/m )
+    blocks = data.gsub(/\r\n?/, "\n").scan( /(?:(?:^--- *(?:(\w+) *(?:, *(\w+) *)?)?$)|\A)(.*?)(?:(?=^---.*?$)|\Z)/m )
     if data =~ /\A---\s*$/
       begin
         meta = YAML::load( blocks.shift[2] )

data/lib/webgen/plugins/contentconverters/maruku.rb

@@ -0,0 +1,33 @@
+load_optional_part( 'content-converter-maruku',
+                    :needed_gems => ['maruku'],
+                    :error_msg => "Markdown not available as content format as Maruku could not be loaded",
+                    :info => "Markdown + (extra) can be used as content format" ) do
+
+  require 'maruku'
+  load_plugin 'webgen/plugins/contentconverters/default'
+
+  module ContentConverters
+
+    # Converts text formatted in Markdown format using Maruku to HTML.
+    class MarukuConverter < DefaultContentConverter
+
+      infos( :name => 'ContentConverter/Maruku',
+             :author => "Andrea Censi",
+             :summary => "Handles content formatted in Markdown format using Maruku "+
+                          "http://maruku.rubyforge.org/"
+             )
+
+      register_handler 'maruku'
+
+      def call( content )
+        Maruku.new( content ).to_html
+      rescue Exception => e
+        log(:error) { "Error converting Markdown text to HTML: #{e.message}" }
+        content
+      end
+
+    end
+
+  end
+
+end

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

@@ -376,7 +376,7 @@ module FileHandlers
       if @plugin_manager.optional_part( 'gallery-exif' )[:loaded]
         jpeg = EXIFR::JPEG.new( image ) rescue nil
         if !jpeg.nil? && jpeg.exif?
-          exif = jpeg.exif.dup
+          exif = jpeg.exif.to_hash
           exif[:width] = jpeg.width
           exif[:height] = jpeg.height
           exif[:comment] = jpeg.comment

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

@@ -36,13 +36,12 @@ module FileHandlers
 
     register_extension 'template'
 
-    default_meta_info( 'blocks' => [['content', 'html']] )
+    default_meta_info( 'useERB' => true, 'blocks' => [['content', 'html']] )
 
     def create_node( src_name, parent, meta_info )
       begin
-        page_meta_info = @plugin_manager['Core/FileHandler'].meta_info_for( @plugin_manager['File/PageHandler'] )
         data = WebPageData.new( File.read( src_name ), @plugin_manager['ContentConverter/Default'].registered_handlers,
-                                page_meta_info.merge( meta_info ) )
+                                meta_info )
       rescue WebPageDataInvalid => e
         log(:error) { "Invalid template file <#{src_name}>: #{e.message}" }
         return nil

data/lib/webgen/plugins/menustyles/horizontal.rb

@@ -31,6 +31,11 @@ module MenuStyles
            :summary => "Builds a horizontal menu"
            )
 
+    param 'startLevel', 1, 'The level at which the menu starts. For example, if set to 2 the top most ' +
+      'menu items are not shown.'
+    param 'maxLevels', 3,  'Specifies the maximum number of levels that should be shown. ' +
+      'For example, if maxLevels = 1, then only one level is shown.'
+
     register_handler 'horizontal'
 
     def internal_build_menu( src_node, menu_tree )
@@ -51,7 +56,9 @@ module MenuStyles
     #######
 
     def submenu( src_node, menu_node, level )
-      if menu_node.nil? || menu_node.level > src_node.level \
+      if menu_node.nil? \
+        || level > param( 'maxLevels' ) + param( 'startLevel' ) - 1 \
+        || src_node.level < param( 'startLevel' ) \
         || !src_node.in_subtree_of?( menu_node.node_info[:node] )
         return ''
       end
@@ -61,12 +68,16 @@ module MenuStyles
       menu_node.each do |child|
         submenu << (child.has_children? ? submenu( src_node, child, level + 1 ) : '')
         style, link = menu_item_details( src_node, child.node_info[:node] )
-        out << "<li #{style}>#{link}</li>"
+        out << "<li#{style.to_s.empty? ? '' : ' ' + style}>#{link}</li>"
       end
       out << "</ul>"
       out << submenu
 
-      return out
+      if level < param( 'startLevel' )
+        '' + submenu
+      else
+        out
+      end
     end
 
   end

data/lib/webgen/plugins/tags/htmlmetainfo.rb

@@ -0,0 +1,27 @@
+load_plugin 'webgen/plugins/tags/tag_processor'
+
+module Tags
+
+  class HtmlMetaInfo < DefaultTag
+
+    infos( :name => 'Tag/HtmlMetaInfo',
+           :author => 'Andrea Censi',
+           :summary => 'Writes the content of the "description","author","keywords" as HTML META tags.')
+
+    register_tag 'htmlmetainfo'
+
+    def process_tag( tag, chain )
+      cur_node = chain.last
+      s = ""
+      ['description', 'author', 'keywords'].each do |key|
+         if value = cur_node.meta_info[key]
+            value = CGI::escapeHTML(value)
+            s += "<meta name='#{key}' content='#{value}'/>\n"
+         end
+      end
+      s
+    end
+
+  end
+
+end