webgen 0.5.2 → 0.5.3

data/lib/webgen/tag/sitemap.rb

@@ -0,0 +1,42 @@
+require 'webgen/websiteaccess'
+require 'webgen/tag'
+
+module Webgen::Tag
+
+  # Generates a sitemap. The sitemap contains the hierarchy of all pages on the web site.
+  class Sitemap
+
+    include Base
+    include Webgen::WebsiteAccess
+
+    # Create the sitemap.
+    def call(tag, body, context)
+      tree = website.blackboard.invoke(:create_sitemap, context.dest_node, context.content_node.lang, @params)
+      (tree.children.empty? ? '' : output_sitemap(tree, context))
+    end
+
+    #######
+    private
+    #######
+
+    # The modified tag base to support the easy specification of common.sitemap.* options.
+    def tag_config_base
+      'common.sitemap'
+    end
+
+    # Create the HTML representation of the sitemap nodes in +tree+ in respect to +context+.
+    def output_sitemap(tree, context)
+      out = "<ul>"
+      tree.children.each do |child|
+        sub = (child.children.length > 0 ? output_sitemap(child, context) : '')
+        out << "<li>" + context.dest_node.link_to(child.node, :lang => child.node.lang || context.content_node.lang)
+        out << sub
+        out << "</li>"
+      end
+      out << "</ul>"
+      out
+    end
+
+  end
+
+end

data/lib/webgen/tree.rb

@@ -64,7 +64,7 @@ module Webgen
       n = node_or_alcn.kind_of?(Node) ? node_or_alcn : @node_access[:alcn][node_or_alcn]
       return if n.nil? || n == @dummy_root || (n.is_directory? && !delete_dir)
 
-      n.children.dup.each {|child| delete_node(child, true)}
+      n.children.dup.each {|child| delete_node(child, delete_dir)}
 
       website.blackboard.dispatch_msg(:before_node_deleted, n)
       n.parent.children.delete(n)

data/lib/webgen/version.rb

@@ -1,6 +1,6 @@
 module Webgen
 
   # The version of webgen.
-  VERSION = '0.5.2'
+  VERSION = '0.5.3'
 
 end

data/lib/webgen/website.rb

@@ -4,6 +4,7 @@ require 'set'
 require 'fileutils'
 
 # Requirements for Website
+require 'webgen/coreext'
 require 'webgen/loggable'
 require 'webgen/logger'
 require 'webgen/configuration'
@@ -13,6 +14,7 @@ require 'webgen/cache'
 require 'webgen/tree'
 
 # Files for autoloading
+require 'webgen/common'
 require 'webgen/source'
 require 'webgen/output'
 require 'webgen/sourcehandler'
@@ -194,12 +196,9 @@ module Webgen
           config = YAML::load(File.read(file)) || {}
           raise 'Structure of config file is not valid, has to be a Hash' if !config.kind_of?(Hash)
           config.each do |key, value|
-            if key == 'default_meta_info'
-              value.each do |klass_name, options|
-                @config['sourcehandler.default_meta_info'][klass_name].update(options)
-              end
-            else
-              @config[key] = value
+            case key
+            when *Webgen::Configuration::Helpers.public_instance_methods(false) then @config.send(key, value)
+            else @config[key] = value
             end
           end
         rescue RuntimeError, ArgumentError => e

data/misc/default.css

@@ -54,8 +54,8 @@ h3 { font-size: 1.3em; }
 
 #sidebar h1 {
   font: bold 1.4em 'Trebuchet MS', Arial, Sans-serif;
-  background: url(images/arrow.gif) no-repeat 5px .6em;
-  padding: 7px 0 7px 30px;
+  background: url(images/arrow.gif) no-repeat 0px .6em;
+  padding: 7px 0 7px 25px;
   color: #193441;
 }
 
@@ -217,6 +217,10 @@ blockquote pre {
   margin: 0; padding: 10px;
   background-color: #91AA9D;
 }
+#sidebar p {
+  margin: 0px;
+  padding-left: 10px;
+}
 #sidebar ul {
   list-style: inside square;
   margin: 0px;

data/test/helper.rb

@@ -23,6 +23,19 @@ module Test
       path
     end
 
