webgen 0.3.6 → 0.3.7

data/lib/webgen/gui/common.rb

@@ -0,0 +1,38 @@
+require 'csv'
+require 'webgen'
+
+module Webgen
+
+  class Website
+
+    attr_reader :directory
+
+    def initialize( directory )
+      @directory = directory
+    end
+
+    def files
+    end
+
+    def self.languages
+      unless defined?( @@languages )
+        @@languages = []
+        code_file = File.join( CorePlugins::Configuration.data_dir, 'data/ISO-639-2_values_8bits.txt' )
+        CSV::Reader.parse( File.open( code_file, 'r' ), ?| ) do |row|
+          @@languages << [row[0].data, row[3].data] unless !@@languages.last.nil? && @@languages.last[0] == row[0].data && @@languages.last[1] == row[3].data
+        end
+      end
+      @@languages
+    end
+
+    def self.templates
+      Dir[File.join( CorePlugins::Configuration.data_dir, 'website_templates', '*' )].collect {|f| File.basename( f )}
+    end
+
+    def self.styles
+      Dir[File.join( CorePlugins::Configuration.data_dir, 'website_styles', '*' )].collect {|f| File.basename( f )}
+    end
+
+  end
+
+end

data/lib/webgen/gui/main.rb

@@ -0,0 +1,219 @@
+begin
+  require 'RMagick'
+rescue
+  # do nothing
+  # RMagick has to be loaded before Qt else an error occursr
+end
+
+require 'Qt'
+require 'cgi'
+require 'webgen/gui/common'
+require 'webgen/gui/new_website_dlg'
+
+
+class Object
+
+  def self.set_logger( logger, set_it = false )
+    @@logger = logger if set_it
+  end
+
+end
+
+module Webgen::GUI
+
+  ERROR_PALETTE = Qt::Palette.new( Qt::red.light, Qt::red.light )
+  ERROR_PALETTE.setColor( Qt::Palette::Active, Qt::ColorGroup::Base, Qt::red.light )
+  ERROR_PALETTE.setColor( Qt::Palette::Inactive, Qt::ColorGroup::Base, Qt::red.light )
+
+
+  class Logger < Webgen::Logger
+
+    def format_message( severity, timestamp, msg, progname )
+      color = case severity
+              when 'ERROR' then '#ff0000'
+              when 'WARN' then '#880000'
+              when 'INFO' then '#008800'
+              when 'DEBUG' then '#aaaaaa'
+              end
+      msg.gsub!(/&/, '&amp;')
+      msg.gsub!(/>/, '&gt;')
+      msg.gsub!(/</, '&lt;')
+      "<font color=#{color}><b>%s</b> %5s -- %s: %s</font>" % [timestamp, severity, progname, msg ]
+    end
+
+  end
+
+
+  class LogWidget < Qt::TextEdit
+
+    slots 'toggleShown()'
+
+    # Create a LogWindow
+    def initialize( p )
+      super( p )
+      setTextFormat( Qt::LogText )
+      setFont( Qt::Font.new( "Courier" ) )
+      Object.set_logger( Logger.new( self, 0, 0, logger.level ), true )
+    end
+
+    # Invoked by the logger library for writing log messages.
+    def write( message )
+      self.append( message )
+    end
+
+    # Invoked by the logger library for closing the log device. Does nothing.
+    def close; end
+
+    def toggleShown
+      if isShown then hide else show end
+    end
+
+  end
+
+  class MainWindow < Qt::MainWindow
+
+    slots 'new()', 'open()', 'save()', 'preview_page()', 'preview_text()', 'filter_files()',
+    'run_webgen()'
+
+    def initialize
+      super
+      setCaption( 'webgen GUI' )
+      setup_window
+      setup_menus
+      @website = Webgen::Website.new( '/home/thomas/work/projects/trunk/webgen/DIR' )
+    end
+
+    def new
+      dlg = NewWebsiteDialog.new( self )
+      if dlg.exec == Qt::Dialog::Accepted
+        @website = Webgen::Website.new( dlg.website_directory )
+        #TODO init website
+      end
+    end
+
+    def open
+      #TODO save files in existing dir if necessary
+      dir = Qt::FileDialog.getExistingDirectory( @website.directory, self, nil, "Select website directory" )
+      unless dir.nil?
+        @website = Webgen::Website.new( dir )
+        #TODO init website
+      end
+    end
+
+    def save
+      #TODO What to save???
+    end
+
+    def preview_page
+      @old = @pageEditor.text
+      @pageEditor.setTextFormat( Qt::RichText )
+      @pageEditor.setText( RedCloth.new( @old ).to_html )
+    end
+
+    def preview_text
+      @pageEditor.setTextFormat( Qt::PlainText )
+      @pageEditor.setText( @old )
+    end
+
+    def filter_files
+      # set_file_list
+      # set status text
+    end
+
+    def run_webgen
+      @log.clear
+      before = Time.now
+      Webgen.run_webgen( @website.directory )
+      # call external command
+      diff = Time.now - before
+      puts diff
+    end
+
+    #######
+    private
+    #######
+
+    def setup_menus
+      filemenu = Qt::PopupMenu.new( self )
+      filemenu.insertItem( "&Create website dir...", self, SLOT("new()"), Qt::KeySequence.new( CTRL+Key_N ) )
+      filemenu.insertItem( "&Open website dir...", self, SLOT("open()"), Qt::KeySequence.new( CTRL+Key_O ) )
+      filemenu.insertItem( "&Save website", self, SLOT("save()"), Qt::KeySequence.new( CTRL+Key_S ) )
+      filemenu.insertSeparator
+      filemenu.insertItem( "&Quit", $app, SLOT("quit()"), Qt::KeySequence.new( CTRL+Key_Q ) )
+
+      toolsmenu = Qt::PopupMenu.new( self )
+      toolsmenu.insertItem( "&Run webgen...", self, SLOT("run_webgen()"), Qt::KeySequence.new( CTRL+Key_R ) )
+      toolsmenu.insertItem( "Toogle &log window", @log, SLOT('toggleShown()'), Qt::KeySequence.new( CTRL+Key_L) )
+
+      self.menuBar.insertItem( "&File", filemenu )
+      self.menuBar.insertItem( "&Tools", toolsmenu )
+    end
+
+    def setup_window
+      mainWidget = Qt::Splitter.new( Qt::Vertical, self )
+      mainWidget.setOpaqueResize( true )
+
+      upperWidget = Qt::Widget.new( mainWidget )
+
+      left = Qt::Widget.new( upperWidget )
+      setup_file_list( left )
+      setup_file_view( upperWidget )
+
+      mainLayout = Qt::HBoxLayout.new( upperWidget )
+      mainLayout.setSpacing( 3 )
+      mainLayout.setMargin( 3 )
+      mainLayout.addWidget( left )
+      mainLayout.addWidget( @fileView, 1 )
+
+      @log = LogWidget.new( mainWidget )
+      @log.hide
+
+      setCentralWidget( mainWidget )
+    end
+
+    def setup_file_list( mainWidget )
+      button = Qt::PushButton.new( 'Clear', mainWidget )
+      @filter = Qt::LineEdit.new( mainWidget )
+      @filter.setMinimumWidth( 200 )
+
+      connect( button, SIGNAL('clicked()'), @filter, SLOT('clear()') )
+      connect( @filter, SIGNAL('textChanged(const QString&)'), self, SLOT('filter_files()') )
+
+      @fileList = Qt::ListBox.new( mainWidget )
+
+      @fileStatusText = Qt::Label.new( mainWidget )
+      @fileStatusText.setText( 'something' )
+
+      filterLayout = Qt::HBoxLayout.new
+      filterLayout.addWidget( @filter )
+      filterLayout.addWidget( button )
+
+      layout = Qt::VBoxLayout.new( mainWidget )
+      layout.setSpacing( 3 )
+      layout.addLayout( filterLayout )
+      layout.addWidget( @fileList )
+      layout.addWidget( @fileStatusText )
+    end
+
+    def setup_file_view( mainWidget )
+      @fileView = Qt::WidgetStack.new( mainWidget )
+      @fileView.setMinimumSize( 300, 300 )
+
+      main = Qt::Widget.new( @fileView )
+      @pageEditor = Qt::TextEdit.new( main )
+      @pageEditor.setTextFormat( Qt::PlainText )
+      button = Qt::PushButton.new( "Preview", main )
+      connect( button, SIGNAL('pressed()'), self, SLOT('preview_page()') )
+      connect( button, SIGNAL('released()'), self, SLOT('preview_text()') )
+      layout = Qt::VBoxLayout.new( main )
+      layout.setSpacing( 3 )
+      layout.addWidget( @pageEditor )
+      layout.addWidget( button )
+
+
+      @imageViewer = Qt::Label.new( @fileView )
+    end
+
+  end
+
+end

