gettalong-webgen 0.5.5.20081001 → 0.5.5.20081010

data/lib/webgen/sourcehandler/copy.rb

@@ -7,8 +7,8 @@ module Webgen::SourceHandler
     include Webgen::WebsiteAccess
     include Base
 
-    # Create the node for +parent+ and +path+. If the +path+ has the name of a content processor in
-    # the extension, it is preprocessed.
+    # Create the node for +parent+ and +path+. If the +path+ has the name of a content processor as
+    # the first part in the extension, it is preprocessed.
     def create_node(parent, path)
       if path.ext.index('.')
         processor, *rest = path.ext.split('.')

data/lib/webgen/sourcehandler/directory.rb

@@ -1,24 +1,27 @@
-require 'webgen/sourcehandler/base'
-
 module Webgen::SourceHandler
 
   # Handles directory source paths.
   class Directory
 
     include Base
+    include Webgen::WebsiteAccess
+
+    def initialize # :nodoc:
+      website.blackboard.add_service(:create_directories, method(:create_directories))
+    end
 
-    # Creation of directory nodes is special because once they are created, they are only deleted
-    # when the source path gets deleted. Otherwise, only the meta information of the node gets
-    # updated.
-    def create_node(parent, path)
-      if node = node_exists?(parent, path)
-        node.meta_info.clear
-        node.meta_info.update(path.meta_info)
-        node.dirty = true
-        node
-      else
-        super(parent, path)
+    # Recursively create the directories specified in +dirname+ under +parent+ (a leading slash is
+    # ignored). The path +path+ is the path that lead to the creation of these directories.
+    def create_directories(parent, dirname, path)
+      dirname.sub(/^\//, '').split('/').each do |dir|
+        dir_path = Webgen::Path.new(File.join(parent.absolute_lcn, dir, '/'), path)
+        nodes = website.blackboard.invoke(:create_nodes, parent.tree, parent.absolute_lcn,
+                                           dir_path, self) do |dir_parent, dir_path|
+          node_exists?(dir_parent, dir_path) || create_node(dir_parent, dir_path)
+        end
+        parent = nodes.first
       end
+      parent
     end
 
     # Return an empty string to signal that the directory should be written to the output.

data/lib/webgen/sourcehandler/feed.rb

@@ -1,6 +1,3 @@
-require 'webgen/websiteaccess'
-require 'webgen/sourcehandler/base'
-
 module Webgen::SourceHandler
 
   # Source handler for creating atom and/or rss feeds.
@@ -107,12 +104,12 @@ module Webgen::SourceHandler
       feed
     end
 
-    # Check if the +node+ has meta information from any meta info node and if so, if the meta info
-    # node in question has changed.
+    # Check if the any of the nodes used by this feed +node+ have changed and then mark the node as
+    # dirty.
     def node_changed?(node)
       return if node.node_info[:processor] != self.class.name
       entries = node.feed_entries
-      node.dirty = true if entries.map {|n| n.absolute_lcn } != website.cache[[:sourcehandler_feed, node.node_info[:src]]] ||
+      node.flag(:dirty) if entries.map {|n| n.absolute_lcn } != website.cache[[:sourcehandler_feed, node.node_info[:src]]] ||
         entries.any? {|n| n.changed?}
     end
 

data/lib/webgen/sourcehandler/fragment.rb

@@ -1,6 +1,3 @@
-require 'webgen/sourcehandler/base'
-require 'webgen/websiteaccess'
-
 module Webgen::SourceHandler
 
   # Handles page fragment nodes and provides utility methods for parsing HTML headers and generating
@@ -53,15 +50,13 @@ module Webgen::SourceHandler
     def create_fragment_nodes(sections, parent, path, in_menu, si = 1000 )
       sections.each do |level, id, title, sub_sections|
         node = website.blackboard.invoke(:create_nodes, parent.tree, parent.absolute_lcn,
-                                         path, self) do |cn_parent, cn_path|
-          ptemp = Webgen::Path.new('#' + id)
-          ptemp.meta_info = cn_path.meta_info.merge(ptemp.meta_info)
-          create_node(cn_parent, ptemp)
+                                         Webgen::Path.new('#' + id, path.source_path),
+                                         self) do |cn_parent, cn_path|
+          cn_path.meta_info['title'] = title
+          cn_path.meta_info['in_menu'] = in_menu
+          cn_path.meta_info['sort_info'] = si = si.succ
+          create_node(cn_parent, cn_path)
         end.first