+    def create_sitemap_nodes
+      {
+        :root => root = Webgen::Node.new(Webgen::Tree.new.dummy_root, '/', '/', {'index_path' => 'index.html'}),
+        :dir1 => dir1 = Webgen::Node.new(root, '/dir1/', 'dir1/'),
+        :file11_en => file11 = Webgen::Node.new(dir1, '/dir1/file11.en.html', 'file11.html', {'lang' => 'en', 'in_menu' => true, 'kind' => 'page'}),
+        :file11_en_f1 => file11_f1 = Webgen::Node.new(file11, '/dir1/file11.en.html#f1', '#f1', {'in_menu' => true}),
+        :dir2 => dir2 = Webgen::Node.new(root, '/dir2/', 'dir2/', {'kind' => 'directory'}),
+        :file21_en => Webgen::Node.new(dir2, '/dir2/file21.en.html', 'file21.html', {'lang' => 'en', 'in_menu' => false, 'kind' => 'other'}),
+        :file1_de => Webgen::Node.new(root, '/file1.de.html', 'file1.html', {'lang' => 'de', 'in_menu' => true, 'kind' => 'page'}),
+        :index_en => Webgen::Node.new(root, '/index.en.html', 'index.html', {'lang' => 'en', 'kind' => 'page'}),
+      }
+    end
+
   end
 
 end

data/test/test_common_sitemap.rb

@@ -0,0 +1,56 @@
+require 'test/unit'
+require 'helper'
+require 'webgen/tree'
+require 'webgen/contentprocessor'
+require 'webgen/common'
+
+class TestCommonSitemap < Test::Unit::TestCase
+
+  include Test::WebsiteHelper
+
+  def setup
+    super
+    @obj = Webgen::Common::Sitemap.new
+    @nodes = create_sitemap_nodes
+  end
+
+  def do_assert(node, lang, honor_in_menu, any_lang, used_kinds, result)
+    assert_equal(result.map {|name| @nodes[name].absolute_lcn },
+                 @obj.create_sitemap(node, lang, {
+                                       'common.sitemap.honor_in_menu' => honor_in_menu,
+                                       'common.sitemap.any_lang' => any_lang,
+                                       'common.sitemap.used_kinds' => used_kinds
+                                     }).to_lcn_list.flatten)
+  end
+
+  def test_create_sitemap_and_node_chagned
+    do_assert(@nodes[:file11_en], 'en', false, false, ['page'],
+              [:dir1, :file11_en, :index_en])
+    do_assert(@nodes[:file11_en], 'en', true, false, ['page'],
+              [:dir1, :file11_en])
+    do_assert(@nodes[:file11_en], 'en', false, false, ['page', 'other'],
+              [:dir1, :file11_en, :dir2, :file21_en, :index_en])
+    do_assert(@nodes[:file11_en], 'en', false, false, [],
+              [:dir1, :file11_en, :file11_en_f1, :dir2, :file21_en, :index_en])
+    do_assert(@nodes[:file11_en], 'en', false, false, ['noone'],
+              [])
+    do_assert(@nodes[:file11_en], 'en', false, false, ['page', 'directory'],
+              [:dir1, :file11_en, :dir2, :index_en])
+    do_assert(@nodes[:file11_en], 'en', true, false, ['page', 'directory'],
+              [:dir1, :file11_en])
+
+    do_assert(@nodes[:file1_de], 'de', false, false, ['page'],
+              [:file1_de])
+    do_assert(@nodes[:file1_de], 'de', false, true, ['page'],
+              [:dir1, :file11_en, :file1_de, :index_en])
+
+    @nodes[:file11_en].dirty = false
+    @website.blackboard.dispatch_msg(:node_changed?, @nodes[:file11_en])
+    assert(!@nodes[:file11_en].dirty)
+
+    @nodes[:file11_en].dirty_meta_info = true
+    @website.blackboard.dispatch_msg(:node_changed?, @nodes[:file11_en])
+    assert(@nodes[:file11_en].dirty)
+  end
+
+end

data/test/test_configuration.rb

@@ -1,5 +1,6 @@
 require 'test/unit'
 require 'webgen/configuration'
+require 'webgen/sourcehandler'
 
 class TestConfiguration < Test::Unit::TestCase
 
@@ -32,4 +33,27 @@ class TestConfiguration < Test::Unit::TestCase
     assert_raise(ArgumentError) { @config['not.existing'] = :newvalue}
   end
 