data/lib/webgen/gui/new_website_dlg.rb

@@ -0,0 +1,125 @@
+module Webgen::GUI
+
+  class NewWebsiteDialog < Qt::Dialog
+
+    slots 'choose_dir()', 'check_input()', 'create_website()'
+    signals 'input_valid(bool)'
+
+    def initialize( parent )
+      super( parent )
+      setCaption( "Create new website..." )
+      setup_window
+    end
+
+    def setup_window
+      layout = Qt::VBoxLayout.new( self, 10, 10 )
+
+      mainLayout = Qt::GridLayout.new( 5, 2, 3 )
+
+      mainLayout.addWidget( Qt::Label.new( "Directory:", self ), 0, 0 )
+      box = Qt::HBoxLayout.new( 3 )
+      @directory = Qt::LineEdit.new( self )
+      @directory.setText( Dir.pwd )
+      connect( @directory, SIGNAL('textChanged(const QString&)'), self, SLOT('check_input()') )
+      dirChooser = Qt::PushButton.new( "...", self )
+      connect( dirChooser, SIGNAL('clicked()'), self, SLOT('choose_dir()') )
+      box.addWidget( @directory )
+      box.addWidget( dirChooser )
+      mainLayout.addLayout( box, 0, 1 )
+
+      mainLayout.addWidget( Qt::Label.new( "Website name:", self ), 1, 0 )
+      @website = Qt::LineEdit.new( self )
+      @website.setFocus()
+      connect( @website, SIGNAL('textChanged(const QString&)'), self, SLOT('check_input()') )
+      mainLayout.addWidget( @website, 1, 1 )
+
+      mainLayout.addWidget( Qt::Label.new( "Website template:", self ), 2, 0 )
+      @template = Qt::ComboBox.new( self )
+      @template.insertStringList( Webgen::Website.templates.sort )
+      @template.setCurrentText( 'default' )
+      mainLayout.addWidget( @template, 2, 1 )
+
+      mainLayout.addWidget( Qt::Label.new( "Website style:", self ), 3, 0 )
+      @style = Qt::ComboBox.new( self )
+      @style.insertStringList( Webgen::Website.styles.sort )
+      @style.setCurrentText( 'default' )
+      mainLayout.addWidget( @style, 3, 1 )
+
+      mainLayout.addWidget( Qt::Label.new( "Main language:", self ), 4, 0 )
+      @language = Qt::ComboBox.new( self )
+      @language.insertStringList( Webgen::Website.languages.collect {|l| l[1]}.sort )
+      @language.setCurrentText( 'English' )
+      mainLayout.addWidget( @language, 4, 1 )
+
+      box = Qt::HBoxLayout.new( 3 )
+      box.addStretch( 1 )
+      @cancel = Qt::PushButton.new( "Cancel", self )
+      connect( @cancel, SIGNAL('clicked()'), self, SLOT('reject()') )
+      box.addWidget( @cancel )
+      @create = Qt::PushButton.new( "Create", self )
+      @create.setEnabled( false )
+      connect( @create, SIGNAL('clicked()'), self, SLOT('create_website()') )
+      connect( self, SIGNAL('input_valid(bool)'), @create, SLOT('setEnabled(bool)') )
+      @create.setDefault( true )
+      box.addWidget( @create )
+
+      layout.addLayout( mainLayout )
+      layout.addLayout( box )
+      layout.setResizeMode( Qt::Layout::Fixed )
+
+      check_input
+    end
+
+    def choose_dir
+      newdir = Qt::FileDialog.getExistingDirectory( @directory.text, self, nil, "Select website base directory" )
+      @directory.setText( newdir ) unless newdir.nil?
+    end
+
+    def check_input
+      valid = true
+
+      #check website parent dir
+      if File.directory?( @directory.text )
+        @directory.unsetPalette()
+      else
+        valid = false
+        @directory.setPalette( Webgen::GUI::ERROR_PALETTE )
+      end
+
+      # check website name
+      if @website.text.empty? || File.exists?( File.join( @directory.text, @website.text ) )
+        valid = false
+        @website.setPalette( Webgen::GUI::ERROR_PALETTE )
+      else
+        @website.unsetPalette()
+      end
+
+      emit input_valid( valid )
+    end
+
+    def website_directory
+      File.join( @directory.text, @website.text )
+    end
+
+    #######
+    private
+    #######
+
+    def create_website
+      template = @template.currentText
+      style = @style.currentText
+      lang = Webgen::Website.languages.rassoc( @language.currentText )[0]
+      begin
+        Webgen.create_website( website_directory, template, style )
+        File.open( File.join( website_directory, 'config.yaml' ), 'a+' ) {|f| f.write( "Configuration:\n  lang: #{lang}" ) }
+      rescue RuntimeError, SystemCallError => e
+        Qt::MessageBox.critical( self, "Creation error", "Could not create website: \n#{e.message}",
+                                 Qt::MessageBox::Ok, Qt::MessageBox::NoButton, Qt::MessageBox::NoButton )
+        return
+      end
+      accept
+    end
+
+  end
+
+end

