gettalong-webgen 0.5.8.20090507 → 0.5.9.20090620

data/Rakefile

@@ -59,9 +59,9 @@ Webgen::WebgenTask.new('htmldoc') do |site|
     prefix = "webgen-website-bundle-"
     config['resources'].select {|name, data| name =~ /^#{prefix}style/}.each do |name, data|
       config['sources'] <<
-        ["/website_styles/#{name.sub(prefix, '')}", "Webgen::Source::FileSystem", 'misc', 'style.page']
+        ["/website_styles/#{name.sub(prefix, '')}/", "Webgen::Source::FileSystem", 'misc', 'style.page']
       config['sources'] <<
-        ["/website_styles/#{name.sub(prefix, '')}", 'Webgen::Source::Resource', name, '/src/**', '/src']
+        ["/website_styles/#{name.sub(prefix, '')}/", 'Webgen::Source::Resource', name, '/src/**', '/src/']
     end
     config['output'] = ['Webgen::Output::FileSystem', 'htmldoc']
   end
@@ -171,8 +171,7 @@ EOF
       s.add_development_dependency('haml', '>= 2.0.9')
       s.add_development_dependency('builder', '>= 2.1.0')
       s.add_development_dependency('rdoc', '>= 2.4.2')
-      s.add_development_dependency('coderay', '>= 0.7.4.214')
-      s.add_development_dependency('feedtools', '>= 0.2.29')
+      s.add_development_dependency('coderay', '>= 0.8.312')
       s.add_development_dependency('erubis', '>= 2.6.2')
       s.add_development_dependency('rdiscount', '>= 1.2.9')
       s.add_development_dependency('archive-tar-minitar', '>= 0.5.2')
@@ -279,9 +278,9 @@ The official version is called 'webgen' and can be installed via
       prefix = "webgen-website-bundle-"
       config['resources'].select {|name, data| name =~ /^#{prefix}style/}.each do |name, data|
         config['sources'] <<
-          ["/documentation/website_styles/#{name.sub(prefix, '')}", "Webgen::Source::FileSystem", '../misc', 'style.page']
+          ["/documentation/website_styles/#{name.sub(prefix, '')}/", "Webgen::Source::FileSystem", '../misc', 'style.page']
         config['sources'] <<
-          ["/documentation/website_styles/#{name.sub(prefix, '')}", 'Webgen::Source::Resource', name, '/src/**', '/src']
+          ["/documentation/website_styles/#{name.sub(prefix, '')}/", 'Webgen::Source::Resource', name, '/src/**', '/src/']
       end
     end
   end

data/data/webgen/passive_sources/templates/atom_feed.template

@@ -0,0 +1,38 @@
+---
+template: ~
+--- pipeline:erb
+<?xml version="1.0" encoding="utf-8" ?>
+<feed xmlns="http://www.w3.org/2005/Atom">
+  <title type="html"><%= h(context.node['title']) %></title>
+  <subtitle type="html"><%= h(context.node['description']) %></subtitle>
+  <author>
+    <name><%= h(context.node['author']) %></name>
+    <uri><%= h(context.node['author_url']) %></uri>
+  </author>
+
+  <link href="<%= context.node.feed_link %>" rel="alternate" />
+  <generator uri="http://webgen.rubyforge.org/documentation/sourcehandler/feed.html" version="<%= Webgen::VERSION %>">
+    webgen - Webgen::SourceHandler::Feed
+  </generator>
+  <updated><%= Time.now.xmlschema %></updated>
+  <id><%= context.node.feed_link %></id>
+
+  <% context.node.feed_entries.each do |entry| %>
+  <entry>
+    <title type="html"><%= h(entry['title']) %></title>
+    <% if entry['author'] %>
+    <author>
+      <name><%= h(entry['author']) %></name>
+      <uri><%= h(entry['author_url']) %></uri>
+    </author>
+    <% end %>
+    <link href="<%= Webgen::Node.url(File.join(context.node['site_url'], entry.path), false) %>" rel="alternate" />
+    <id><%= Webgen::Node.url(File.join(context.node['site_url'], entry.path), false) %></id>
+    <updated><%= entry['modified_at'].xmlschema %></updated>
+    <% if entry['created_at'].kind_of?(Time) %>
+    <published><%= entry['created_at'].xmlschema %></published>
+    <% end %>
+    <content type="html"><%= h(context.node.entry_content(entry)) %></content>
+  </entry>
+  <% end %>
+</feed>

data/data/webgen/passive_sources/templates/rss_feed.template

@@ -0,0 +1,28 @@
+---
+template: ~
+--- pipeline:erb
+<?xml version="1.0" encoding="utf-8" ?>
+<rss version="2.0">
+  <channel>
+    <title><%= h(context.node['title']) %></title>
+    <link><%= context.node.feed_link %>"</link>
+    <description><%= h(context.node['description']) %></description>
+    <pubDate><%= Time.now.rfc822 %></pubDate>
+    <lastBuildDate><%= Time.now.rfc822 %></lastBuildDate>
+    <generator>webgen - Webgen::SourceHandler::Feed</generator>
+
+    <% context.node.feed_entries.each do |entry| %>
+    <item>
+      <title><%= h(entry['title']) %></title>
+      <link><%= Webgen::Node.url(File.join(context.node['site_url'], entry.path), false) %></link>
+      <description><%= h(context.node.entry_content(entry)) %></description>
+      <pubDate><%= entry['modified_at'].rfc822 %></pubDate>
+      <guid isPermaLink="true"><%= Webgen::Node.url(File.join(context.node['site_url'], entry.path), false) %></guid>
+    </item>
+    <% end %>
+
+  </channel>
+</rss>
+
+
+

data/data/webgen/resources.yaml

@@ -1,3 +1,4 @@
-website_skeleton:    webgen-website-skeleton
+website_skeleton:        webgen-website-skeleton
 website_bundles/style/*: webgen-website-bundle-style-$basename
 website_bundles/default: webgen-website-bundle-default
+passive_sources:         webgen-passive-sources

data/doc/contentprocessor/builder.page

@@ -52,7 +52,7 @@ a custom XML document (the `content` block has to be valid Ruby!):
     title: Person Object
     template: ~
     --- pipeline:builder
-    xml.persons(:path => context.node.absolute_lcn) do |p|
+    xml.persons(:path => context.node.alcn) do |p|
       p.person do |b|
         b.firstname('Thomas')
         b.lastname('Leitner')

data/doc/contentprocessor/erb.page

@@ -8,7 +8,7 @@ a look at its documentation by executing `ri ERB` or the [ruby documentation
 site](http://www.ruby-doc.org/)!
 
 You can use the special object `context` in your ERB code which provides the whole rendering context
-and the following useful methods:
+and, for example, the following useful methods:
 
 * `website`: Provides access to the `Webgen::Website` object which can be used to access all aspects
   of the currently rendered website.
@@ -22,6 +22,9 @@ and the following useful methods:
 * `dest_node`: The node in which the result gets inserted. Should be used for calculating relative
   paths.
 
+For a complete list of supported methods have a look at the API documentation for
+[Webgen::Context](../rdoc/Webgen/Context.html).
+
 Here is a small usage example. The following put in a page file
 
     Counting 5 items dynamically:
@@ -53,5 +56,5 @@ output the result of the Ruby code (note the equation sign!). And the fourth lin
 
 > You may need to ensure that the ERB start and end tags are not processed by the content
 > processor. For example, when using the RedCloth content processor, you may need to surround the
-> ERB code with `<textile>` tags!
+> ERB code with `<notextile>` tags!
 {.important}

data/doc/contentprocessor/erubis.page

@@ -25,9 +25,9 @@ following configuration options:
 
 * `contentprocessor.erubis.use_pi`: Use processing instructions instead of ERB like
   instructions. Normally you use statements like `<%% result = some_method_call(opts) %>` or `<%%=
-  context.content_node.absolute_lcn %>` in your content. When setting this option to `true`, you can
+  context.content_node.alcn %>` in your content. When setting this option to `true`, you can
   use XML processing instructions instead, like this: `<?rb result = some_method_call(opts) ?>` or
-  `@{context.content_node.absolute_lcn}@`.
+  `@{context.content_node.alcn}@`.
 
 * `contentprocessor.erubis.options`: This is hash which is passed to the Erubis interpreter and
   which can be used to set additional options.

data/doc/extensions.page

@@ -6,7 +6,7 @@ title: Extensions
 Following is a listing of all available extensions:
 
 <%
-pattern = /#{File.join(context.node.parent.absolute_lcn, '/')}(contentprocessor|output|source|sourcehandler|tag|)\/.*html$/
+pattern = /#{File.join(context.node.parent.alcn, '/')}(contentprocessor|output|source|sourcehandler|tag|)\/.*html$/
 context.node.tree.node_access[:alcn].select {|alcn, n| alcn =~ pattern}.sort.each do |alcn, n|
 next if n.is_fragment?
 %>

data/doc/manual.page

@@ -253,9 +253,31 @@ feeling of what files are handled by webgen.
 ## Source Paths Naming Convention {#source-naming}
 
 webgen assumes that the paths provided by the sources follow a special naming convention sothat meta
-information can be extracted correctly from the path name:
+information can be extracted correctly from the path names. There are three different cases
+depending on the type of path (the individual parts of a path are explained below):
 
-    [sort_info.]basename[.lang].extension
+*   The path specifies a directory. It must end with a slash character and must not contain any hash
+    characters. A directory path has to follow the scheme:
+
+        /parent_path/basename/
+
+*   The path specifies a file. It must not end with a slash character and must not contain any hash
+    characters. A file path has to follow the scheme:
+
+        /parent_path/[sort_info.]basename[.lang][.extension]
+
+*   The path specifies a fragment (e.g. part of a file). It must contain exactly one hash character
+    and it has to follow the scheme (where `/parent_path` needs to be a file path):
+
+        /parent_path#basename
+
+Following is the explanation of the parts of the path names:
+
+*   `/parent_path`
+
+    This part specifies the path of the parent of this path and is used internally to create a
+    hierarchy of paths. Although the leading slash is explicitly written here, it is part of the
+    parent path, i.e. each parent path begins with a slash.
 
 *   `sort_info`
 
@@ -265,46 +287,54 @@ information can be extracted correctly from the path name:
 *   `basename`
 
     This part is used on the one hand to generate the `title` meta information (but with `_` and `-`
-    replaced by spaces). And on the other hand, the canonical name is derived from it. `basename`
-    must not contain any dots, spaces or any character from the following list: ``; / ? * : ` & = +
-    $ ,``. If you do use one of them webgen may not work correctly!
+    replaced by spaces). And on the other hand, the [canonical name]({relocatable: '#source-cn'}) is
+    derived from it. `basename` must not contain any dots, spaces or any character from the
+    following list: ``; ? * : ` & = + $ ,``. If you do use one of them, webgen may not work
+    correctly!
 
-    > If two paths have the same `basename` and `extension` part, they should define the same
+    > If two file paths have the same `basename` and `extension` part, they should define the same
     > content but for different languages. This allows webgen to automatically deliver the right
-    > language version of the content
+    > language version of the content.
     {.important}
 
 *   `lang`
 
     This part is optional and has to be an [ISO-639-1/2](http://www.loc.gov/standards/iso639-2/)
-    language identifier (two or three characters (a-z) long). If not specified, it is assumed that
-    the path is language independent (for example, images are normally not specific for a specific
-    language). However, this behaviour may be different for some source handler classes (for
-    example, all paths handled by SourceHandler::Page are assigned the default language if none is
-    set).
+    language identifier (two or three characters (a-z) long). It can only be specified if an
+    extension is also specified. If the file path should not have an extension, then just add a
+    trailing dot, e.g. `/dir/file.de.` - the trailing dot is ignored by webgen.
+
+    If the language part is not specified, it is assumed that the path is language independent (for
+    example, images are normally not specific for a specific language). However, this behaviour may
+    be different for some source handler classes (for example, all paths handled by
+    SourceHandler::Page are assigned the default language if none is set).
 
     If the language identifier can't be matched to a valid language, it is assumed that this part
     isn't actually a language identifier but a part of the extension. This also means that in the
     special case where the first part of an extension is also a valid language identifier, the first
-    part is interpreted as language identifier and not as part of the extension.
+    part is interpreted as language identifier and not as part of the extension!
 
 *   `extension`
 
     The file extension can be anything and can include dots.
 
-Following are some examples of source path names:
-
-|Path name                 | Parsed meta information
-|--------------------------|------------------------------------------------
-|`name.png`                | title: Name, language: none, sort\_info: 0, basename: name, cn: name.png
-|`name.de.png`             | title: Name, language: de, sort\_info: 0, basename: name, cn: name.png
-|`01.name_of-file.eo.page` | title: Name of file, language: eo, sort\_info: 1, basename: name_of-file, cn: name_of-file.page
-|`name.tar.bz2`            | title: Name, language: none, sort\_info: 0, basename: name, cn: name.tar.bz2
-|`name.de.tar.bz2`         | title: Name, language: de, sort\_info: 0, basename: name, cn: name.tar.bz2
-
-Notice: The first two and the last two examples define the same content for two different languages
-(or more exactly: the first one is unlocalized and the second one localized to German) as they have
-the same canonical name.
+Following are some examples of source path names (the acn and alcn parts are explained
+[below]({relocatable: '#source-cn'})):
+
+| Path                       | Basename     | Language | `title`      | `sort_info` | acn                    | alcn                    |
+|----------------------------|--------------|----------|--------------|-------------|------------------------|-------------------------|
+| `/directory/`              | directory    | -none-   | Directory    |      -none- | `/directory/`          | `/directory/`           |
+| `/image.png`               | image        | -none-   | Image        |           0 | `/image.png`           | `/image.png`            |
+| `/image.de.png`            | image        | de       | Image        |           0 | `/image.png`           | `/image.de.png`         |
+| `/01.name_of-file.eo.page` | name_of-file | eo       | Name of file |           1 | `/name_of-file.page`   | `/name_of-file.eo.page` |
+| `/archive.tar.bz2`         | archive      | -none-   | Archive      |           0 | `/archive.tar.bz2`     | `/archive.tar.bz2`      |
+| `/archive.de.tar.bz2`      | archive      | de       | Archive      |           0 | `/archive.tar.bz2`     | `/archive.de.tar.bz2`   |
+| `/manual.html#sources`     | manual       | -none-   | Manual       |      -none- | `/manual.html#sources` | `/manual.html#sources`  |
+{#source-path-example-table style="border: 1px solid black; width: 100%"}
+
+Notice: The first two file path and the last two file path examples define the same content for two
+different languages (or more exactly: the first one is unlocalized in both cases and the second one
+localized to German) as they have the same canonical name.
 
 
 ## Canonical Name of a File ### {#source-cn}

data/doc/reference_configuration.page

@@ -163,12 +163,33 @@ configuration options) and/or how to use it in a webgen tag (for tag configurati
 
     * Example for setting the option in the configuration file:
 
-          sources: [[/, Webgen::Source::FileSystem, src], [/, Webgen::Source::FileSystem, /mnt/pictures, **/*.jpg]
+          sources: [[/, Webgen::Source::FileSystem, src], [/, Webgen::Source::FileSystem, /mnt/pictures, **/*.jpg]]
 
       Also have a look at the [file system source documentation]({relocatable:
       source/filesystem.html}) for more examples!
 
 
+*   ### passive\_sources
+
+    Specifies one or more sources which are not actively used during the node creation time, ie. no
+    nodes are created from these sources by default. Instead, they lie dormant until later and are
+    only used if resolving a path fails. Then it is checked if a passive source for the requested
+    path exists and if so, a node is created from it. If a node created from a passive source is not
+    used anymore, it is automatically deleted.
+
+    * Syntax: `[[MOUNT POINT, NAME, ARG1, ARG2, ...], ...]` where `MOUNT POINT` is the path under
+      which the source should be mounted, `NAME` is the name of the source class (for example,
+      `Webgen::Source::FileSystem`) and `ARG1`, `ARG2` and so on are the parameters for the source
+      class. The supported parameters can be found in the documentation for each source class.
+
+    <%= show_default['passive_sources'] %>
+
+    * Example for setting the option in the configuration file:
+
+          passive_sources:
+            [[/, Webgen::Source::Resource, webgen-passive-sources], [/, Webgen::Source::FileSystem, /mnt/pictures, **/*.jpg]]
+
+
 *   ### output
 
     Specifies the output class that should be used for writing out the generated paths.
@@ -184,6 +205,20 @@ configuration options) and/or how to use it in a webgen tag (for tag configurati
           output: [Webgen::Output::FileSystem, custom_out]
 
 
+*   ### output.do\_deletion
+
+    Specifies whether the output class should delete generated paths once the source paths are not
+    available anymore.
+
+    * Syntax: `BOOLEAN` where `BOOLEAN` is either `true` or `false`.
+
+    <%= show_default['output.do_deletion'] %>
+
+    * Example for setting the option in the configuration file:
+
+          output.do_deletion: true
+
+
 *   ### sourcehandler.patterns
 
     Specifies the path patterns that are used by the individual source handlers. This configuration

data/doc/reference_website_styles.page

@@ -17,7 +17,7 @@ browser:
 
 <%
 context.content_node.tree.node_access[:alcn].select do |name, node|
-  node.is_directory? && node.parent == context.content_node.tree[File.join(context.content_node.parent.absolute_lcn, '/website_styles')]
+  node.is_directory? && node.parent == context.content_node.tree[File.join(context.content_node.parent.alcn, '/website_styles/')]
 end.sort.each do |name, node|
 %>
 <h2 id="<%= node.cn %>"><%= node.cn %></h2>

data/doc/sourcehandler/feed.page

@@ -7,12 +7,6 @@ This source handler automatically generates an atom or RSS feed for a set of fil
 [Webgen Page Format]({relocatable: ../webgen_page_format.html}) (the format which is also used for
 page files).
 
-> This extension is only available if you have installed the [feedtools][1] library. The preferred
-> way to do this is via Rubygems:
->
->     gem install feedtools
-{.warning}
-
 The following meta information keys are supported:
 
 *   `entries` (MANDATORY)
@@ -98,8 +92,9 @@ The following meta information keys of page files are used if they are specified
 
     The URL of the homepage of the author. Only used if the `author` meta information is also set.
 
-The default implementation supports the generation of atom and RSS feeds. You can override the
-default generation mechanism by adding an `atom_template` and/or `rss_template` block in the feed
-file which are then used to generate the atom or the RSS feed respectively.
-
-[1]: http://sporkmonger.com/projects/feedtools
+The default implementation supports the generation of atom and RSS feeds by using templates shipped
+with webgen. The default templates are located under the ALCNs `/templates/atom_feed.template` and
+`/templates/rss_feed.template` and are automatically created and used if no such paths exist in the
+webgen website. You can also override the default generation mechanism on a file per file basis by
+adding an `atom_template` and/or `rss_template` block in the feed file which are then used to
+generate the atom or the RSS feed respectively.

data/doc/tag/includefile.page

@@ -8,7 +8,7 @@ used_options:
 ## Description
 
 The include file tag is used to include the content of a file. The filename needs to be specified
-relative to the website directory or an absolute filename.
+relative to the website directory or as an absolute filename.
 
 > By surrounding the include file tag with a syntax highlighting tag it is possible to highlight the
 > contents of a file.

data/lib/webgen/cli/apply_command.rb

@@ -44,7 +44,7 @@ module Webgen::CLI
     # Apply the style specified in <tt>args[0]</tt> to the webgen website.
     def execute(args)
       wm = Webgen::WebsiteManager.new(commandparser.directory)
-      if !File.directory?(commandparser.directory)
+      if !File.directory?(wm.website.directory)
         raise "You need to specify a valid webgen website directory!"
       elsif args.length == 0
         raise OptionParser::MissingArgument.new('STYLE')

data/lib/webgen/cli/utils.rb

@@ -11,8 +11,8 @@ module Webgen::CLI
   # Provides methods for other CLI classes for formatting text in a consistent manner.
   class Utils
 
-    USE_ANSI_COLORS = !Config::CONFIG['arch'].include?('mswin32')
-    DEFAULT_WIDTH = if Config::CONFIG['arch'].include?('mswin32')
+    USE_ANSI_COLORS = Config::CONFIG['host_os'] !~ /mswin|mingw/
+    DEFAULT_WIDTH = if Config::CONFIG['host_os'] =~ /mswin|mingw/
                       72
                     else
                       ((size = %x{stty size 2>/dev/null}).length > 0 ? size.split.last.to_i : 72) rescue 72

data/lib/webgen/common.rb

@@ -1,7 +1,5 @@
 # -*- encoding: utf-8 -*-
 
-require 'pathname'
-
 module Webgen
 
   # Namespace for classes and methods that provide common functionality.
@@ -9,13 +7,6 @@ module Webgen
 
     autoload :Sitemap, 'webgen/common/sitemap'
 
-    # Make the given +path+ absolute by prepending the absolute path +base+ if necessary. Also
-    # resolves all '..'  and '.' references in +path+.
-    def self.absolute_path(path, base)
-      raise(ArgumentError, 'base has to be an absolute path') unless base =~ /\//
-      Pathname.new(path =~ /^\// ? path : File.join(base, path)).cleanpath.to_s
-    end
-
   end
 
 end

data/lib/webgen/contentprocessor/blocks.rb

@@ -10,49 +10,73 @@ module Webgen::ContentProcessor
     BLOCK_RE = /<webgen:block\s*?((?:\s\w+=('|")[^'"]+\2)+)\s*\/>/
     BLOCK_ATTR_RE = /(\w+)=('|")([^'"]+)\2/
 
-    # Replace that webgen:block xml tags with the rendered content of a node.
+    # Replace the webgen:block xml tags with the rendered content of the specified node.
     def call(context)
-      chain = context[:chain]
-      new_chain = (chain.length > 1 ? chain[1..-1] : chain)
-
       context.content.gsub!(BLOCK_RE) do |match|
         attr = {}
-        match.scan(BLOCK_ATTR_RE) {|name, sep, content| attr[name] = content}
-        if attr['chain'].nil?
-          used_chain = new_chain.dup
-        else
-          paths = attr['chain'].split(';')
-          used_chain = paths.collect do |path|
-            temp_node = context.ref_node.resolve(path.strip, context.dest_node.lang)
-            log(:error) { "Could not resolve <#{path.strip}> in <#{context.ref_node.absolute_lcn}> in '#{match.to_s}'" } if temp_node.nil?
-            temp_node
-          end.compact
-          next match if used_chain.length != paths.length
-          dest_node = context.content_node
-        end
+        match.scan(BLOCK_ATTR_RE) {|name, sep, content| attr[name.to_sym] = content}
+        render_block(context, attr)
+      end
+      context
+    end
 
-        if attr['node'] == 'first'
-          used_chain.shift while used_chain.length > 0 && !used_chain.first.node_info[:page].blocks.has_key?(attr['name'])
-        elsif attr['node'] == 'current'
-          used_chain = context[:chain].dup
-        end
-        block_node = used_chain.first
-
-        if !block_node || !block_node.node_info[:page].blocks.has_key?(attr['name'])
-          if attr['notfound'] == 'ignore'
-            next ''
-          elsif block_node
-            raise "Node <#{block_node.absolute_lcn}> has no block named '#{attr['name']}'"
-          else
-            raise "No node in the chain has a block named '#{attr['name']}'"
+    # Render a block of a page node and return the result.
+    #
+    # The Webgen::Context object +context+ is used as the render context and the +options+ hash
+    # needs to hold all relevant information, that is:
+    #
+    # [<tt>:name</tt> (mandatory)]
+    #   The name of the block that should be used.
+    # [<tt>:chain</tt>]
+    #   The node chain used for rendering. If this is not specified, the node chain from the context
+    #   is used. It needs to be a String in the format <tt>(A)LCN;(A)LCN;...</tt> or an array of
+    #   nodes.
+    # [<tt>:node</tt>]
+    #   Defines which node in the node chain should be used. Valid values are +next+ (= default
+    #   value; the next node in the node chain), +first+ (the first node in the node chain with a
+    #   block called +name+) or +current+ (the currently rendered node, ignores the +chain+ option).
+    # [<tt>:notfound</tt>]
+    #   If this property is set to +ignore+, a missing block will not raise an error. It is unset by
+    #   default, so missing blocks will raise errors.
+    def render_block(context, options)
+      if options[:chain].nil?
+        used_chain = (context[:chain].length > 1 ? context[:chain][1..-1] : context[:chain]).dup
+      elsif options[:chain].kind_of?(Array)
+        used_chain = options[:chain]
+      else
+        paths = options[:chain].split(';')
+        used_chain = paths.collect do |path|
+          temp_node = context.ref_node.resolve(path.strip, context.dest_node.lang)
+          if temp_node.nil?
+            context.dest_node.flag(:dirty)
+            log(:error) { "Could not resolve <#{path.strip}> in <#{context.ref_node.alcn}> while rendering blocks" }
           end
-        end
+          temp_node
+        end.compact
+        return '' if used_chain.length != paths.length
+        dest_node = context.content_node
+      end
 
-        context.dest_node.node_info[:used_nodes] << block_node.absolute_lcn
-        tmp_context = block_node.node_info[:page].blocks[attr['name']].render(context.clone(:chain => used_chain, :dest_node => dest_node))
-        tmp_context.content
+      if options[:node] == 'first'
+        used_chain.shift while used_chain.length > 0 && !used_chain.first.node_info[:page].blocks.has_key?(options[:name])
+      elsif options[:node] == 'current'
+        used_chain = context[:chain].dup
       end
-      context
+      block_node = used_chain.first
+
+      if !block_node || !block_node.node_info[:page].blocks.has_key?(options[:name])
+        if options[:notfound] == 'ignore'
+          return ''
+        elsif block_node
+          raise "Node <#{block_node.alcn}> has no block named '#{options[:name]}'"
+        else
+          raise "No node in the chain has a block named '#{options[:name]}'"
+        end
+      end
+
+      context.dest_node.node_info[:used_nodes] << block_node.alcn
+      tmp_context = block_node.node_info[:page].blocks[options[:name]].render(context.clone(:chain => used_chain, :dest_node => dest_node))
+      tmp_context.content
     end
 
   end