+  def test_set_options_using_helpers
+    @config = Webgen::Configuration.new
+    @config.sourcehandler.default_meta_info({'Webgen::SourceHandler::Page' => {'in_menu' => true}})
+    @config.sourcehandler.patterns({'Webgen::SourceHandler::Page' => ['**/*.page']})
+
+    @config.default_meta_info('Page' => {'in_menu' => false, 'test' => true})
+    assert_equal({'in_menu' => false, 'test' => true}, @config['sourcehandler.default_meta_info']['Webgen::SourceHandler::Page'])
+    @config.default_meta_info('Webgen::SourceHandler::Page' => {'in_menu' => true, :action => 'replace'})
+    assert_equal({'in_menu' => true}, @config['sourcehandler.default_meta_info']['Webgen::SourceHandler::Page'])
+    @config.default_meta_info('Other' => {'in_menu' => false})
+    assert_equal({'in_menu' => false}, @config['sourcehandler.default_meta_info']['Other'])
+    assert_raise(ArgumentError) { @config.default_meta_info([5,6]) }
+
+    @config.patterns('Page' => ['**/*.html'])
+    assert_equal(['**/*.html'], @config['sourcehandler.patterns']['Webgen::SourceHandler::Page'])
+    @config.patterns('Page' => {'del' => ['**/*.html'], 'add' => ['**/*.page']})
+    assert_equal(['**/*.page'], @config['sourcehandler.patterns']['Webgen::SourceHandler::Page'])
+    @config.patterns('Other' => {'del' => ['**/*.html'], 'add' => ['**/*.page']})
+    assert_equal(['**/*.page'], @config['sourcehandler.patterns']['Other'])
+    assert_raise(ArgumentError) { @config.patterns([5,6]) }
+    assert_raise(ArgumentError) { @config.patterns('Page' => 5) }
+  end
+
 end

data/test/test_contentprocessor_maruku.rb

@@ -1,11 +1,14 @@
 require 'test/unit'
+require 'webgen/node'
+require 'webgen/tree'
 require 'webgen/contentprocessor'
 
 class TestContentProcessorMaruku < Test::Unit::TestCase
 
   def test_call
     @obj = Webgen::ContentProcessor::Maruku.new
-    context = Webgen::ContentProcessor::Context.new(:content => '# header')
+    node = Webgen::Node.new(Webgen::Node.new(Webgen::Tree.new.dummy_root, '/', '/'), 'test', 'test')
+    context = Webgen::ContentProcessor::Context.new(:content => '# header', :chain => [node])
     assert_equal('<h1 id=\'header\'>header</h1>', @obj.call(context).content)
 
     context.content = "# head*d* {#das .dsaf "

data/test/test_node.rb

@@ -27,6 +27,7 @@ class TestNode < Test::Unit::TestCase
       :dir_file_frag => Webgen::Node.new(dir_file, '/dir/file.html#frag', '#frag'),
       :dir2 => dir2 = Webgen::Node.new(node, '/dir2/', 'dir2/', {'index_path' => 'index.html', 'title' => 'dir2'}),
       :dir2_index_en => Webgen::Node.new(dir2, '/dir2/index.html', 'index.html', {'lang' => 'en', 'routed_title' => 'routed', 'title' => 'index'}),
+      :dir2_index_de => Webgen::Node.new(dir2, '/dir2/index.de.html', 'index.html', {'lang' => 'de', 'routed_title' => 'routed_de', 'title' => 'index'}),
     }
   end
 
@@ -308,10 +309,12 @@ class TestNode < Test::Unit::TestCase
                  nodes[:somename_en].link_to(nodes[:somename_en_frag], :link_text => 'link_text', 'attr1' => 'val1'))
 
     # links to directories