data/lib/webgen/listener.rb

@@ -1,7 +1,7 @@
 #
 #--
 #
-# $Id: listener.rb 334 2005-08-23 19:11:53Z thomas $
+# $Id: listener.rb 271 2005-05-09 08:50:47Z thomas $
 #
 # webgen: template based static website generator
 # Copyright (C) 2004 Thomas Leitner

data/lib/webgen/node.rb

@@ -1,7 +1,7 @@
 #
 #--
 #
-# $Id: node.rb 334 2005-08-23 19:11:53Z thomas $
+# $Id: node.rb 336 2005-08-25 06:23:46Z thomas $
 #
 # webgen: template based static website generator
 # Copyright (C) 2004 Thomas Leitner
@@ -149,6 +149,8 @@ class Node
   #######
 
   def get_node_for_string( destString, metainfo='dest' )
+    return self if destString == ''
+
     if /^\// =~ destString
       node = Node.root( self )
       destString = destString[1..-1]
@@ -158,7 +160,7 @@ class Node
 
     startElement = node
     elements = destString.split( '/' )
-    pagelang = (/\.(\w\w)\.page$/ =~ destString ? $1 : Webgen::Plugin['Configuration']['lang'])
+    pagelang = (/\.(\w\w\w?)\.page$/ =~ destString ? $1 : Webgen::Plugin['Configuration']['lang'])
 
     elements.each do |element|
       break if node.nil?

