webgen 0.5.10 → 0.5.11

data/lib/webgen/contentprocessor/maruku.rb

@@ -1,5 +1,19 @@
 # -*- encoding: utf-8 -*-
 
+require 'rexml/parsers/baseparser'
+
+class REXML::Parsers::BaseParser
+
+  alias :"old_stream=" :"stream="
+
+  def stream=(source)
+    self.old_stream=(source)
+    @nsstack << Set.new(['webgen'])
+  end
+
+end
+
+
 module Webgen::ContentProcessor
 
   # Processes content in Markdown format using the +maruku+ library.

data/lib/webgen/contentprocessor/tags.rb

@@ -94,14 +94,32 @@ module Webgen::ContentProcessor
           end
 
         when :process
-          if data.backslashes % 2 == 0
-            result = yield(data.tag, scanner.string[data.params_start_pos...data.params_end_pos],
-                            scanner.string[(data.params_end_pos+1)...data.body_end_pos]).to_s
-            scanner.string[data.start_pos..data.end_pos] = "\\" * (data.backslashes / 2) + result
-            scanner.pos = data.start_pos + result.length
+          if RUBY_VERSION >= '1.9'
+            begin
+              enc = scanner.string.encoding
+              scanner.string.force_encoding('ASCII-8BIT')
+              if data.backslashes % 2 == 0
+                result = yield(data.tag, scanner.string[data.params_start_pos...data.params_end_pos].force_encoding(enc),
+                               scanner.string[(data.params_end_pos+1)...data.body_end_pos].to_s.force_encoding(enc)).to_s
+                scanner.string[data.start_pos..data.end_pos] = "\\" * (data.backslashes / 2) + result.force_encoding('ASCII-8BIT')
+                scanner.pos = data.start_pos + result.length
+              else
+                scanner.string[data.start_pos, 1 + data.backslashes / 2] = ''
+                scanner.pos -= 1 + data.backslashes / 2
+              end
+            ensure
+              scanner.string.force_encoding(enc) if RUBY_VERSION >= '1.9'
+            end
           else
-            scanner.string[data.start_pos, 1 + data.backslashes / 2] = ''
-            scanner.pos -= 1 + data.backslashes / 2
+            if data.backslashes % 2 == 0
+              result = yield(data.tag, scanner.string[data.params_start_pos...data.params_end_pos],
+                             scanner.string[(data.params_end_pos+1)...data.body_end_pos]).to_s
+              scanner.string[data.start_pos..data.end_pos] = "\\" * (data.backslashes / 2) + result
+              scanner.pos = data.start_pos + result.length
+            else
+              scanner.string[data.start_pos, 1 + data.backslashes / 2] = ''
+              scanner.pos -= 1 + data.backslashes / 2
+            end
           end
           data.state = :before_tag
 

data/lib/webgen/default_config.rb

