webgen 0.3.8 → 0.4.0

data/lib/webgen/plugins/{contenthandlers → contentconverters}/default.rb

@@ -1,7 +1,7 @@
 #
 #--
 #
-# $Id: default.rb 369 2005-12-24 11:37:40Z thomas $
+# $Id: default.rb 531 2006-11-17 17:56:14Z thomas $
 #
 # webgen: template based static website generator
 # Copyright (C) 2004 Thomas Leitner
@@ -21,17 +21,18 @@
 #
 
 
-module ContentHandlers
+module ContentConverters
 
-  class DefaultContentHandler < Webgen::Plugin
+  class DefaultContentConverter < Webgen::HandlerPlugin
 
-    summary "Base class for all content handlers"
+    infos( :name => 'ContentConverter/Default',
+           :author => Webgen::AUTHOR,
+           :summary => "Base class for content to HTML converters"
+           )
 
-    define_handler 'format'
-
-    # Format the given +content+. Should be overridden in subclass!
-    def format_content( content )
-      content
+    # Convert the given +content+ to HTML. Has to be overridden in subclasses!
+    def call( content )
+      raise NotImplementedError
     end
 
   end

data/lib/webgen/plugins/{contenthandlers → contentconverters}/html.rb

@@ -1,7 +1,7 @@
 #
 #--
 #
-# $Id: html.rb 369 2005-12-24 11:37:40Z thomas $
+# $Id: html.rb 531 2006-11-17 17:56:14Z thomas $
 #
 # webgen: template based static website generator
 # Copyright (C) 2004 Thomas Leitner
@@ -20,19 +20,22 @@
 #++
 #
 
-require 'webgen/plugins/contenthandlers/default'
+load_plugin 'webgen/plugins/contentconverters/default'
 
-module ContentHandlers
+module ContentConverters
 
   # Handles HTML content. Assumes that the content is already valid HTML.
-  class HTMLContentHandler < DefaultContentHandler
+  class HtmlConverter < DefaultContentConverter
 
-    summary "Handles HTML formatted content"
+    infos( :name => 'ContentConverter/HTML',
+           :author => Webgen::AUTHOR,
+           :summary => "Handles HTML formatted content"
+           )
 
-    register_format( 'html' )
+    register_handler 'html'
 
-    def format_content( txt )
-      txt
+    def call( content )
+      content
     end
 
   end

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

@@ -0,0 +1,54 @@
+#
+#--
+#
+# $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-markdown',
+                    :needed_gems => ['bluecloth'],
+                    :error_msg => "Markdown not available as content format as BlueCloth could not be loaded",
+                    :info => "Markdown can be used as content format" ) do
+
+  require 'bluecloth'
+  load_plugin 'webgen/plugins/contentconverters/default'
+
+  module ContentConverters
+
+    # Converts text formatted in Markdown format using BlueCloth to HTML.
+    class MarkdownConverter < DefaultContentConverter
+
+      infos( :name => 'ContentConverter/Markdown',
+             :author => Webgen::AUTHOR,
+             :summary => "Handles content formatted in Markdown format using BlueCloth"
+             )
+
+      register_handler 'markdown'
+
+      def call( content )
+        BlueCloth.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/{contenthandlers → contentconverters}/rdoc.rb

@@ -1,7 +1,7 @@
 #
 #--
 #
-# $Id: rdoc.rb 369 2005-12-24 11:37:40Z thomas $
+# $Id: rdoc.rb 531 2006-11-17 17:56:14Z thomas $
 #
 # webgen: template based static website generator
 # Copyright (C) 2004 Thomas Leitner
@@ -22,27 +22,31 @@
 
 require 'rdoc/markup/simple_markup'
 require 'rdoc/markup/simple_markup/to_html'
-require 'webgen/plugins/contenthandlers/default'
+load_plugin 'webgen/plugins/contentconverters/default'
 
-module ContentHandlers
+module ContentConverters
 
   # Handles text in RDoc format.
