webgen 1.0.0.beta2 → 1.0.0.beta3

data/data/webgen/passive_sources/templates/feed.template

@@ -44,7 +44,11 @@
     <title><%= h(context.node['title']) %></title>
     <link><%= context.node.feed_link %>"</link>
     <description><%= h(context.node['description']) %></description>
+    <% if context.node['created_at'].kind_of?(Time) %>
+    <pubdate><%= context.node['created_at'].rfc822 %></pubdate>
+    <% else %>
     <pubDate><%= Time.now.rfc822 %></pubDate>
+    <% end %>
     <lastBuildDate><%= Time.now.rfc822 %></lastBuildDate>
     <generator>webgen - Webgen::PathHandler::Feed</generator>
 

data/lib/webgen/bundle/built-in/init.rb

@@ -153,8 +153,8 @@ item_tracker.register('NodeContent')
 
 item_tracker.register('NodeMetaInfo')
 website.blackboard.add_listener(:after_node_created) do |node|
-  item_tracker.add(node, :node_meta_info, node.alcn)
-  item_tracker.add(node, :node_meta_info, node.alcn, Webgen::ItemTracker::NodeMetaInfo::CONTENT_MODIFICATION_KEY)
+  item_tracker.add(node, :node_meta_info, node)
+  item_tracker.add(node, :node_meta_info, node, Webgen::ItemTracker::NodeMetaInfo::CONTENT_MODIFICATION_KEY)
 end
 
 item_tracker.register('Nodes')
@@ -169,11 +169,18 @@ website.blackboard.add_listener(:node_resolution_failed) do |path, lang|
   end
 end
 
+########################################################################
+# The link definitions extension
+website.ext.link_definitions = {}
+
+
 ########################################################################
 # Everything related to the node finder extension
 require 'webgen/node_finder'
 
 website.ext.node_finder = Webgen::NodeFinder.new(website)
+option('node_finder.option_sets', {},
+       'Node finder option sets that can be referenced by name')
 
 
 ########################################################################