@@ -83,7 +83,7 @@ config.sourcehandler.default_meta_info({
                                          'Webgen::SourceHandler::Page' => {
                                            'kind' => 'page',
                                            'fragments_in_menu' => true,
-                                           'blocks' => {'default' => {'pipeline' => 'erb,tags,maruku,blocks,fragments'}}
+                                           'blocks' => {'default' => {'pipeline' => 'erb,tags,markdown,blocks,fragments'}}
                                          },
                                          'Webgen::SourceHandler::Fragment' => {
                                            'kind' => 'fragment'
@@ -125,7 +125,7 @@ Webgen::WebsiteAccess.website.blackboard.add_service(:output_instance, Webgen::O
 
 # All things regarding content processors
 config.contentprocessor.map({
-                              'markdown' => 'Webgen::ContentProcessor::Maruku',
+                              'markdown' => 'Webgen::ContentProcessor::Kramdown',
                               'maruku' => 'Webgen::ContentProcessor::Maruku',
                               'textile' => 'Webgen::ContentProcessor::RedCloth',
                               'redcloth' => 'Webgen::ContentProcessor::RedCloth',
@@ -141,7 +141,9 @@ config.contentprocessor.map({
                               'fragments' => 'Webgen::ContentProcessor::Fragments',
                               'head' => 'Webgen::ContentProcessor::Head',
                               'tidy' => 'Webgen::ContentProcessor::Tidy',
-                              'xmllint' => 'Webgen::ContentProcessor::Xmllint'
+                              'xmllint' => 'Webgen::ContentProcessor::Xmllint',
+                              'kramdown' => 'Webgen::ContentProcessor::Kramdown',
+                              'less' => 'Webgen::ContentProcessor::Less'
                             }, :doc => 'Content processor name to class map')
 
 Webgen::WebsiteAccess.website.blackboard.add_service(:content_processor_names, Webgen::ContentProcessor.method(:list))
@@ -174,6 +176,10 @@ config.contentprocessor.tidy.options("-raw", :doc => "The options passed to the
 
 config.contentprocessor.xmllint.options("--catalogs --noout --valid", :doc => 'Options passed to the xmllint command')
 
+config.contentprocessor.kramdown.options({:auto_ids => true}, :doc => 'The options hash for the kramdown processor')
+config.contentprocessor.kramdown.handle_links(true, :doc => 'Whether all links in a kramdown document should be handled by webgen')
+
+
 config.tag.relocatable.path(nil, :doc => 'The path which should be made relocatable', :mandatory => 'default')
 
 config.tag.menu.start_level(1, :doc => 'The level at which the menu starts.')

data/lib/webgen/node.rb

@@ -352,6 +352,36 @@ module Webgen
       (use_link ? "<a#{attrs}>#{link_text}</a>" : "<span#{attrs}>#{link_text}</span>")
     end
 
+    def find(opts = {})
+      if opts[:alcn]
+        opts[:alcn] = Path.make_absolute(is_directory? ? alcn : parent.alcn.sub(/#.*$/, ''), opts[:alcn].to_s)
+      end
+      opts[:levels] = 100000 unless opts.has_key?(:levels)
+
+      result = find_nodes(opts, nil, 1)
+      result.flatten! if result && (opts[:limit] || opts[:offset])
+      result.sort!(opts[:sort]) if result
+      result.children = result.children[(opts[:offset].to_s.to_i)..(opts[:limit] ? opts[:offset].to_s.to_i + opts[:limit].to_s.to_i - 1 : -1)]
+      result
+    end
+
+    def find_nodes(opts, parent, level)
+      result = ProxyNode.new(parent, self)
+
+      children.each do |child|
+        c_result = child.find_nodes(opts, result, level + 1)
+        result.children << c_result unless c_result.nil?
+      end if opts[:levels] && level <= opts[:levels]
+
+      (!result.children.empty? || find_match?(opts) ? result : nil)
+    end
+    protected :find_nodes
+
+    def find_match?(opts)
+      (!opts[:alcn] || self =~ opts[:alcn])
+    end
+    private :find_match?
+
     #######
     private
     #######
@@ -396,4 +426,66 @@ module Webgen
 
   end
 
+  # Encapsulates a node. This class is needed when a hierarchy of nodes should be created but the
+  # original hierarchy should not be destroyed.
+  class ProxyNode
+
+    # Array of child proxy nodes.
+    attr_accessor :children
+
+    # The parent proxy node.
+    attr_accessor :parent
+
+    # The encapsulated node.
+    attr_reader :node
+
+    # Create a new proxy node under +parent+ (also has to be a ProxyNode object) for the real node
+    # +node+.
+    def initialize(parent, node)
+      @parent = parent
+      @node = node
+      @children = []
+    end
+
+    # Sort recursively all children of the node using the wrapped nodes. If +value+ is +false+, no
+    # sorting is done at all. If it is +true+, then the default sort mechanism is used (see
+    # Node#<=>). Otherwise +value+ has to be a meta information key on which should be sorted.
+    def sort!(value = true)
+      return self unless value
+
+      if value.kind_of?(String)
+        self.children.sort! do |a,b|
+          aval, bval = a.node[value].to_s, b.node[value].to_s
+          if aval !~ /\D/ && aval !~ /\D/
+            aval = aval.to_i
+            bval = bval.to_i
+          end
+          aval <=> bval
+        end
+      else
+        self.children.sort! {|a,b| a.node <=> b.node}
+      end
+      self.children.each {|child| child.sort!(value)}
+      self
+    end
+
+    # Turn the hierarchy of proxy nodes into a flat list.
+    def flatten!
+      result = []
+      while !self.children.empty?
+        result << self.children.shift
+        result.last.parent = self
+        self.children.unshift(*result.last.children)
+        result.last.children = []
+      end
+      self.children = result
+    end
+
+    # Return the hierarchy under this node as nested list of alcn values.
+    def to_list
+      self.children.inject([]) {|temp, n| temp << n.node.alcn; temp += ((t = n.to_list).empty? ? [] : [t]) }
+    end
+
+  end
+
 end

data/lib/webgen/output.rb

@@ -1,5 +1,7 @@
 # -*- encoding: utf-8 -*-
 
+require 'webgen/common'
+
 module Webgen
 
   # Namespace for all classes that know how to write out node content.
@@ -74,7 +76,7 @@ module Webgen
       classes = (WebsiteAccess.website.cache.volatile[:classes] ||= {})
       unless classes.has_key?(:output_instance)
         klass, *args = WebsiteAccess.website.config['output']
-        classes[:output_instance] = Object.constant(klass).new(*args)
+        classes[:output_instance] = Common.const_for_name(klass).new(*args)
       end
       classes[:output_instance]
     end

data/lib/webgen/source/resource.rb

@@ -2,6 +2,7 @@
 
 require 'webgen/websiteaccess'
 require 'webgen/source'
+require 'webgen/common'
 
 module Webgen::Source
 
@@ -30,7 +31,7 @@ module Webgen::Source
       if !defined?(@paths)
         stack = Stacked.new
         website.config['resources'].select {|name, infos| File.fnmatch(@glob, name)}.sort.each do |name, infos|
-          stack.add([['/', constant(infos.first).new(*infos[1..-1])]])
+          stack.add([['/', Webgen::Common.const_for_name(infos.first).new(*infos[1..-1])]])
         end
         @paths = stack.paths
         @paths = @paths.select {|p| File.fnmatch(@paths_glob, p)} if @paths_glob

data/lib/webgen/source/tararchive.rb

@@ -8,7 +8,7 @@ require 'zlib'
 begin
   require 'archive/tar/minitar'
 rescue LoadError
-  raise Webgen::LoadError.new('archive/tar/minitar', self.class.name, context.dest_node.alcn, 'archive-tar-minitar')
+  raise Webgen::LoadError.new('archive/tar/minitar', self.class.name, nil, 'archive-tar-minitar')
 end
 
 module Webgen
@@ -64,7 +64,8 @@ module Webgen
           @paths = input.collect do |entry|
             path = entry.full_name
             next unless File.fnmatch(@glob, path, File::FNM_DOTMATCH|File::FNM_CASEFOLD|File::FNM_PATHNAME)
-            path += '/' if entry.directory? && path[-1] != ?/
+            path += '/' if entry.directory? && path[-1,1] != '/'
+            path = '/' + path unless path[0,1] == '/'
             Path.new(path, entry.read, Time.at(entry.mtime), @uri)
           end.compact.to_set
         end

data/lib/webgen/sourcehandler.rb

@@ -1,6 +1,7 @@
 # -*- encoding: utf-8 -*-
 
 require 'webgen/loggable'
+require 'webgen/common'
 require 'benchmark'
 
 module Webgen
@@ -41,7 +42,9 @@ module Webgen
         website.blackboard.add_listener(:node_meta_info_changed?, method(:meta_info_changed?))
 
         website.blackboard.add_listener(:before_node_deleted) do |node|
-          website.blackboard.invoke(:output_instance).delete(node.path)
+          unless node.is_fragment? || node['no_output'] || node.path == '/' || node == node.tree.dummy_root
+            website.blackboard.invoke(:output_instance).delete(node.path)
+          end
         end if website.config['output.do_deletion']
       end
 
@@ -173,10 +176,10 @@ module Webgen
       def find_all_source_paths
         if !defined?(@paths)
           active_source = Webgen::Source::Stacked.new(website.config['sources'].collect do |mp, name, *args|
-                                                        [mp, constant(name).new(*args)]
+                                                        [mp, Webgen::Common.const_for_name(name).new(*args)]
                                                       end)
           passive_source = Webgen::Source::Stacked.new(website.config['passive_sources'].collect do |mp, name, *args|
-                                                         [mp, constant(name).new(*args)]
+                                                         [mp, Webgen::Common.const_for_name(name).new(*args)]
                                                        end, true)
           passive_source.paths.each {|path| path.passive = true }
           source = Webgen::Source::Stacked.new([['/', active_source], ['/', passive_source]])
@@ -197,7 +200,8 @@ module Webgen
         return [] if patterns.nil?
 
         options = (website.config['sourcehandler.casefold'] ? File::FNM_CASEFOLD : 0) |
-          (website.config['sourcehandler.use_hidden_files'] ? File::FNM_DOTMATCH : 0)
+          (website.config['sourcehandler.use_hidden_files'] ? File::FNM_DOTMATCH : 0) |
+          File::FNM_PATHNAME
         find_all_source_paths.values_at(*paths).compact.select do |path|
           patterns.any? {|pat| File.fnmatch(pat, path, options)}
         end

data/lib/webgen/sourcehandler/base.rb

@@ -1,6 +1,5 @@
 # -*- encoding: utf-8 -*-
 
-require 'facets/symbol/to_proc'
 require 'webgen/websiteaccess'
 require 'webgen/loggable'
 require 'webgen/page'
@@ -181,7 +180,7 @@ module Webgen::SourceHandler
                         Webgen::WebsiteAccess.website.config['sourcehandler.default_lang_in_output_path'] ||
                           Webgen::WebsiteAccess.website.config['website.lang'] != path.meta_info['lang']
                       end
-      if OutputPathHelpers.public_instance_methods(false).map(&:to_s).include?(method)
+      if OutputPathHelpers.public_instance_methods(false).map {|c| c.to_s}.include?(method)
         name = send(method, parent, path, use_lang_part)
         name += '/'  if path.path =~ /\/$/ && name !~ /\/$/
         if (node = node_exists?(path, name)) && node.lang != path.meta_info['lang']

data/lib/webgen/sourcehandler/feed.rb

@@ -61,7 +61,7 @@ module Webgen::SourceHandler
 
       node.tree.node_access[:alcn].values.
         select {|node| patterns.any? {|pat| node =~ pat} && node.node_info[:page]}.
-        sort {|a,b| a['modified_at'] <=> b['modified_at']}[0, nr_items]
+        sort {|a,b| a['modified_at'] <=> b['modified_at']}.reverse[0, nr_items]
     end
 
     # Return the feed link URL for the feed +node+.

data/lib/webgen/sourcehandler/virtual.rb

@@ -73,6 +73,7 @@ module Webgen::SourceHandler
       dirname.sub(/^\//, '').split('/').inject('/') do |parent_path, dir|
         parent_path = File.join(parent_path, dir)
         parent = create_directory(parent_path, path)
+        parent_path
       end
       parent
     end

data/lib/webgen/tag/base.rb

@@ -57,7 +57,7 @@ require 'webgen/websiteaccess'
 #
 #   end
 #
-#   WebsiteAccess.website.config.reverser.do_reverse nil, :mandatory => default
+#   WebsiteAccess.website.config.reverser.do_reverse nil, :mandatory => 'default'
 #   WebsiteAccess.website.config['contentprocessor.tags.map']['reverse'] = 'Reverser'
 #
 module Webgen::Tag::Base

data/lib/webgen/tag/langbar.rb

@@ -19,8 +19,11 @@ module Webgen::Tag
       result = lang_nodes.
         reject {|n| (context.content_node.lang == n.lang && !param('tag.langbar.show_own_lang'))}.
         sort {|a, b| a.lang <=> b.lang}.
-        collect {|n| context.dest_node.link_to(n, :link_text => (param('tag.langbar.lang_names')[n.lang] || n.lang), :lang => n.lang)}.
-        join(param('tag.langbar.separator'))
+        collect do |n|
+        attrs = {:link_text => (param('tag.langbar.lang_names')[n.lang] || n.lang), :lang => n.lang}
+        attrs['class'] = 'webgen-langbar-current-lang' if context.content_node.lang == n.lang
+        context.dest_node.link_to(n, attrs)
+      end.join(param('tag.langbar.separator'))
 
       [(param('tag.langbar.show_single_lang') || lang_nodes.length > 1 ? result : ""), param('tag.langbar.process_output')]
     end

data/lib/webgen/version.rb

@@ -3,6 +3,6 @@
 module Webgen
 
   # The version of webgen.
-  VERSION = '0.5.10'
+  VERSION = '0.5.11'
 
 end

data/lib/webgen/website.rb

@@ -10,7 +10,6 @@
 require 'logger'
 require 'set'
 require 'fileutils'
-require 'facets/symbol/to_proc'
 
 # Requirements for Website
 require 'webgen/coreext'
@@ -38,9 +37,6 @@ require 'webgen/node'
 require 'webgen/page'
 require 'webgen/version'
 
-# Load deprecated classes/methods/...
-require 'webgen/deprecated'
-
 
 # The Webgen namespace houses all classes/modules used by webgen.
 #
@@ -336,13 +332,16 @@ module Webgen
              else
                config['website.cache'].last
              end
-      cache_data, @tree = Marshal.load(data) rescue nil
-      @cache.restore(cache_data) if cache_data
+      cache_data, tree, version = Marshal.load(data) rescue nil
+      if cache_data && version == Webgen::VERSION
+        @cache.restore(cache_data)
+        @tree = tree
+      end
     end
 
     # Save the +tree+ and the +cache+ to +website.cache+.
     def save_tree_and_cache
-      cache_data = [@cache.dump, @tree]
+      cache_data = [@cache.dump, @tree, Webgen::VERSION]
       if config['website.cache'].first == :file
         cache_file = File.join(@directory, config['website.cache'].last)
         File.open(cache_file, 'wb') {|f| Marshal.dump(cache_data, f)}
@@ -360,7 +359,7 @@ module Webgen
           raise 'Structure of config file is not valid, has to be a Hash' if !config.kind_of?(Hash)
           config.each do |key, value|
             case key
-            when *Webgen::Configuration::Helpers.public_instance_methods(false).map(&:to_s) then @config.send(key, value)
+            when *Webgen::Configuration::Helpers.public_instance_methods(false).map {|c| c.to_s} then @config.send(key, value)
             else @config[key] = value
             end
           end

data/misc/default.template

@@ -59,7 +59,7 @@
 
       <div class="col2 float-right">
         <p>
-          &copy; 2008 Thomas Leitner | generated by <a href="http://webgen.rubyforge.org">webgen</a><br />
+          &copy; 2004-2010 Thomas Leitner | generated by <a href="http://webgen.rubyforge.org">webgen</a><br />
           Design based on Ablaze 2.1 by <a href="http://www.styleshout.com/">styleshout</a><br />
           Block quote icons from the <a href="http://tango.freedesktop.org//">Tango Icon Theme</a><br />
           Valid <a href="http://jigsaw.w3.org/css-validator/check/referer">CSS</a> |

data/misc/htmldoc.virtual

@@ -2,4 +2,16 @@ api.html:
   url: rdoc/index.html
   title: API
   in_menu: true
-  sort_info: 60
+  sort_info: 60
+
+rdoc/index.html:
+  title: API
+
+rdoc/Webgen/Context.html:
+  title: Webgen::Context
+
+rdoc/Webgen/ContentProcessor/Head.html:
+  title: Webgen::ContentProcessor::Head
+
+rdoc/Webgen/Tag/Base.html:
+  title: Webgen::Tag::Base

data/test/test_contentprocessor.rb

@@ -10,7 +10,7 @@ class TestContentProcessor < Test::Unit::TestCase
 
   def setup
     super
-    @website.config.data['contentprocessor.map'] = {'test' => Hash, 'binary' => [Hash, :binary]}
+    @website.config.data['contentprocessor.map'] = {'test' => 'Hash', 'binary' => ['Hash', :binary]}
   end
 
   def test_access_hash