-        node['title'] = title
-        node['in_menu'] = in_menu
-        node['sort_info'] = si = si.succ
-        node.node_info[:src] = path.path
         create_fragment_nodes(sub_sections, node, path, in_menu, si.succ)
       end
     end

data/lib/webgen/sourcehandler/memory.rb

@@ -0,0 +1,41 @@
+module Webgen::SourceHandler
+
+  # This source handler should be used for handling nodes that are created during the write
+  # phase.
+  class Memory
+
+    include Webgen::WebsiteAccess
+    include Base
+
+    def initialize #:nodoc:
+      website.blackboard.add_listener(:node_flagged) do |node, *flags|
+        node.tree[node.node_info[:memory_source_alcn]].flag(:dirty) if node.node_info[:memory_source_alcn]
+      end
+    end
+
+    # Create a node under +parent+ for the +path+. The +source_alcn+ specified the node that creates
+    # this memory node when written. You have two options for providing the content for this node:
+    # either you set +data+ to a string (or a Webgen::Path::SourceIO object) or you provide a block
+    # which takes the created node as argument and return a string (or a Webgen::Path::SourceIO
+    # object).
+    def create_node(parent, path, source_alcn, data = nil)
+      super(parent, path) do |node|
+        node.node_info[:memory_source_alcn] = source_alcn
+        (@data ||= {})[node.absolute_lcn] = lambda { data || yield(node) }
+      end
+    end
+
+    # Return the content of the memory +node+. If the memory node was not created in this webgen
+    # run, it will be flagged for reinitialization (and therefore recreation).
+    def content(node)
+      if @data && @data[node.absolute_lcn]
+        @data[node.absolute_lcn].call
+      else
+        node.flag(:reinit)
+        nil
+      end
+    end
+
+  end
+
+end

data/lib/webgen/sourcehandler/metainfo.rb

@@ -1,7 +1,5 @@
 require 'pathname'
 require 'yaml'
-require 'webgen/sourcehandler/base'
-require 'webgen/websiteaccess'
 
 module Webgen::SourceHandler
 
@@ -19,7 +17,7 @@ module Webgen::SourceHandler
       website.blackboard.add_listener(:before_node_created, method(:before_node_created))
       website.blackboard.add_listener(:before_node_deleted, method(:before_node_deleted))
       website.blackboard.add_listener(:after_node_created, method(:after_node_created))
-      self.nodes ||= Set.new
+      self.nodes ||= []
     end
 
     # Create a meta info node from +parent+ and +path+.