-    assert_equal('<a href="dir2/">dir2</a>',
+    assert_equal('<a href="dir2/index.de.html">routed_de</a>',
                  nodes[:somename_de].link_to(nodes[:dir2]))
     assert_equal('<a href="dir2/index.html">routed</a>',
                  nodes[:somename_en].link_to(nodes[:dir2]))
+    assert_equal('<a href="dir2/index.de.html">routed_de</a>',
+                 nodes[:somename_en].link_to(nodes[:dir2], :lang => 'de'))
     assert_equal('<span>routed</span>',
                  nodes[:dir2_index_en].link_to(nodes[:dir2]))
 

data/test/test_page.rb

@@ -64,6 +64,16 @@ class TestPage < Test::Unit::TestCase
     - name: content
       content: ''
 
+# with only meta information, no blocks
+- in: |
+    ---
+    key: value
+
+  meta_info: {key: value}
+  blocks:
+    - name: content
+      content: ''
+
 # block with escaped ---
 - in: |
     before
@@ -123,11 +133,6 @@ EOF
   ---
   asdf kadsfakl
 
-# no block specified
-- |
-  ---
-  doit: now
-
 # two blocks with same name
 - |
   aasdf
@@ -156,6 +161,7 @@ EOF
     YAML::load(VALID).each_with_index do |data, oindex|
       d = Webgen::Page.from_data(data['in'])
       assert_equal(data['meta_info'], d.meta_info, "test item #{oindex} - meta info")
+      assert_equal(data['blocks'].length*2, d.blocks.length)
       data['blocks'].each_with_index do |b, index|
         index += 1
         assert_equal(b['name'], d.blocks[index].name, "test item #{oindex} - name")

data/test/test_path.rb

@@ -18,26 +18,26 @@ class TestPath < Test::Unit::TestCase
     check_proc.call(Webgen::Path.new('5.base_name-one.de.page'),
                     '5.base_name-one.de.page', './', 'base_name-one', 'de', 'page', 'base_name-one.page', 5, 'Base name one')
     check_proc.call(Webgen::Path.new('dir/default.png'),
-                    'dir/default.png', 'dir/', 'default', nil, 'png', 'default.png', 0, 'Default')
+                    'dir/default.png', 'dir/', 'default', nil, 'png', 'default.png', nil, 'Default')
     check_proc.call(Webgen::Path.new('default.en.png'),
-                    'default.en.png', './', 'default', 'en', 'png', 'default.png', 0, 'Default')
+                    'default.en.png', './', 'default', 'en', 'png', 'default.png', nil, 'Default')
     check_proc.call(Webgen::Path.new('default.deu.png'),
-                    'default.deu.png', './', 'default', 'de', 'png', 'default.png', 0, 'Default')
+                    'default.deu.png', './', 'default', 'de', 'png', 'default.png', nil, 'Default')
     check_proc.call(Webgen::Path.new('default.template'),
-                    'default.template', './', 'default', nil, 'template', 'default.template', 0, 'Default')
+                    'default.template', './', 'default', nil, 'template', 'default.template', nil, 'Default')
     check_proc.call(Webgen::Path.new('default.en.tar.bz2'),
-                    'default.en.tar.bz2', './', 'default', 'en', 'tar.bz2', 'default.tar.bz2', 0, 'Default')
+                    'default.en.tar.bz2', './', 'default', 'en', 'tar.bz2', 'default.tar.bz2', nil, 'Default')
     check_proc.call(Webgen::Path.new('default.tar.bz2'),
-                    'default.tar.bz2', './', 'default', nil, 'tar.bz2', 'default.tar.bz2', 0, 'Default')
+                    'default.tar.bz2', './', 'default', nil, 'tar.bz2', 'default.tar.bz2', nil, 'Default')
     check_proc.call(Webgen::Path.new('default'),
-                    'default', './', 'default', nil, '', 'default', 0, 'Default')
+                    'default', './', 'default', nil, '', 'default', nil, 'Default')
     check_proc.call(Webgen::Path.new('.htaccess'),
-                    '.htaccess', './', '', nil, 'htaccess', '.htaccess', 0, '')
+                    '.htaccess', './', '', nil, 'htaccess', '.htaccess', nil, '')
 
     check_proc.call(Webgen::Path.new('/'),
-                    '/', '/', '/', nil, '', '/', 0, '/')
+                    '/', '/', '/', nil, '', '/', nil, '/')
     check_proc.call(Webgen::Path.new('/dir/'),
-                    '/dir/', '/', 'dir', nil, '', 'dir', 0, 'Dir')
+                    '/dir/', '/', 'dir', nil, '', 'dir', nil, 'Dir')
   end
 
   def test_mount_at

data/test/test_sourcehandler_feed.rb