-  class RDocContentHandler < DefaultContentHandler
+  class RDocConverter < DefaultContentConverter
 
-    summary "Handles content in RDOC format"
+    infos( :name => 'ContentConverter/RDoc',
+           :author => Webgen::AUTHOR,
+           :summary => "Handles content in RDOC format"
+           )
 
-    register_format( 'rdoc' )
+    register_handler 'rdoc'
 
-    def initialize
+    def initialize( plugin_manager )
+      super
       @processor = SM::SimpleMarkup.new
       @formatter = SM::ToHtml.new
     end
 
-    def format_content( txt )
-      @processor.convert( txt, @formatter )
-    rescue
-      self.logger.error { "Error converting RDOC text to HTML" }
-      ''
+    def call( content )
+      @processor.convert( content, @formatter )
+    rescue Exception => e
+      log(:error) { "Error converting RDOC text to HTML: {e.message}" }
+      content
     end
 
   end

data/lib/webgen/plugins/{contenthandlers → contentconverters}/textile.rb

@@ -1,7 +1,7 @@
 #
 #--
 #
-# $Id: textile.rb 369 2005-12-24 11:37:40Z thomas $
+# $Id: textile.rb 531 2006-11-17 17:56:14Z thomas $
 #
 # webgen: template based static website generator
 # Copyright (C) 2004 Thomas Leitner
@@ -20,30 +20,35 @@
 #++
 #
 
-begin
+load_optional_part( 'content-converter-textile',
+                    :needed_gems => ['redcloth'],
+                    :error_msg => "Textile not available as content format as RedCloth could not be loaded",
+                    :info => "Textile can be used as content format" ) do
+
   require 'redcloth'
-  require 'webgen/plugins/contenthandlers/default'
+  load_plugin 'webgen/plugins/contentconverters/default'
 
-  module ContentHandlers
+  module ContentConverters
 
     # Handles content in Textile format using RedCloth.
-    class TextileContentHandler < DefaultContentHandler
+    class TextileConverter < DefaultContentConverter
 
-      summary "Handles content in Textile format using RedCloth"
+      infos( :name => 'ContentConverter/Textile',
+             :author => Webgen::AUTHOR,
+             :summary => "Handles content in Textile format using RedCloth"
+             )
 
-      register_format( 'textile' )
+      register_handler 'textile'
 
-      def format_content( txt )
-        RedCloth.new( txt ).to_html
+      def call( content )
+        RedCloth.new( content ).to_html
       rescue Exception => e
-        self.logger.error { "Error converting Textile text to HTML: #{e.message}" }
-        ''
+        log(:error) { "Error converting Textile text to HTML: #{e.message}" }
+        content
       end
 
     end
 
   end
 
-rescue LoadError => e
-  self.logger.warn { "Textile not available as content format as RedCloth could not be loaded: #{e.message}" }
 end

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

@@ -0,0 +1,58 @@
+#
+#--
+#
+# $Id: textile.rb 501 2006-09-09 17:25:43Z 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-xmlbuilder',
+                    :needed_gems => ['builder'],
+                    :error_msg => "XML Builder not available as content format as it could not be loaded",
+                    :info => "The builder library can be used to create XHTML/XML content" ) do
+
+  require 'builder'
+  load_plugin 'webgen/plugins/contentconverters/default'
+
+  module ContentConverters
+
+    # Handles content in Textile format using RedCloth.
+    class XmlBuilderConverter < DefaultContentConverter
+
+      infos( :name => 'ContentConverter/XmlBuilder',
+             :author => Webgen::AUTHOR,
+             :summary => "Handles content structured using the XML Builder library"
+             )
+
+      register_handler 'xmlbuilder'
+
+
+      def call( content )
+        xml = Builder::XmlMarkup.new( :indent => 2 )
+        eval( content )
+        xml.target!
+      rescue Exception => e
+        log(:error) { "Error using XML Builder to generate HTML: #{e.message}" }
+        content
+      end
+
+    end
+
+  end
+
+end