data/lib/webgen/plugin.rb

@@ -1,7 +1,7 @@
 #
 #--
 #
-# $Id: plugin.rb 334 2005-08-23 19:11:53Z thomas $
+# $Id: plugin.rb 348 2005-09-02 08:43:33Z thomas $
 #
 # webgen: template based static website generator
 # Copyright (C) 2004 Thomas Leitner
@@ -29,93 +29,164 @@ end
 
 module Webgen
 
-  # Base class for all plugins.
-  class Plugin
+  # Base module for all plugins. This module should be included by classes which need to derive from
+  # an existing class but also need the power of the plugin system. If a class does not have any
+  # base class, it is better to derive it from Webgen::Plugin instead of including this module.
+  module PluginDefs
+
+    # All the methods of this module become class methods in the classes which include the
+    # PluginDefs module.
+    module ClassMethods
+
+      # Holds the plugin data from each and every plugin.
+      @@config = {}
+      @@configFileData = {}
+
+      # Reloads the configuration file data.
+      def load_config_file
+        @@configFileData = ( File.exists?( 'config.yaml' ) ? YAML::load( File.new( 'config.yaml' ) ) : {} )
+        @@configFileData = {} unless @@configFileData.kind_of?( Hash )
+        @@configFileData.each do |pluginName, params|
+          next if (pair = @@config.find {|pluginKlass, data| data.plugin == pluginName}).nil?
+          if params.kind_of?( Hash ) && !pair[1].params.nil?
+            pair[1].params.each do |name, value|
+              set_param( pluginName, name, params[name] ) if params.has_key?( name )
+            end
+          end
+        end
+      end
 