@@ -206,7 +213,6 @@ option('path_handler.default_template', 'default.template',
 website.ext.path_handler = path_handler = Webgen::PathHandler.new(website)
 
 # handlers are registered in invocation order
-
 path_handler.register('Directory')
 path_handler.register('MetaInfo', :patterns => ['/**/metainfo', '/**/*.metainfo'])
 path_handler.register('Template')
@@ -215,6 +221,7 @@ path_handler.register('Copy')
 path_handler.register('Feed')
 path_handler.register('Sitemap')
 path_handler.register('Virtual')
+path_handler.register('Api')
 
 
 ########################################################################
@@ -260,6 +267,8 @@ option('tag.date.format', '%Y-%m-%d %H:%M:%S',
 tag.register('MetaInfo', :names => ['meta_info', :default])
 option('tag.meta_info.escape_html', true,
        'Special HTML characters in the output will be escaped if true', &true_or_false)
+option('tag.meta_info.mi', nil,
+       'The name of the meta information that should be output', &is_string)
 
 tag.register('Relocatable', :names => ['relocatable', 'r'], :mandatory => ['path'])
 option('tag.relocatable.path', nil,

data/lib/webgen/bundle_loader.rb

@@ -44,11 +44,17 @@ module Webgen
 
     # Loads all bundles that are marked for auto-loading.
     def load_autoload_bundles
-      Gem::Specification.map {|s| s.name }.uniq.each do |gem_name|
+      bundles = Gem::Specification.map {|s| s.name }.uniq.map do |gem_name|
         md = /^webgen-(.*)-bundle$/.match(gem_name)
         next unless md
+        md[1]
+      end.compact
 
-        bundle_name = md[1]
+      bundles += $LOAD_PATH.map do |path|
+        Dir[File.join(path, 'webgen/bundle', '*')].map {|d| File.basename(d)}
+      end.flatten.compact
+
+      bundles.each do |bundle_name|
         file = resolve_init_file(bundle_name)
         next unless file
 

data/lib/webgen/cli/create_command.rb

@@ -1,6 +1,7 @@
 # -*- encoding: utf-8 -*-
 
 require 'webgen/cli/utils'
+require 'tmpdir'
 
 module Webgen
   module CLI
@@ -48,8 +49,9 @@ DESC
         raise OptionParser::MissingArgument.new('DIR') if args.length == 0
         Webgen::Website.new(args[0], Webgen::CLI::Logger.new) do |website|
           website.logger.verbose = commandparser.verbose
+          website.config['website.tmpdir'] = Dir.tmpdir
         end.execute_task(:create_website, @template)
-        puts "Created a new webgen website in <#{args[0]}>" + (@template ? "using the '#{template}' template" : '')
+        puts "Created a new webgen website in <#{args[0]}>" + (@template ? " using the '#{@template}' template" : '')
       rescue Webgen::Task::CreateWebsite::Error => e
         puts "An error occured while creating the website: #{e.message}"
       end

data/lib/webgen/cli/show_tree_command.rb

@@ -56,10 +56,11 @@ DESC
         children.sort {|a,b| a.alcn <=> b.alcn}.map do |node|
           sub = collect_data(node.children, selector)
           if sub.length > 0 ||
-              ((selector.nil? || node.lcn.include?(selector)) &&
+              ((selector.nil? || node.alcn.include?(selector)) &&
                ((!node.is_fragment? || @show_fragments) &&
                 (!node['passive'] || commandparser.website.ext.item_tracker.node_referenced?(node))))
             data = [@use_alcn ? node.alcn : node.lcn]
+            data << node.alcn
             data << (@meta_info ? node.meta_info.map {|k,v| "#{k}: #{v.inspect}"} : [])
             data << sub
             data
@@ -71,9 +72,9 @@ DESC
       private :collect_data
 
       def print_tree(data, indent = '', selector)
-        data.each do |name, info, children|
+        data.each do |name, alcn, info, children|
           puts("#{indent}#{Utils.light(Utils.blue(name))}")
-          info.each {|i| puts("#{indent}  #{i}")} if info.length > 0 && (selector.nil? || name.include?(selector))
+          info.each {|i| puts("#{indent}  #{i}")} if info.length > 0 && (selector.nil? || alcn.include?(selector))
           print_tree(children, indent + '  ', selector)
         end
       end

data/lib/webgen/content_processor.rb

@@ -104,10 +104,10 @@ module Webgen
       extension(name).call(context)
     rescue Webgen::Error => e
       e.path = context.dest_node if e.path.to_s.empty?
+      e.location = "content_processor.#{name}" unless e.location
       raise
     rescue Exception => e
-      ext = extension(name)
-      raise Webgen::RenderError.new(e, (ext.respond_to?(:name) ? ext.name : nil), context.dest_node)
+      raise Webgen::RenderError.new(e, "content_processor.#{name}", context.dest_node)
     end
 
     # Normalize the content processor pipeline.

data/lib/webgen/content_processor/blocks.rb

@@ -77,11 +77,11 @@ module Webgen
             return ''
           elsif block_node
             raise Webgen::RenderError.new("No block named '#{options[:name]}' found in <#{block_node}>",
-                                          self.name, context.dest_node,
+                                          'content_processor.blocks', context.dest_node,
                                           context.ref_node, (options[:line_nr_proc].call if options[:line_nr_proc]))
           else
             raise Webgen::RenderError.new("No node in the render chain has a block named '#{options[:name]}'",
-                                          self.name, context.dest_node,
+                                          'content_processor.blocks', context.dest_node,
                                           context.ref_node, (options[:line_nr_proc].call if options[:line_nr_proc]))
           end
         end

data/lib/webgen/content_processor/haml.rb

@@ -16,7 +16,7 @@ module Webgen
         context
       rescue ::Haml::Error => e
         line = (e.line ? e.line + 1 : Webgen::Error.error_line(e))
-        raise Webgen::RenderError.new(e, self.class.name, context.dest_node, nil, line)
+        raise Webgen::RenderError.new(e, 'content_processor.haml', context.dest_node, nil, line)
       end
 
     end

data/lib/webgen/content_processor/html_head.rb

@@ -14,11 +14,12 @@ module Webgen
     # processor should be the last in the processing pipeline so that all other processors have been
     # able to set the data.
     #
-    # Use the methods defined on the special Context#html_head object to provide values.
+    # Use the methods defined on the special Webgen::Context::HtmlHead::Proxy object which can be
+    # accessed via Webgen::Context#html_head to provide values.
     #
     # == Internal details
     #
-    # The key ':cp_html_head' of 'context.persistent' is used (the normal 'context.options' won't do
+    # The key +:cp_html_head+ of +context.persistent+ is used (the normal +context.options+ won't do
     # because the data needs to be shared 'backwards' during the rendering) and it has to be a Hash
     # with the following values:
     #
@@ -85,7 +86,7 @@ module Webgen
       def self.links_to_translations(context)
         context.website.tree.translations(context.dest_node).map do |node|
           next '' if node.alcn == context.dest_node.alcn
-          context.website.ext.item_tracker.add(context.dest_node, :node_meta_info, node.alcn)
+          context.website.ext.item_tracker.add(context.dest_node, :node_meta_info, node)
 
           result = "\n<link type=\"text/html\" rel=\"alternate\" hreflang=\"#{node.lang}\" "
           result << "href=\"#{context.dest_node.route_to(node)}\" "
@@ -103,7 +104,7 @@ module Webgen
           next path if Webgen::Path.url(path, false).absolute?
           node = context.content_node.resolve(path, context.dest_node.lang, true)
           if node
-            context.website.ext.item_tracker.add(context.dest_node, :node_meta_info, node.alcn)
+            context.website.ext.item_tracker.add(context.dest_node, :node_meta_info, node)
             context.dest_node.route_to(node)
           else
             nil

data/lib/webgen/content_processor/kramdown.rb

@@ -35,7 +35,9 @@ module Webgen
 
       # Convert the content in +context+ to HTML.
       def self.call(context)
-        doc = ::Kramdown::Document.new(context.content, context.website.config['content_processor.kramdown.options'])
+        options = context.website.config['content_processor.kramdown.options'].dup
+        options[:link_defs] = context.website.ext.link_definitions.merge(options[:link_defs] || {})
+        doc = ::Kramdown::Document.new(context.content, options)
         context.content = CustomHtmlConverter.new(doc.root, doc.options, context).convert(doc.root)
         doc.warnings.each do |warn|
           context.website.logger.warn { "kramdown warning while parsing <#{context.ref_node}>: #{warn}" }

data/lib/webgen/content_processor/r_doc.rb

@@ -1,18 +1,31 @@
 # -*- encoding: utf-8 -*-
 
 require 'webgen/content_processor'
-webgen_require 'rdoc/markup/to_html', 'rdoc'
+
+### Hack...
+# Workaround to load the correct version of rdoc. Unusable versions don't have a rdoc/store file and
+# so we can use this to our advantage.
+begin
+  # If a useable version is available, this won't fail with a LoadError (but probably a NameError)
+  # and will activate the correct version, even if installed via Rubygems.
+  require 'rdoc/store'
+rescue LoadError
+  webgen_require('rdoc/rdoc', 'rdoc')
+rescue Exception
+end
+require 'rdoc/rdoc'
+
 
 module Webgen
   class ContentProcessor
 
     # Converts content in RDoc markup (the native Ruby documentation format) to HTML. Needs the newer
-    # RDoc implementation (version >= 2.4.x).
+    # RDoc implementation (version >= 4.0.0).
     module RDoc
 
       # Convert the content in RDoc markup to HTML.
       def self.call(context)
-        context.content = ::RDoc::Markup::ToHtml.new.convert(context.content)
+        context.content = ::RDoc::Markup::ToHtml.new(::RDoc::Options.new).convert(context.content)
         context
       end
 

data/lib/webgen/content_processor/sass.rb

@@ -110,7 +110,7 @@ module Webgen
 
           if ref_node
             if dest_node = ref_node.resolve(path, context.dest_node.lang, true)
-              context.website.ext.item_tracker.add(context.dest_node, :node_meta_info, dest_node.alcn)
+              context.website.ext.item_tracker.add(context.dest_node, :node_meta_info, dest_node)
               path = context.dest_node.route_to(dest_node)
             end
           else
@@ -127,7 +127,7 @@ module Webgen
         context.content = ::Sass::Engine.new(context.content, default_options(context)).render
         context
       rescue ::Sass::SyntaxError => e
-        raise Webgen::RenderError.new(e, self.class.name, context.dest_node, nil, (e.sass_line if e.sass_line))
+        raise Webgen::RenderError.new(e, 'content_processor.sass', context.dest_node, nil, (e.sass_line if e.sass_line))
       end
 
       def self.default_options(context) # :nodoc:
@@ -136,7 +136,7 @@ module Webgen
         opts.merge({
                      :filename => context.ref_node.alcn,
                      :syntax => :sass,
-                     :cache_store => ::Sass::CacheStores::Filesystem.new(context.website.tmpdir('sass')),
+                     :cache_store => ::Sass::CacheStores::Filesystem.new(context.website.tmpdir('content_processor.sass')),
                      :filesystem_importer => FileSystemImporter,
                      :load_paths => load_paths,
                      :webgen_context => context

data/lib/webgen/content_processor/scss.rb

@@ -14,7 +14,7 @@ module Webgen
         context.content = ::Sass::Engine.new(context.content, options).render
         context
       rescue ::Sass::SyntaxError => e
-        raise Webgen::RenderError.new(e, self.class.name, context.dest_node, nil, (e.sass_line if e.sass_line))
+        raise Webgen::RenderError.new(e, 'content_processor.scss', context.dest_node, nil, (e.sass_line if e.sass_line))
       end
 
     end

data/lib/webgen/content_processor/tikz.rb

@@ -56,7 +56,7 @@ module Webgen
         execute("pdflatex -shell-escape -interaction=nonstopmode -halt-on-error #{file}.tex", cwd, context) do |status, stdout, stderr|
           errors = (stdout+stderr).scan(/^!(.*\n.*)/).join("\n")
           raise Webgen::RenderError.new("Error while parsing TikZ picture commands with PDFLaTeX: #{errors}",
-                                        self.name, context.dest_node, context.ref_node)
+                                        'content_processor.tikz', context.dest_node, context.ref_node)
         end
 
         execute("pdfcrop #{file}.pdf #{file}.pdf", cwd, context)
@@ -93,7 +93,7 @@ module Webgen
             yield(status, stdout, stderr)
           else
             raise Webgen::RenderError.new("Error while running a command for a TikZ picture: #{stdout + "\n" + stderr}",
-                                          self.name, context.dest_node, context.ref_node)
+                                          'content_processor.tikz', context.dest_node, context.ref_node)
           end
         end
         [status, stdout, stderr]

data/lib/webgen/context/html_head.rb

@@ -43,7 +43,7 @@ module Webgen
         def type_check!(type) #:nodoc:
           if ![:css, :js].include?(type)
             raise Webgen::RenderError.new("Type must either be :css or :js, not #{type}",
-                                          self.class.name, @context.dest_node, @context.ref_node)
+                                          "context.html_head", @context.dest_node, @context.ref_node)
           end
         end
         private :type_check!

data/lib/webgen/destination/file_system.rb

@@ -37,7 +37,8 @@ module Webgen
       # Write the +data+ to the given +path+.
       def write(path, data)
         dest = File.join(@root, path)
-        FileUtils.makedirs(File.dirname(dest))
+        parent_dir = File.dirname(dest)
+        FileUtils.makedirs(parent_dir) unless File.directory?(parent_dir)
         if path[-1] == ?/
           FileUtils.makedirs(dest)
         else

data/lib/webgen/item_tracker/node_content.rb

@@ -8,9 +8,9 @@ module Webgen
     # This class is used to track changes to the content of a node. The content of a node is changed
     # if any of its dependencies are changed.
     #
-    # The item for this tracker is the alcn of the node:
+    # The item for this tracker is the node:
     #
-    #   website.ext.item_tracker.add(some_node, :node_content, my_node.alcn)
+    #   website.ext.item_tracker.add(some_node, :node_content, my_node)
     #
     class NodeContent
 
@@ -18,8 +18,8 @@ module Webgen
         @website = website
       end
 
-      def item_id(alcn) #:nodoc:
-        alcn
+      def item_id(node) #:nodoc:
+        node.alcn
       end
 
       def item_data(alcn) #:nodoc:

data/lib/webgen/item_tracker/node_meta_info.rb

@@ -9,17 +9,17 @@ module Webgen
     #
     # Depending on what should be tracked, one needs to provide the following item:
     #
-    # [node_alcn, nil]
+    # [node, nil]
     #   Tracks changes to the whole meta information of the node, i.e. if any meta information value
     #   changes, a change is detected.
     #
-    # [node_alcn, key]
+    # [node, key]
     #   Tracks changes to a specific meta information key of the node.
     #
     # Here are some examples:
     #
-    #   website.ext.item_tracker.add(some_node, :node_meta_info, my_node.alcn) # first case
-    #   website.ext.item_tracker.add(some_node, :node_meta_info, my_node.alcn, 'title') # second case
+    #   website.ext.item_tracker.add(some_node, :node_meta_info, my_node) # first case
+    #   website.ext.item_tracker.add(some_node, :node_meta_info, my_node, 'title') # second case
     #
     class NodeMetaInfo
 
@@ -29,8 +29,8 @@ module Webgen
         @website = website
       end
 
-      def item_id(alcn, key = nil) #:nodoc:
-        [alcn, key]
+      def item_id(node, key = nil) #:nodoc:
+        [node.alcn, key]
       end
 
       def item_data(alcn, key = nil) #:nodoc:

data/lib/webgen/item_tracker/nodes.rb

@@ -51,7 +51,7 @@ module Webgen
         method_name, options, type = *iid
         nodes = node_list(method_name, options)
         old_data != nodes_to_alcn(nodes) ||
-          nodes.flatten.any? {|n| type == :content ? @website.ext.item_tracker.node_changed?(n) : @website.ext.item_tracker.item_changed?(:node_meta_info, n.alcn)}
+          nodes.flatten.any? {|n| type == :content ? @website.ext.item_tracker.node_changed?(n) : @website.ext.item_tracker.item_changed?(:node_meta_info, n)}
       end
 
       def referenced_nodes(iid, alcn_list) #:nodoc:

data/lib/webgen/node.rb

@@ -12,6 +12,8 @@ module Webgen
   # information is available through the #[] and #meta_info accessors, the internal processing
   # information through the #node_info accessor.
   #
+  # This class is not directly used. Instead path handlers define sub-classes that provide handler
+  # specific methods. See the basic sub-class Webgen::PathHandler::Base::Node.
   class Node
 
     # The parent node. This is in all but one case a Node object. The one exception is that the
@@ -167,7 +169,8 @@ module Webgen
     # If the +lang+ parameter is not used, it defaults to the language of the current node.
     def route_to(node, lang = @lang)
       my_url = Webgen::Path.url(@dest_path)
-      other_url = Webgen::Path.url(node.proxy_node(lang).dest_path)
+      pnode = node.proxy_node(lang)
+      other_url = Webgen::Path.url(pnode['routing_path'] || pnode.dest_path)
 
       # resolve any '.' and '..' paths in the target url
       if other_url.path =~ /\/\.\.?\// && other_url.scheme == 'webgen'
@@ -185,12 +188,7 @@ module Webgen
     #
     # If the +lang+ parameter is not used, it defaults to the language of the current node.
     def proxy_node(lang = @lang)
-      proxy_path = self['proxy_path']
-      if proxy_path.nil?
-        self
-      else
-        resolve(proxy_path, lang, true) || self
-      end
+      self['proxy_path'] && resolve(self['proxy_path'], lang, true) || self
     end
 
     # Return a HTML link from this node to the given node.

data/lib/webgen/node_finder.rb

@@ -61,6 +61,9 @@ module Webgen
   #   the value of this meta information is used for comparison of nodes (again, if both compared
   #   values are integers, a numeric comparison is done, else a string comparison).
   #
+  # [:reverse]
+  #   Value: +true+ of +false+/+nil+. If this option is set to +true+, the sort order is reversed.
+  #
   # === Filter options
   #
   # These options are used for filtering the nodes. All nodes are used by default if no filter
@@ -71,9 +74,9 @@ module Webgen
   #   used.
   #
   # [:lang]
-  #   Value: a language code/+nil+/the special value :+node+ or an array of these values. Nodes that
+  #   Value: a language code/+nil+/the special value +node+ or an array of these values. Nodes that
   #   have one of the specified language codes, are language independent (in case of the value
-  #   +nil+) or have the same language as the reference node (in case of the value :+node+) are
+  #   +nil+) or have the same language as the reference node (in case of the value +node+) are
   #   used.
   #
   # [:mi]
@@ -97,6 +100,9 @@ module Webgen
   #   and end levels). All nodes whose hierarchy level in the node tree are greater than or equal to
   #   the start level and lower than or equal to the end level are used.
   #
+  #   Negative numbers, where -1 stands for the reference node, -2 for its parent node and so on,
+  #   can also be used.
+  #
   # [:ancestors]
   #   Value: +true+ or +false+/+nil+. If this filter option is set to +true+, only nodes that are
   #   ancestors of the reference node are used. The reference node itself is used as well.
@@ -106,8 +112,17 @@ module Webgen
   #   descendants of the reference node are used. The reference node itself is used as well.
   #
   # [:siblings]
-  #   Value: +true+ or +false+/+nil+. If this filter option is set to +true+, only nodes that are
-  #   siblings of the reference are node used. The reference node itself is used as well.
+  #   Value: +true+, +false+/+nil+, or an array with two integers. If this filter option is set to
+  #   +true+, only nodes that are sibling node of the reference node are used. The reference node
+  #   itself is used as well. If set to +false+ or +nil+, this filter is ignored.
+  #
+  #   If an array with two numbers is specified, all sibling nodes of the reference node or its
+  #   parent nodes the hierarchy level of which lies between these numbers are used. The parent
+  #   nodes and the reference node are used as well if their level lies between the numbers.
+  #   Counting starts at zero (the root node).
+  #
+  #   Negative numbers, where -1 stands for the reference node, -2 for its parent node and so on,
+  #   can also be used.
   #
   # == Implementing a filter module
   #
@@ -177,14 +192,14 @@ module Webgen
       end
       opts = prepare_options_hash(opts_or_name)
 
-      limit, offset, flatten, sort, levels = remove_non_filter_options(opts)
+      limit, offset, flatten, sort, levels, reverse = remove_non_filter_options(opts)
       flatten = true if limit || offset
       levels = [levels || [1, 1_000_000]].flatten.map {|i| i.to_i}
 
       nodes = filter_nodes(opts, ref_node)
 
       if flatten
-        sort_nodes(nodes, sort)
+        sort_nodes(nodes, sort, reverse)
         nodes = nodes[(offset.to_s.to_i)..(limit ? offset.to_s.to_i + limit.to_s.to_i - 1 : -1)] if limit || offset
       else
         result = {}
@@ -208,7 +223,7 @@ module Webgen
           end
         end
         nodes = reducer.call(result, 1)
-        sort_nodes(nodes, sort, false)
+        sort_nodes(nodes, sort, reverse, false)
       end
 
       cache_result(opts_or_name, ref_node, nodes)
@@ -237,7 +252,8 @@ module Webgen
     end
 
     def remove_non_filter_options(opts)
-      [opts.delete(:limit), opts.delete(:offset), opts.delete(:flatten), opts.delete(:sort), opts.delete(:levels)]
+      [opts.delete(:limit), opts.delete(:offset), opts.delete(:flatten),
+       opts.delete(:sort), opts.delete(:levels), opts.delete(:reverse)]
     end
 
     def filter_nodes(opts, ref_node)
@@ -255,23 +271,23 @@ module Webgen
       nodes
     end
 
-    def sort_nodes(nodes, sort, flat_mode = true)
+    def sort_nodes(nodes, sort, reverse, flat_mode = true)
       return unless sort
       if sort == true
         nodes.sort! do |(a,_),(b,_)|
           a = (a['sort_info'] && a['sort_info'].to_s) || a['title'].to_s || ''
           b = (b['sort_info'] && b['sort_info'].to_s) || b['title'].to_s || ''
           (a = a.to_i; b = b.to_i) if a !~ /\D/ && b !~ /\D/
-          a <=> b
+          (reverse ? b <=> a : a <=> b)
         end
       else
         nodes.sort! do |(a,_),(b,_)|
           a, b = a[sort].to_s, b[sort].to_s
           a, b = a.to_i, b.to_i if a !~ /\D/ && b !~ /\D/
-          a <=> b
+          (reverse ? b <=> a : a <=> b)
         end
       end
-      nodes.each {|n, children| sort_nodes(children, sort, flat_mode) if children } unless flat_mode
+      nodes.each {|n, children| sort_nodes(children, sort, reverse, flat_mode) if children } unless flat_mode
     end
 
     # :section: Filter methods
@@ -313,12 +329,12 @@ module Webgen
     end
 
     def filter_absolute_levels(nodes, ref_node, range)
-      range = [range].flatten.map {|i| i.to_i}
+      range = [range].flatten.map {|i| (i = i.to_i) < 0 ? ref_node.level + 1 + i : i}
       nodes.keep_if {|n| n.level >= range.first && n.level <= range.last}
     end
 
     def filter_lang(nodes, ref_node, langs)
-      langs = [langs].flatten.map {|l| l == :node ? ref_node.lang : l}.uniq
+      langs = [langs].flatten.map {|l| l == 'node' ? ref_node.lang : l}.uniq
       nodes.keep_if {|n| langs.any? {|l| n.lang == l}}
     end
 
@@ -341,9 +357,16 @@ module Webgen
       end
     end
 
-    def filter_siblings(nodes, ref_node, enabled)
-      return nodes unless enabled
-      nodes.keep_if { |n| n.parent == ref_node.parent}
+    def filter_siblings(nodes, ref_node, value)
+      return nodes unless value
+      if value == true
+        nodes.keep_if {|n| n.parent == ref_node.parent}
+      else
+        value = [value].flatten.map {|i| (i = i.to_i) < 0 ? ref_node.level + 1 + i : i}
+        nodes.keep_if do |n|
+          n.level >= value.first && n.level <= value.last && (n.parent.is_ancestor_of?(ref_node) || n.is_root?)
+        end
+      end
     end
 
   end