data/lib/webgen/plugins/coreplugins/configuration.rb

@@ -1,7 +1,7 @@
 #
 #--
 #
-# $Id: configuration.rb 369 2005-12-24 11:37:40Z thomas $
+# $Id: configuration.rb 531 2006-11-17 17:56:14Z thomas $
 #
 # webgen: template based static website generator
 # Copyright (C) 2004 Thomas Leitner
@@ -20,115 +20,24 @@
 #++
 #
 
-require 'find'
-require 'tsort'
-require 'cmdparse'
-require 'webgen/node'
-require 'webgen/plugin'
-
-# Helper class for calculating plugin dependencies.
-class Dependency < Hash
-  include TSort
-
-  alias tsort_each_node each_key
-  def tsort_each_child(node, &block)
-    fetch(node).each(&block)
-  end
-end
-
-module Webgen
-
-  VERSION = [0, 3, 8]
-  SUMMARY = "Webgen is a templated based static website generator."
-  DESCRIPTION = "Webgen is a web page generator implemented in Ruby. " \
-  "It is used to generate static web pages from templates and page " \
-  "description files."
-
-end
-
 module CorePlugins
 
-  # Responsible for loading the other plugin files and holds the basic configuration options.
+  # Used for storing the basic configuration options.
   class Configuration < Webgen::Plugin
 
-    summary "Responsible for loading plugins and holding general parameters"
-
-    add_param 'srcDirectory', 'src', 'The directory from which the source files are read.'
-    add_param 'outDirectory', 'output', 'The directory to which the output files are written.'
-    add_param 'lang', 'en', 'The default language.'
+    infos( :name => 'Core/Configuration',
+           :author => Webgen::AUTHOR,
+           :summary => "Responsible for storing general parameters"
+           )
 