-    # Holds the plugin data from each and every plugin.
-    @@config = {}
-    @@configFileData = ( File.exists?( 'config.yaml' ) ? YAML::load( File.new( 'config.yaml' ) ) : {} )
+      # Reset the configuration data. The configuration has to be initialized again.
+      def reset_config_data
+        @@config.each do |pluginKlass, data|
+          if pluginKlass != Logging && pluginKlass != Configuration
+            data.obj = nil
+          end
+          data.params.each {|name, p| set_param( data.plugin, name, p.default ) } if data.params
+        end
+        load_config_file
+      end
 
-    # Return plugin data
-    def self.config
-      @@config
-    end
+      # Return plugin data
+      def config
+        @@config
+      end
 
-    # Shortcut for getting the plugin with the name +name+.
-    def self.[]( name )
-      pair = @@config.find {|k,v| v.plugin == name }
-      self.logger.warn { "Could not retrieve plugin '#{name}' as such a plugin does not exist!" } if pair.nil?
-      pair[1].obj unless pair.nil?
-    end
+      # Shortcut for getting the plugin with the name +name+.
+      def []( name )
+        pair = @@config.find {|k,v| v.plugin == name }
+        self.logger.warn { "Could not retrieve plugin '#{name}' as such a plugin does not exist!" } if pair.nil?
+        pair[1].obj unless pair.nil?
+      end
 
-    # Add subclass to plugin data.
-    def self.inherited( klass )
-      (@@config[klass] = OpenStruct.new).klass = klass
-      @@config[klass].plugin = klass.name.split( /::/ ).last
-    end
+      # Add subclass to plugin data.
+      def inherited( klass )
+        ClassMethods.extended( klass )
+      end
 
-    ['summary', 'description'].each do |name|
-      self.module_eval "def self.#{name}( obj ); @@config[self].#{name} = obj; end"
-    end
+      # Called when PluginDefs is included in another class. Add this class to plugin data.
+      def self.extended( klass )
+        if (klass != Webgen::Plugin) && (klass != Webgen::CommandPlugin)
+          (@@config[klass] = OpenStruct.new).klass = klass
+          @@config[klass].plugin = klass.name.split( /::/ ).last
+        end
+      end
 
-    # Add a dependency to the plugin. Dependencies are instantiated before the plugin gets
-    # instantiated.
-    def self.depends_on( *dep )
-      dep.each {|d| (@@config[self].dependencies ||= []) << d}
-    end
+      ['summary', 'description'].each do |name|
+        module_eval "def #{name}( obj ); @@config[self].#{name} = obj; end"
+      end
 
-    # Specify which meta information entries are used by the plugin.
-    def self.used_meta_info( *names )
-      names.each {|n| (@@config[self].used_meta_info ||= []) << n }
-    end
 