@@ -0,0 +1,74 @@
+require 'test/unit'
+require 'helper'
+require 'webgen/sourcehandler/feed'
+require 'stringio'
+
+class TestSourceHandlerFeed < Test::Unit::TestCase
+
+  include Test::WebsiteHelper
+
+  FEED_CONTENT = <<EOF
+---
+site_url: http://example.com
+entries: *.html
+author: Thomas Leitner
+--- name:rss_template
+hallo
+EOF
+  def setup
+    super
+    @nodes = {
+      :root => root = Webgen::Node.new(Webgen::Tree.new.dummy_root, '/', '/', {'index_path' => 'index.html'}),
+      :file1_en => Webgen::Node.new(root, '/file1.en.html', 'file1.html', {'lang' => 'en', 'in_menu' => true, 'modified_at' => Time.now}),
+      :index_en => Webgen::Node.new(root, '/index.en.html', 'index.html', {'lang' => 'en', 'modified_at' => Time.now - 1, 'author' => 'test'}),
+    }
+    @nodes[:index_en].node_info[:page] = Webgen::Page.from_data("hallo")
+    @obj = Webgen::SourceHandler::Feed.new
+    @path = path_with_meta_info('/test.feed', {}, @obj.class.name) {StringIO.new(FEED_CONTENT)}
+  end
+
+  def test_create_node
+    atom_node, rss_node = @obj.create_node(@nodes[:root], @path)
+
+    assert_not_nil(atom_node)
+    assert_not_nil(rss_node)
+    assert_kind_of(Webgen::Page, atom_node.node_info[:feed])
+    assert_equal('atom', atom_node.node_info[:feed_type])
+    assert_equal('rss', rss_node.node_info[:feed_type])
+
+    assert_equal([nil, nil], @obj.create_node(@nodes[:root], @path))
+  end
+
+  def test_content
+    atom_node, rss_node = @obj.create_node(@nodes[:root], @path)
+    assert_equal('hallo', rss_node.content)
+    assert(atom_node.content =~ /Thomas Leitner/)
+  end
+
+  def test_feed_entries
+    atom_node, rss_node = @obj.create_node(@nodes[:root], @path)
+    assert_equal([@nodes[:index_en]], atom_node.feed_entries)
+    assert_equal([@nodes[:index_en]], rss_node.feed_entries)
+  end
+
+  def test_node_changed
+    atom_node, rss_node = @obj.create_node(@nodes[:root], @path)
+    assert(atom_node.changed?)
+
+    atom_node.content # populate cache
+    @website.cache.old_data.update(@website.cache.new_data)
+
+    atom_node.dirty = false
+    assert(atom_node.changed?)
+
+    atom_node.dirty = false
+    @nodes[:file1_en].dirty = false
+    @nodes[:index_en].dirty = false
+    assert(!atom_node.changed?)
+
+    atom_node.dirty = false
+    atom_node['entries'] = 'file.*.html'
+    assert(atom_node.changed?)
+  end
+
+end

data/test/test_sourcehandler_metainfo.rb

@@ -34,11 +34,18 @@ EOF
     assert_equal({'/**/*' => {'after' => 'valaft'}}, @node.node_info[:mi_alcn])
   end
 
+  def test_meta_info_changed
+    other = TestSH.new.create_node(@root, path_with_meta_info('/default.css'))
+    assert(@obj.send(:meta_info_changed?, @node, other))
+    @website.cache.old_data.update(@website.cache.new_data)
+    assert(!@obj.send(:meta_info_changed?, @node, other))
+  end
+
   def test_mark_all_matched_dirty
     other = TestSH.new.create_node(@root, path_with_meta_info('/default.css'))
-    other.dirty = false
+    other.dirty_meta_info = false
     @obj.send(:mark_all_matched_dirty, @node)
-    assert(other.dirty)
+    assert(other.dirty_meta_info)
   end
 
   def test_before_node_created
@@ -55,21 +62,28 @@ EOF
 
   def test_before_node_deleted
     other = TestSH.new.create_node(@root, path_with_meta_info('/default.css'))
-    other.dirty = false
+    other.dirty_meta_info = false
+
+    @website.blackboard.del_service(:source_paths)
+    @website.blackboard.add_service(:source_paths) { {'/metainfo' => ''} }
+    @website.blackboard.dispatch_msg(:before_node_deleted, @node)
+    assert(!other.dirty_meta_info)
+
+    @website.blackboard.del_service(:source_paths)
+    @website.blackboard.add_service(:source_paths) { {} }
     @website.blackboard.dispatch_msg(:before_node_deleted, @node)
-    assert(other.dirty)
+    assert(other.dirty_meta_info)
   end
 
-  def test_node_changed
-    @node.dirty = false
-    @website.blackboard.dispatch_msg(:node_changed?, @node)
-    assert(!@node.dirty)
+  def test_node_meta_info_changed
+    @node.dirty_meta_info = false
+    @website.blackboard.dispatch_msg(:node_meta_info_changed?, @node)
+    assert(!@node.dirty_meta_info)
 
-    @node.dirty = true
     other = TestSH.new.create_node(@root, path_with_meta_info('/default.css'))
-    other.dirty = false
-    @website.blackboard.dispatch_msg(:node_changed?, other)
-    assert(other.dirty)
+    other.dirty_meta_info = false
+    @website.blackboard.dispatch_msg(:node_meta_info_changed?, other)
+    assert(other.dirty_meta_info)
   end
 
   def test_content