-    # Returns the +CommandParser+ object used for parsing the command line. You can add site
-    # specific commands to it by calling the Configuration#add_cmdparser_command method!
-    attr_accessor :cmdparser
-
-    # Returns the data directory of webgen.
-    def self.data_dir
-      unless defined?( @@data_dir )
-        @@data_dir = File.join( Config::CONFIG["datadir"], "webgen" )
-
-        if defined?( Gem::Cache )
-          gem = Gem::Cache.from_installed_gems.search( "webgen", "=#{Webgen::VERSION.join('.')}" ).last
-          @@data_dir = File.join( gem.full_gem_path, "data", "webgen" ) if gem
-        end
-
-        @@data_dir =  File.dirname( $0 ) + '/../data/webgen' if !File.exists?( @@data_dir )
-
-        if File.exists?( @@data_dir )
-          logger.info { "Webgen data directory found at #{@@data_dir}" }
-        else
-          logger.error { "Could not locate webgen data directory!!!" }
-          @@data_dir = ''
-        end
-      end
-      @@data_dir
-    end
-
-    def add_cmdparser_command( command )
-      @cmdparser.add_command( command ) if @cmdparser
-    end
-
-    # Does all the initialisation stuff
-    def init_all
-      load_plugins( File.dirname( __FILE__).sub( /coreplugins$/,'' ), File.dirname( __FILE__).sub(/webgen\/plugins\/coreplugins$/, '') )
-      load_plugins( 'plugin', '' )
-      init_plugins
-    end
-
-    # Load all plugins in the given +path+. Before +require+ is actually called the path is
-    # trimmed: if +trimpath+ matches the beginning of the string, +trimpath+ is deleted from it.
-    def load_plugins( path, trimpath )
-      Find.find( path ) do |file|
-        trimmedFile = file.gsub(/^#{trimpath}/, '')
-        Find.prune unless File.directory?( file ) || ( (/.rb$/ =~ file) && !$".include?( trimmedFile ) )
-        if File.file?( file )
-          self.logger.debug { "Loading plugin file <#{file}>..." }
-          require trimmedFile
-        end
-      end
-    end
-
-    # Instantiate the plugins in the correct order, except the classes which have a constant
-    # +VIRTUAL+, and add CommandPlugin instance to the global CommandParser.
-    def init_plugins
-      dep = Dependency.new
-      Webgen::Plugin.config.each {|k,data| dep[data.plugin] = data.dependencies || []}
-      dep.tsort.each do |plugin|
-        data = Webgen::Plugin.config.find {|k,v| v.plugin == plugin }[1]
-        unless data.klass.const_defined?( 'VIRTUAL' ) || data.obj
-          self.logger.debug { "Creating plugin of class #{data.klass.name}" }
-          data.obj ||= data.klass.new
-        end
-      end
-      Webgen::Plugin.config.keys.find_all {|klass| klass.ancestors.include?( Webgen::CommandPlugin )}.each do |cmdKlass|
-        add_cmdparser_command( Webgen::Plugin.config[cmdKlass].obj )
-      end
-    end
+    param 'srcDir', Webgen::SRC_DIR, 'The directory from which the source files are read - is automatically set and cannot be overridden.'
+    param 'outDir', 'output', 'The directory to which the output files are written.'
+    param 'websiteDir', nil, 'The website directory - is automatically set and cannot be overridden!'
+    param 'lang', 'en', 'The default language.'
+    param 'loggerLevel', 2, 'The logging level, ranges from 0 (debug, more verbose) to 3 (error, less verbose)'
 
   end
 
-  # Initialize single configuration instance
-  Webgen::Plugin.config[Configuration].obj = Configuration.new
-
 end
 
 

data/lib/webgen/plugins/coreplugins/resourcemanager.rb

@@ -1,7 +1,7 @@
 #
 #--
 #
-# $Id: resourcemanager.rb 369 2005-12-24 11:37:40Z thomas $
+# $Id: resourcemanager.rb 563 2006-12-29 08:59:41Z thomas $
 #
 # webgen: template based static website generator
 # Copyright (C) 2004 Thomas Leitner
@@ -20,20 +20,28 @@
 #++
 #
 
-require 'rbconfig'
 require 'fileutils'
-require 'webgen/plugins/tags/tags'
-require 'webgen/plugins/filehandlers/filehandler'
+load_plugin 'webgen/plugins/tags/tag_processor'
+load_plugin 'webgen/plugins/filehandlers/filehandler'
 
 module CorePlugins
 
+  # Handles resources in webgen.
   class ResourceManager < Webgen::Plugin
 
+    # The base class for all resources.
     class Resource
 
+      # The unique name of the resource.
       attr_reader :name
+
+      # The output path.
       attr_reader :output_path
+
+      # Specifies if this resource is predefined. This is only used internally by webgen!
       attr_accessor :predefined
+
+      # The type of resource: file or memory.
       attr_accessor :type
 
       def initialize( name, type, output_path )
@@ -44,13 +52,13 @@ module CorePlugins
       end
 
       # Returns the relative path from the node to the resource.
-      def relpath_from_node( node )
-        node.relpath_to_string( '/' + @output_path )
+      def route_from( node )
+        node.route_to( '/' + @output_path )
       end
 
       # Returns the complete destination path.
-      def dest_path
-        File.join( Webgen::Plugin['Configuration']['outDirectory'], @output_path )
+      def dest_path( root_dir )
+        File.join( root_dir, @output_path )
       end
 
       # Mark the resource as referenced. Only referenced resources are written to the output directory.
@@ -64,19 +72,21 @@ module CorePlugins
       end
 
       # Can the resource be written to the output directory?
-      def write_resource?
+      def write_resource?( root_dir, file_handler )
         @referenced
       end
 
       # Write the resource to the output directory.
-      def write_resource
+      def write_resource( root_dir, file_handler )
         raise NotImplementedError
       end
 
     end
 
+    # Describes a file resource.
     class FileResource < Resource
 
+      # The path to the file the resource references.
       attr_reader :res_path
 
       def initialize( name, output_path, res_path )
@@ -88,16 +98,17 @@ module CorePlugins
         File.read( @res_path )
       end
 
-      def write_resource?
-        referenced? && Webgen::Plugin['FileHandler'].file_modified?( @res_path, dest_path )
+      def write_resource?( root_dir, file_handler )
+        referenced? && file_handler.file_modified?( @res_path, dest_path( root_dir ) )
       end
 
-      def write_resource
-        FileUtils.cp( res_path, dest_path ) if write_resource?
+      def write_resource( root_dir, file_handler )
+        FileUtils.cp( res_path, dest_path( root_dir ) ) if write_resource?( root_dir, file_handler )
       end
 
     end
 
+    # Describes a memory resource.
     class MemoryResource < Resource
 
       def initialize( name, output_path )
@@ -113,27 +124,35 @@ module CorePlugins
         @data << data
       end
 
-      def write_resource
-        File.open( dest_path, 'w' ) {|file| file.write( data )} if write_resource?
+      def write_resource( root_dir, file_handler )
+        File.open( dest_path( root_dir ), 'w' ) {|file| file.write( data )} if write_resource?( root_dir, file_handler )
       end
 
     end
 
 
-    summary "Provides access to pre- and userdefined resources"
-    description "The resource manager manages a list of predefined and " \
-    "userdefined resources. These resources can be used in page files."
-    add_param 'resources', [], 'User defined file resources. Value has to be an array of arrays with three strings defining '\
-    'name, resource path and output path'
+    infos( :name => 'Core/ResourceManager',
+           :author => Webgen::AUTHOR,
+           :summary => "Provides access to pre- and userdefined resources",
+           :description => "The resource manager manages a list of predefined and " +
+           "userdefined resources. These resources can be used, for example, in page files."
+          )
+
+    param 'resources', [], 'User defined file resources. Value has to be an array of ' +
+      'arrays with three strings defining name, resource path and output path'
+
+    depends_on 'Core/FileHandler'
 
-    depends_on 'FileHandler'
 
-    attr_reader :data_dir
+    # Returns all defined resources.
+    attr_reader :resources
 
-    def initialize
-      Webgen::Plugin.config[self.class].resources = {}
-      Webgen::Plugin['FileHandler'].add_msg_listener( :AFTER_ALL_WRITTEN, method( :write_resources ) )
-      define_webgen_resources unless CorePlugins::Configuration.data_dir.empty?
+
+    def initialize( plugin_manager )
+      super
+      @plugin_manager['Core/FileHandler'].add_msg_listener( :after_all_nodes_written, method( :write_resources ) )
+      @resources = {}
+      define_webgen_resources unless Webgen.data_dir.empty?
       define_user_resources
     end
 
@@ -142,14 +161,11 @@ module CorePlugins
     # should be an absolute path, like +/images/logo.png+. If not, it will be relative to the output
     # directory.
     def define_file_resource( name, resource_path, output_path )
-      if !File.exists?( resource_path )
-        logger.error { "Path <#{resource_path}> for resource #{name} is invalid!" }
-      else
+      if File.exists?( resource_path )
         define_resource( name, FileResource.new( name, output_path, resource_path ) )
       end
     end
 
-
     # Adds a new resource which can be referenced later by using +name+. The +output_path+
     # should be an absolute path, like +/images/logo.png+. If not, it will be relative to the output
     # directory.
@@ -157,19 +173,22 @@ module CorePlugins
       define_resource( name, MemoryResource.new( name, output_path ) )
     end
 
+    # Assigns the resource +res+ the name +name+.
+    def define_resource( name, res )
+      @resources[name] = res unless @resources.has_key?( name )
+    end
 
     # Returns the requested resource.
     def get_resource( name )
-      Webgen::Plugin.config[self.class].resources[name]
+      @resources[name]
     end
 
-
     # Appends given +data+ to the resource +name+. Data can only be appended to memory resources!
     def append_data( name, data )
       if (res = get_resource( name )) && res.type == :memory
         res.append_data( data )
       else
-        logger.error {"Resource #{name} does not exist or data cannot be appended to it!" }
+        log(:error) {"Resource #{name} does not exist or data cannot be appended to it!" }
       end
     end
 
@@ -177,34 +196,31 @@ module CorePlugins
     private
     #######
 
-    def define_resource( name, res )
-      if Webgen::Plugin.config[self.class].resources.has_key?( name )
-        logger.error { "Resource #{name} already defined, not using new definition (#{res.inspect})" }
-      else
-        logger.info { "Adding resource #{name} to pool (#{res.inspect})" }
-        Webgen::Plugin.config[self.class].resources[name] = res
-      end
-    end
-
     def define_webgen_resources
-      define_file_resource( 'webgen-logo', File.join( CorePlugins::Configuration.data_dir, 'resources', 'images', 'webgen_logo.png' ),
-                            '/images/webgen-logo.png' ).predefined = "The logo of webgen as seen on the homepage."
-      define_file_resource( 'webgen-generated', File.join( CorePlugins::Configuration.data_dir, 'resources', 'images', 'generated_by_webgen.png' ),
-                            '/images/webgen-generated-by.png' ).predefined = "A 88x31 image for use on web sites that were generated by webgen."
-      define_file_resource( 'w3c-valid-css', File.join( CorePlugins::Configuration.data_dir, 'resources', 'images', 'valid-css.gif' ),
-                            '/images/w3c-valid-css.gif' ).predefined = 'The W3C image for valid css.'
-      define_file_resource( 'w3c-valid-xhtml11', File.join( CorePlugins::Configuration.data_dir, 'resources', 'images', 'valid-xhtml11.png' ),
-                            '/images/w3c-valid-xhtml11.png' ).predefined = "The W3C image for valid XHTML1.1"
+      define_file_resource( 'webgen-logo', File.join( Webgen.data_dir, 'resources', 'images', 'webgen_logo.png' ),
+                            '/images/webgen-logo.png'
+                            ).predefined = "The logo of webgen as seen on the homepage."
+      define_file_resource( 'webgen-generated', File.join( Webgen.data_dir, 'resources', 'images', 'generated_by_webgen.png' ),
+                            '/images/webgen-generated-by.png'
+                            ).predefined = "A 88x31 image for use on web sites that were generated by webgen."
+      define_file_resource( 'w3c-valid-css', File.join( Webgen.data_dir, 'resources', 'images', 'valid-css.gif' ),
+                            '/images/w3c-valid-css.gif'
+                            ).predefined = 'The W3C image for valid css.'
+      define_file_resource( 'w3c-valid-xhtml11', File.join( Webgen.data_dir, 'resources', 'images', 'valid-xhtml11.png' ),
+                            '/images/w3c-valid-xhtml11.png'
+                            ).predefined = "The W3C image for valid XHTML1.1"
 
       define_webgen_emoticons
       define_webgen_icons
 
-      define_memory_resource( 'webgen-css', '/css/webgen.css' ).predefined = "Plugins use this resource for their CSS styles."
-      define_memory_resource( 'webgen-javascript', '/css/webgen.js' ).predefined = "Plugins use this resource for their Javascript fragments."
+      define_memory_resource( 'webgen-css', '/css/webgen.css'
+                              ).predefined = "Plugins use this resource for adding their CSS styles."
+      define_memory_resource( 'webgen-javascript', '/js/webgen.js'
+                              ).predefined = "Plugins use this resource for adding their Javascript fragments."
     end
 
     def define_webgen_emoticons
-      Dir[File.join( CorePlugins::Configuration.data_dir, 'resources', 'emoticons', '*/')].each do |pack_dir|
+      Dir[File.join( Webgen.data_dir, 'resources', 'emoticons', '*/')].each do |pack_dir|
         pack = File.basename( pack_dir )
         Dir[File.join( pack_dir, '*' )].each do |smiley_file|
           smiley = File.basename( smiley_file, '.*' )
@@ -217,7 +233,7 @@ module CorePlugins
     end
 
     def define_webgen_icons
-      base_dir = File.join( CorePlugins::Configuration.data_dir, 'resources', 'icons' )
+      base_dir = File.join( Webgen.data_dir, 'resources', 'icons' )
       Dir[File.join( base_dir, '**/*')].each do |icon|
         dirs = File.dirname( icon ).sub( /^#{base_dir}/, '' ).split( '/' ).join( '-' )
         dirs += '-' if dirs.length > 0
@@ -229,24 +245,26 @@ module CorePlugins
     end
 
     def define_user_resources
-      p = get_param( 'resources' )
+      p = param( 'resources' )
       if !p.kind_of?( Array ) || p.find {|h| !h.kind_of?( Array ) || h.length != 3}
-        logger.error { "Parameter resources not correctly structured!" }
+        log(:error) { "Parameter 'resources' not correctly structured!" }
         return
       end
       p.each {|name, res_path, out_path| define_file_resource( name, res_path, out_path ) }
     end
 
 
-    def write_resources
-      Webgen::Plugin.config[self.class].resources.each do |name, res|
-        if res.write_resource?
+    def write_resources( root )
+      outDir = @plugin_manager.param_for_plugin( 'Core/Configuration', 'outDir' )
+
+      @resources.each do |name, res|
+        if res.write_resource?( outDir, @plugin_manager['Core/FileHandler'] )
           begin
-            FileUtils.makedirs( File.dirname( res.dest_path ) )
-            res.write_resource
-            logger.info { "Resource #{name} written to <#{res.dest_path}>" }
+            FileUtils.makedirs( File.dirname( res.dest_path( outDir ) ) )
+            res.write_resource( outDir, @plugin_manager['Core/FileHandler'] )
+            log(:info) { "Resource '#{name}' written to <#{res.dest_path( outDir )}>" }
           rescue Exception => e
-            logger.error { "Error while writing resource #{name}: #{e.message}" }
+            log(:error) { "Error while writing resource '#{name}': #{e.message}" }
           end
         end
       end
@@ -261,22 +279,25 @@ module Tags
 
   class ResourceTag < DefaultTag
 
-    summary "Used for referencing resources"
-    description "This tag should be used output the path to a resource or the resource itself."
+    infos( :name => 'Tag/Resource',
+           :author => Webgen::AUTHOR,
+           :summary => "Used for referencing resources",
+           :description => "This tag can be used to output the path to a resource or the resource itself."
+          )
 
-    add_param 'name', nil, 'The name of the resource'
-    add_param 'insert', :path, 'What should be returned by the tag: the path to the resource (value :path) ' \
-    'or the data (value :data)'
+    param 'name', nil, 'The name of the resource'
+    param 'insert', :path, 'What should be returned by the tag: the path to the resource (value :path) ' +
+      'or the data (value :data)'
     set_mandatory 'name', true
 
-    tag 'resource'
+    register_tag 'resource'
 
-    def process_tag( tag, node, refNode )
+    def process_tag( tag, chain )
       result = ''
-      if res = Webgen::Plugin['ResourceManager'].get_resource( get_param( 'name' ) )
-        result = (get_param( 'insert' ) == :path ? res.referenced! && res.relpath_from_node( node ) : res.data )
+      if res = @plugin_manager['Core/ResourceManager'].get_resource( param( 'name' ) )
+        result = (param( 'insert' ) == :path ? res.referenced! && res.route_from( chain.last ) : res.data )
       else
-        logger.error { "Could not retrieve resource #{get_param( 'name' )} as it does not exist!" }
+        log(:error) { "Could not use resource #{param( 'name' )} as it does not exist!" }
       end
       result
     end