-    # Add a parameter for the current class. Has to be used by subclasses to define their parameters!
-    #
-    # Arguments:
-    # +name+:: the name of the parameter
-    # +default+:: the default value of the parameter
-    # +description+:: a small description of the parameter
-    # +changeHandler+:: optional, method/proc which is invoked every time the parameter is changed.
-    #                   Handler signature: changeHandler( paramName, oldValue, newValue )
-    def self.add_param( name, default, description, changeHandler = nil )
-      self.logger.debug { "Adding parameter '#{name}' for plugin class '#{self.name}'" }
-      if @@configFileData.kind_of?( Hash ) && @@configFileData.has_key?( @@config[self].plugin ) \
-        && @@configFileData[@@config[self].plugin].kind_of?( Hash ) && @@configFileData[@@config[self].plugin].has_key?( name )
-        curval = @@configFileData[@@config[self].plugin][name]
-        self.logger.debug { "Using configured value for parameter #{@@config[self].plugin} -> #{name}" }
-      else
-        curval = default
+      # Add a dependency to the plugin. Dependencies are instantiated before the plugin gets
+      # instantiated.
+      def depends_on( *dep )
+        dep.each {|d| (@@config[self].dependencies ||= []) << d}
+      end
+
+      # Specify which meta information entries are used by the plugin.
+      def used_meta_info( *names )
+        names.each {|n| (@@config[self].used_meta_info ||= []) << n }
+      end
+
+      # Add a parameter for the current class. Has to be used by subclasses to define their parameters!
+      #
+      # Arguments:
+      # +name+:: the name of the parameter
+      # +default+:: the default value of the parameter
+      # +description+:: a small description of the parameter
+      # +changeHandler+:: optional, method/proc which is invoked every time the parameter is changed.
+      #                   Handler signature: changeHandler( paramName, oldValue, newValue )
+      def add_param( name, default, description, changeHandler = nil )
+        self.logger.debug { "Adding parameter '#{name}' for plugin class '#{self.name}'" }
+        if @@configFileData.kind_of?( Hash ) && @@configFileData.has_key?( @@config[self].plugin ) \
+          && @@configFileData[@@config[self].plugin].kind_of?( Hash ) && @@configFileData[@@config[self].plugin].has_key?( name )
+          curval = @@configFileData[@@config[self].plugin][name]
+          self.logger.debug { "Using configured value for parameter #{@@config[self].plugin} -> #{name}" }
+        else
+          curval = default
+        end
+        data = OpenStruct.new( :name => name, :value => curval, :default => default, :description => description, :changeHandler => changeHandler )
+        (@@config[self].params ||= {})[name] = data
+        changeHandler.call( name, default, curval ) if changeHandler
       end
-      data = OpenStruct.new( :name => name, :value => curval, :default => default, :description => description, :changeHandler => changeHandler )
-      (@@config[self].params ||= {})[name] = data
-      changeHandler.call( name, default, curval ) if changeHandler
-    end
 
-    # Set parameter +name+ for +plugin+ to +value+.
-    def self.set_param( plugin, name, value )
-      found = catch( :found ) do
-        item = @@config.find {|k,v| v.plugin == plugin }[1]
-        item.klass.ancestor_classes.each do |k|
-          item = @@config[k]
-          if !item.nil? && !item.params.nil? && item.params.has_key?( name )
-            oldvalue = item.params[name].value
-            item.params[name].value = value
-            item.params[name].changeHandler.call( name, oldvalue, value ) if item.params[name].changeHandler
-            logger.debug { "Set parameter '#{name}' for plugin '#{plugin}' to #{value.inspect}" }
-            throw :found, true
+      # Set parameter +name+ for +plugin+ to +value+.
+      def set_param( plugin, name, value )
+        found = catch( :found ) do
+          item = @@config.find {|k,v| v.plugin == plugin }[1]
+          item.klass.ancestor_classes.each do |k|
+            item = @@config[k]
+            if !item.nil? && !item.params.nil? && item.params.has_key?( name )
+              oldvalue = item.params[name].value
+              item.params[name].value = value
+              item.params[name].changeHandler.call( name, oldvalue, value ) if item.params[name].changeHandler
+              logger.debug { "Set parameter '#{name}' for plugin '#{plugin}' to #{value.inspect}" }
+              throw :found, true
+            end
           end
         end