@@ -30,18 +28,18 @@ module Webgen::SourceHandler
           node.node_info[mi_key] = {}
           YAML::load(page.blocks[block_name].content).each do |key, value|
             key = Pathname.new(key =~ /^\// ? key : File.join(parent.absolute_lcn, key)).cleanpath.to_s
-            key.chomp('/') unless key == '/'
             node.node_info[mi_key][key] = value
           end if page.blocks.has_key?(block_name)
         end
-        website.cache[[:sh_metainfo_node_mi, node.absolute_lcn]] = {
+
+        mark_all_matched_dirty(node, :no_old_data)
+
+        website.cache.permanent[[:sh_metainfo_node_mi, node.absolute_lcn]] = {
           :mi_paths => node.node_info[:mi_paths],
           :mi_alcn => node.node_info[:mi_alcn]
         }
 
-        mark_all_matched_dirty(node)
-
-        self.nodes << node
+        self.nodes << node unless self.nodes.include?(node)
         self.nodes = self.nodes.sort_by {|n| n.absolute_lcn}
       end
     end
@@ -59,19 +57,21 @@ module Webgen::SourceHandler
     #######
 
     # Return +true+ if any meta information for +node+ provided by +mi_node+ has changed.
-    def meta_info_changed?(mi_node, node, use_cache = true)
-      use_cache = false if !website.cache.old_data[[:sh_metainfo_node_mi, mi_node.absolute_lcn]]
-      cached = website.cache[[:sh_metainfo_node_mi, mi_node.absolute_lcn]]
-      path = website.blackboard.invoke(:source_paths)[node.node_info[:src]]
-      (mi_node.node_info[:mi_paths].any? {|pattern, mi| path =~ pattern && (!use_cache || mi != cached[:mi_paths][pattern])} ||
-       mi_node.node_info[:mi_alcn].any? {|pattern, mi| node =~ pattern && (!use_cache || mi != cached[:mi_alcn][pattern])})
+    def meta_info_changed?(mi_node, node, option = nil)
+      cached = website.cache.permanent[[:sh_metainfo_node_mi, mi_node.absolute_lcn]]
+      (mi_node.node_info[:mi_paths].any? do |pattern, mi|
+         Webgen::Path.match(node.node_info[:creation_path], pattern) &&
+           (option == :force || (!cached && option == :no_old_data) || mi != cached[:mi_paths][pattern])
+       end || mi_node.node_info[:mi_alcn].any? do |pattern, mi|
+         node =~ pattern && (option == :force || (!cached && option == :no_old_data) || mi != cached[:mi_alcn][pattern])
+       end)
     end
 
     # Mark all nodes that are matched by a path or an alcn specifcation in the meta info node +node+
     # as dirty.
-    def mark_all_matched_dirty(node, use_cache = true)
+    def mark_all_matched_dirty(node, option = nil)
       node.tree.node_access[:alcn].each do |path, n|
-        n.dirty_meta_info = true if meta_info_changed?(node, n, use_cache)
+        n.flag(:dirty_meta_info) if meta_info_changed?(node, n, option)
       end
     end
 
@@ -79,7 +79,7 @@ module Webgen::SourceHandler
     def before_node_created(parent, path)
       self.nodes.each do |node|
         node.node_info[:mi_paths].each do |pattern, mi|
-          path.meta_info.update(mi) if path =~ pattern
+          path.meta_info.update(mi) if Webgen::Path.match(path, pattern)
         end
       end
     end
@@ -96,10 +96,9 @@ module Webgen::SourceHandler
     # Check if the +node+ has meta information from any meta info node and if so, if the meta info
     # node in question has changed.
     def node_meta_info_changed?(node)
-      return if self.nodes.include?(node)
       self.nodes.each do |n|
-        if n.created && meta_info_changed?(n, node)
-          node.dirty_meta_info = true
+        if n.flagged(:created) && meta_info_changed?(n, node)
+          node.flag(:dirty_meta_info)
           return
         end
       end
@@ -108,7 +107,8 @@ module Webgen::SourceHandler
     # Delete the meta info node +node+ from the internal array.
     def before_node_deleted(node)
       return unless node.node_info[:processor] == self.class.name
-      mark_all_matched_dirty(node, false) if !website.blackboard.invoke(:source_paths).include?(node.node_info[:src])
+      mark_all_matched_dirty(node, :force)
+      website.cache.permanent.delete([:sh_metainfo_node_mi, node.absolute_lcn])
       self.nodes.delete(node)
     end
 

data/lib/webgen/sourcehandler/page.rb

@@ -1,6 +1,3 @@
-require 'webgen/websiteaccess'
-require 'webgen/sourcehandler/base'
-
 module Webgen::SourceHandler
 
   # Source handler for handling content files in Webgen Page Format.
@@ -20,7 +17,7 @@ module Webgen::SourceHandler
       path.ext = 'html' if path.ext == 'page'
 
       super(parent, path) do |node|
-        website.cache[[:sh_page_node_mi, node.absolute_lcn]] = node.meta_info.dup
+        node.node_info[:sh_page_node_mi] = Webgen::Page.meta_info_from_data(path.io.data)
 
         node.node_info[:page] = page
         tmp_logger = website.logger
@@ -35,7 +32,7 @@ module Webgen::SourceHandler
         website.cache.permanent[:page_sections][node.absolute_lcn] = sections
         website.blackboard.invoke(:create_fragment_nodes,
                                   sections,
-                                  node, website.blackboard.invoke(:source_paths)[path.path],
+                                  node, website.blackboard.invoke(:source_paths)[path.source_path],
                                   node.meta_info['fragments_in_menu'])
         website.logger = tmp_logger
       end
@@ -63,13 +60,12 @@ module Webgen::SourceHandler
 
     # Checks if the meta information provided by the file in Webgen Page Format changed.
     def meta_info_changed?(node)
-      return if !node.created || node.node_info[:processor] != self.class.name
-      ckey = [:sh_page_node_mi, node.absolute_lcn]
-      old_mi = website.cache.old_data[ckey]
-      old_mi.delete('modified_at') if old_mi
-      new_mi = website.cache.new_data[ckey]
-      new_mi.delete('modified_at')
-      node.dirty_meta_info = true if old_mi != new_mi
+      path = website.blackboard.invoke(:source_paths)[node.node_info[:src]]
+      return if node.node_info[:processor] != self.class.name || !path.changed?
+
+      old_mi = node.node_info[:sh_page_node_mi]
+      new_mi = Webgen::Page.meta_info_from_data(path.io.data)
+      node.flag(:dirty_meta_info) if old_mi && old_mi != new_mi
     end
 
   end

data/lib/webgen/sourcehandler/sitemap.rb

@@ -1,5 +1,3 @@
-require 'webgen/websiteaccess'
-require 'webgen/sourcehandler/base'
 require 'uri'
 require 'time'
 

data/lib/webgen/sourcehandler/template.rb

@@ -1,7 +1,3 @@
-require 'webgen/websiteaccess'
-require 'webgen/loggable'
-require 'webgen/sourcehandler/base'
-
 module Webgen::SourceHandler
 
   # Source handler for handling template files in Webgen Page Format.

data/lib/webgen/sourcehandler/virtual.rb

@@ -1,7 +1,5 @@
 require 'uri'
 require 'yaml'
-require 'webgen/sourcehandler/base'
-require 'webgen/websiteaccess'
 
 module Webgen::SourceHandler
 
@@ -18,22 +16,25 @@ module Webgen::SourceHandler
     def create_node(parent, path)
       page = page_from_path(path)
       nodes = []
-      YAML::load(page.blocks['content'].content).each do |key, value|
+      YAML::load(page.blocks['content'].content).each do |key, meta_info|
         key = (key =~ /^\// ? key : File.join(parent.absolute_lcn, key))
         temp_parent = create_directories(parent.tree.root, File.dirname(key), path)
 
-        temp_path = Webgen::Path.new(key)
-        temp_path.meta_info.update(value || {})
-        temp_path.meta_info['modified_at'] = path.meta_info['modified_at']
-        temp_path.meta_info['no_output'] = true
-        output_path = temp_path.meta_info.delete('url') || key
+        meta_info ||= {}
+        meta_info['modified_at'] = path.meta_info['modified_at']
+        meta_info['no_output'] = true
+        output_path = meta_info.delete('url') || key
         output_path = (URI::parse(output_path).absolute? || output_path =~ /^\// ?
                        output_path : File.join(temp_parent.absolute_lcn, output_path))
 
         if key =~ /\/$/
-          nodes << create_directory(temp_parent, key, path, temp_path.meta_info)
+          nodes << create_directory(temp_parent, key, path, meta_info)
         else
-          nodes << super(temp_parent, temp_path, output_path) {|n| n.node_info[:src] = path.path}
+          nodes += website.blackboard.invoke(:create_nodes, parent.tree, temp_parent.absolute_lcn,
+                                             Webgen::Path.new(key, path.source_path), self) do |cn_parent, cn_path|
+            cn_path.meta_info.update(meta_info)
+            super(cn_parent, cn_path, output_path)
+          end
         end
       end if page.blocks.has_key?('content')
       nodes.compact
@@ -55,17 +56,16 @@ module Webgen::SourceHandler
     def create_directory(parent, dir, path, meta_info = nil)
       dir_handler = website.cache.instance('Webgen::SourceHandler::Directory')
       website.blackboard.invoke(:create_nodes, parent.tree, parent.absolute_lcn,
-                                Webgen::Path.new(File.join(dir, '/')),
+                                Webgen::Path.new(File.join(dir, '/'), path.source_path),
                                 dir_handler) do |par, temp_path|
-        node = nil
-        if (node = dir_handler.node_exists?(par, temp_path)) && (!meta_info || node.node_info[:src] != path.path)
-          parent, node = node, nil
-        else
+        parent = dir_handler.node_exists?(par, temp_path)
+        if (parent && (parent.node_info[:src] == path.source_path) && !meta_info.nil?) ||
+            !parent
           temp_path.meta_info.update(meta_info) if meta_info
-          parent = node = dir_handler.create_node(par, temp_path)
-          parent.node_info[:src] = path.path
+          parent.flag(:reinit) if parent
+          parent = dir_handler.create_node(par, temp_path)
         end
-        node
+        parent
       end
       parent
     end

data/lib/webgen/sourcehandler.rb

@@ -19,6 +19,7 @@ module Webgen
     autoload :Virtual, 'webgen/sourcehandler/virtual'
     autoload :Feed, 'webgen/sourcehandler/feed'
     autoload :Sitemap, 'webgen/sourcehandler/sitemap'
+    autoload :Memory, 'webgen/sourcehandler/memory'
 
     # This class is used by Website to do the actual rendering of the website. It
     #
@@ -39,52 +40,87 @@ module Webgen
       # Render the nodes provided in the +tree+. Before the actual rendering is done, the sources
       # are checked (nodes for deleted sources are deleted, nodes for new and changed sources).
       def render(tree)
-        # Add new and changed nodes, remove nodes of deleted paths
-        puts "Generating tree..."
-        time = Benchmark.measure do
-          used_paths = Set.new
-          paths = Set.new([nil])
-          while paths.length > 0
-            used_paths += (paths = Set.new(find_all_source_paths.keys) - used_paths - clean(tree))
-            create_nodes_from_paths(tree, paths)
-            website.cache.reset_volatile_cache
+        begin
+          puts "Updating tree..."
+          time = Benchmark.measure do
+            update_tree(tree)
           end
-        end
-        puts "...done in " + ('%2.4f' % time.real) + ' seconds'
-
-        output = website.blackboard.invoke(:output_instance)
+          puts "...done in " + ('%2.4f' % time.real) + ' seconds'
 
-        puts "Writing changed nodes..."
-        time = Benchmark.measure do
-          tree.node_access[:alcn].sort.each do |name, node|
-            node.dirty_meta_info = node.created = false
-            next if node == tree.dummy_root || !node.dirty
-            node.dirty = false
-
-            begin
-              if !node['no_output'] && (content = node.content)
-                puts " "*4 + name, :verbose
-                type = if node.is_directory?
-                         :directory
-                       elsif node.is_fragment?
-                         :fragment
-                       else
-                         :file
-                       end
-                output.write(node.path, content, type)
-              end
-            rescue
-              raise RuntimeError, "Error while processing <#{node.absolute_lcn}>: #{$!.message}", $!.backtrace
-            end
+          puts "Writing changed nodes..."
+          time = Benchmark.measure do
+            write_tree(tree)
           end
-        end
-        puts "...done in " + ('%2.4f' % time.real) + ' seconds'
+          puts "...done in " + ('%2.4f' % time.real) + ' seconds'
+        end while tree.node_access[:alcn].any? {|name,node| node.flagged(:created) || node.flagged(:reinit)}
       end
 
       #######
       private
       #######
 
+      # Update the +tree+ by creating/reinitializing all needed nodes.
+      def update_tree(tree)
+        unused_paths = Set.new
+        begin
+          used_paths = Set.new(find_all_source_paths.keys) - unused_paths
+          paths_to_use = Set.new
+          nodes_to_delete = Set.new
+
+          tree.node_access[:alcn].each do |alcn, node|
+            next if node == tree.dummy_root
+            used_paths.delete(node.node_info[:src])
+
+            deleted = !find_all_source_paths.include?(node.node_info[:src])
+            if deleted
+              nodes_to_delete << node
+              #TODO: delete output path
+            elsif (!node.flagged(:created) && find_all_source_paths[node.node_info[:src]].changed?) || node.meta_info_changed?
+              node.flag(:reinit)
+              paths_to_use << node.node_info[:src]
+            elsif node.changed?
+              # nothing to be done here
+            end
+          end
+
+          nodes_to_delete.each {|node| tree.delete_node(node)}
+          used_paths.merge(paths_to_use)
+          paths = create_nodes_from_paths(tree, used_paths.to_a.sort)
+          unused_paths.merge(used_paths - paths)
+          tree.node_access[:alcn].each {|name, node| tree.delete_node(node) if node.flagged(:reinit)}
+          website.cache.reset_volatile_cache
+        end until used_paths.empty?
+      end
+
+      # Write out all changed nodes of the +tree+.
+      def write_tree(tree)
+        output = website.blackboard.invoke(:output_instance)
+
+        tree.node_access[:alcn].select do |name, node|
+          use_node = (node != tree.dummy_root && node.flagged(:dirty))
+          node.unflag(:dirty_meta_info)
+          node.unflag(:created)
+          node.unflag(:dirty)
+          use_node
+        end.sort.each do |name, node|
+          next if node['no_output'] || !(content = node.content)
+
+          begin
+            puts " "*4 + name, :verbose
+            type = if node.is_directory?
+                     :directory
+                   elsif node.is_fragment?
+                     :fragment
+                   else
+                     :file
+                   end
+            output.write(node.path, content, type)
+          rescue
+            raise RuntimeError, "Error while processing <#{node.absolute_lcn}>: #{$!.message}", $!.backtrace
+          end
+        end
+      end
+
       # Return a hash with all source paths.
       def find_all_source_paths
         if !defined?(@paths)
@@ -94,7 +130,7 @@ module Webgen
           @paths = {}
           source.paths.each do |path|
             if !(website.config['sourcehandler.ignore'].any? {|pat| File.fnmatch(pat, path, File::FNM_CASEFOLD|File::FNM_DOTMATCH)})
-              @paths[path.path] = path
+              @paths[path.source_path] = path
             end
           end
         end
@@ -115,16 +151,20 @@ module Webgen
 
       # Use the source handlers to create nodes for the +paths+ in the +tree+.
       def create_nodes_from_paths(tree, paths)
+        used_paths = Set.new
         website.config['sourcehandler.invoke'].sort.each do |priority, shns|
           shns.each do |shn|
             sh = website.cache.instance(shn)
-            paths_for_handler(shn, paths).sort.each do |path|
+            handler_paths = paths_for_handler(shn, paths)
+            used_paths.merge(handler_paths)
+            handler_paths.sort {|a,b| a.path.length <=> b.path.length}.each do |path|
               parent_dir = path.directory.split('/').collect {|p| Path.new(p).cn}.join('/')
               parent_dir += '/' if path != '/' && parent_dir == ''
               create_nodes(tree, parent_dir, path, sh)
             end
           end
         end
+        used_paths
       end
 
       # Prepare everything to create nodes under the absolute lcn path +parent_path_name+ in the
@@ -142,7 +182,7 @@ module Webgen
         *nodes = if block_given?
                    yield(parent, path)
                  else
-                   source_handler.create_node(parent, path.dup)
+                   source_handler.create_node(parent, path)
                  end
         nodes.flatten.compact.each do |node|
           website.blackboard.dispatch_msg(:after_node_created, node)
@@ -160,39 +200,12 @@ module Webgen
       # take the node's path's +modified_at+ meta information into account since that changes on
       # every path change.
       def meta_info_changed?(node)
-        path = node.node_info[:src]
+        path = node.node_info[:creation_path]
         old_mi = website.cache[:sourcehandler_path_mi][[path, node.node_info[:processor]]]
         old_mi.delete('modified_at')
-        new_mi = default_meta_info(@paths[path], node.node_info[:processor])
+        new_mi = default_meta_info(@paths[path] || Webgen::Path.new(path), node.node_info[:processor])
         new_mi.delete('modified_at')
-        node.dirty_meta_info = true if !old_mi || old_mi != new_mi
-      end
-
-      # Clean the +tree+ by deleting nodes which have changed or which don't have an associated
-      # source anymore. Return all paths for which nodes need to be created.
-      def clean(tree)
-        paths_to_delete = Set.new
-        paths_not_to_delete = Set.new
-        nodes_to_be_deleted = Set.new
-        tree.node_access[:alcn].each do |alcn, node|
-          next if node == tree.dummy_root || tree[alcn].nil?
-
-          deleted = !find_all_source_paths.include?(node.node_info[:src])
-          if !node.created && (deleted ||
-                               find_all_source_paths[node.node_info[:src]].changed? ||
-                               node.changed?)
-            paths_not_to_delete << node.node_info[:src]
-            nodes_to_be_deleted << [node, deleted]
-          else
-            paths_to_delete << node.node_info[:src]
-          end
-        end
-
-        nodes_to_be_deleted.each {|node, deleted| tree.delete_node(node, deleted)}
-        #TODO: delete output path
-
-        # source paths that should be used
-        paths_to_delete - paths_not_to_delete
+        node.flag(:dirty_meta_info) if !old_mi || old_mi != new_mi
       end
 
     end

data/lib/webgen/tag/breadcrumbtrail.rb

@@ -1,6 +1,3 @@
-require 'webgen/websiteaccess'
-require 'webgen/tag'
-
 module Webgen::Tag
 
   # Generates a breadcrumb trail for the page. This is especially useful when pages are in deep
@@ -60,7 +57,7 @@ module Webgen::Tag
 
         if (list.map {|n| n.absolute_lcn} != cached_list) ||
             list.any? {|n| (r = n.routing_node(cn.lang)) && r != node && r.meta_info_changed?}
-          node.dirty = true
+          node.flag(:dirty)
           break
         end
       end

data/lib/webgen/tag/coderay.rb

@@ -1,6 +1,3 @@
-require 'webgen/websiteaccess'
-require 'webgen/tag'
-
 module Webgen::Tag
 
   # Provides syntax highlighting via the +coderay+ library.

data/lib/webgen/tag/date.rb

@@ -1,5 +1,3 @@
-require 'webgen/tag'
-
 module Webgen::Tag
 
   # Prints out the date using a format string which will be passed to Time#strftime. Therefore you

data/lib/webgen/tag/executecommand.rb

@@ -1,6 +1,5 @@
-require 'webgen/tag'
 require 'cgi'
-require "tempfile"
+require 'tempfile'
 require 'rbconfig'
 
 module Webgen::Tag

data/lib/webgen/tag/includefile.rb

@@ -1,5 +1,3 @@
-require 'webgen/websiteaccess'
-require 'webgen/tag'
 require 'cgi'
 
 module Webgen::Tag
@@ -33,7 +31,7 @@ module Webgen::Tag
 
     def node_changed?(node)
       if filenames = node.node_info[:tag_includefile_filenames]
-        node.dirty = true if filenames.any? {|f, mtime| File.mtime(f) > mtime}
+        node.flag(:dirty) if filenames.any? {|f, mtime| File.mtime(f) > mtime}
       end
     end