+        logger.error { "Cannot set undefined parameter '#{name}' for plugin '#{plugin}'" } unless found
+      end
+
+      def get_param( name )
+        ancestor_classes.each do |klass|
+          data = @@config[klass]
+          return data.params[name].value unless data.params.nil? || data.params[name].nil?
+        end
+        logger.error { "Referencing invalid configuration value '#{name}' in class #{self.name}" }
+        return nil
+      end
+
+      # Defines a new *handler class. The methods creates two methods based on the parameter +name+:
+      # - klass.register_[name]
+      # - object.get_[name]
+      def define_handler( name )
+        s = "def self.register_#{name}( param )
+        self.logger.info { \"Registering class \#{self.name} for handling #{name} '\#{param}'\" }
+        (Webgen::Plugin.config[#{self.name}].#{name}s ||= {})[param] = self
+        Webgen::Plugin.config[self].registered_#{name} = param
+      end\n"
+        s += "def get_#{name}( param )
+        if Webgen::Plugin.config[#{self.name}].#{name}s.has_key?( param )
+          Webgen::Plugin.config[Webgen::Plugin.config[#{self.name}].#{name}s[param]].obj
+        else
+          self.logger.error { \"Invalid #{name} specified: \#{param}! Using #{self.name}!\" }
+           Webgen::Plugin.config[#{self.name}].obj
+        end
+      end"
+        module_eval s
       end
-      logger.error { "Cannot set undefined parameter '#{name}' for plugin '#{plugin}'" } unless found
-    end
 
-    def self.get_param( name )
-      ancestor_classes.each do |klass|
-        data = @@config[klass]
-        return data.params[name].value unless data.params.nil? || data.params[name].nil?
+      # Return the ancestor classes for the object's class which are sub classes from Plugin.
+      def ancestor_classes
+        ancestors.delete_if {|c| c.instance_of?( Module ) }[0..-3]
       end
-      logger.error { "Referencing invalid configuration value '#{name}' in class #{self.class.name}" }
-      return nil
+
+    end
+
+    def self.append_features( klass )
+      super
+      klass.extend( ClassMethods )
     end
 
     # Return parameter +name+.
@@ -126,45 +197,41 @@ module Webgen
 
     # Set parameter +name+.
     def []=( name, value )
-      self.class.set_param( @@config[self.class].plugin, name, value )
+      self.class.set_param( self.class.config[self.class].plugin, name, value )
     end
 
     # Checks if the plugin has a parameter +name+.
     def has_param?( name )
       self.class.ancestor_classes.any? do |klass|
-        !@@config[klass].params.nil? && @@config[klass].params.has_key?( name )
+        !self.class.config[klass].params.nil? && self.class.config[klass].params.has_key?( name )
       end
     end
 
-    # Defines a new *handler class. The methods creates two methods based on the parameter +name+:
-    # - klass.register_[name]
-    # - object.get_[name]
-    def self.define_handler( name )
-      s = "def self.register_#{name}( param )
-        self.logger.info { \"Registering class \#{self.name} for handling '\#{param}'\" }
-        (Webgen::Plugin.config[#{self.name}].#{name}s ||= {})[param] = self
-        Webgen::Plugin.config[self].registered_#{name} = param
-      end\n"
-      s += "def get_#{name}( param )
-        if Webgen::Plugin.config[#{self.name}].#{name}s.has_key?( param )
-          Webgen::Plugin.config[Webgen::Plugin.config[#{self.name}].#{name}s[param]].obj
-        else
-          self.logger.error { \"Invalid #{name} specified: \#{param}! Using #{self.name}!\" }
-           Webgen::Plugin.config[#{self.name}].obj
-        end
-      end"
-      module_eval s
-    end
+  end
 
-    # Return the ancestor classes for the object's class which are sub classes from Plugin.
-    def self.ancestor_classes
-      self.ancestors.delete_if {|c| c.instance_of?( Module ) }[0..-3]
-    end
+  module CommandPlugin; end
+
+  # The base class for all plugins.
+  class Plugin
+    include PluginDefs
 
+    load_config_file
+  end
+
+  # This module should be included by classes derived from CommandParser::Command as it
+  # automatically adds an object of the class to the main CommandParser object.
+  module CommandPlugin
+    include PluginDefs
+
+    def self.append_features( klass )
+      super
+      PluginDefs.append_features( klass )
+      klass.extend( ClassMethods )
+    end
   end
 
-  require 'webgen/logging'
-  require 'webgen/configuration'
+  require 'webgen/plugins/coreplugins/logging'
+  require 'webgen/plugins/coreplugins/configuration'
 
 end