webgen 1.0.0.beta3 → 1.0.0

data/test/webgen/path_handler/test_base.rb

@@ -4,7 +4,7 @@ require 'webgen/test_helper'
 require 'webgen/path_handler/base'
 require 'time'
 
-class TestPathHandlerBase < MiniTest::Unit::TestCase
+class TestPathHandlerBase < Minitest::Test
 
   include Webgen::TestHelper
 
@@ -18,7 +18,7 @@ class TestPathHandlerBase < MiniTest::Unit::TestCase
   end
 
   def setup
-    setup_website
+    setup_website('website.base_url' => 'http://example.com/sub')
     @obj = TestPathHandler.new(@website)
   end
 
@@ -31,6 +31,7 @@ class TestPathHandlerBase < MiniTest::Unit::TestCase
     node = @obj.create_node(path) {|n| count += 1; assert_kind_of(Webgen::PathHandler::Base::Node, n)}
     assert_equal(path, node.node_info[:path])
     assert_kind_of(Time, node.meta_info['modified_at'])
+    assert_equal('http://example.com/sub/path.html', node.url)
     assert_equal(1, count)
     assert_nil(node.content)
     def (@obj).content(node); node; end

data/test/webgen/path_handler/test_copy.rb

@@ -5,7 +5,7 @@ require 'webgen/path_handler/copy'
 require 'webgen/content_processor'
 require 'webgen/path'
 
-class TestPathHandlerCopy < MiniTest::Unit::TestCase
+class TestPathHandlerCopy < Minitest::Test
 
   include Webgen::TestHelper
 

data/test/webgen/path_handler/test_feed.rb

@@ -7,13 +7,12 @@ require 'webgen/node_finder'
 require 'webgen/path'
 require 'webgen/version'
 
-class TestPathHandlerFeed < MiniTest::Unit::TestCase
+class TestPathHandlerFeed < Minitest::Test
 
   include Webgen::TestHelper
 
   FEED_CONTENT = <<EOF
 ---
-site_url: http://example.com
 entries:
   :alcn: "*.html"
 author: Thomas Leitner
@@ -23,12 +22,12 @@ hallo
 EOF
 
   def setup
-    setup_website('website.lang' => 'en')
+    setup_website('website.lang' => 'en', 'website.base_url' => 'http://example.com')
     @website.ext.node_finder = Webgen::NodeFinder.new(@website)
 
     @feed = Webgen::PathHandler::Feed.new(@website)
 
-    root = Webgen::Node.new(@website.tree.dummy_root, '/', '/')
+    root = Webgen::PathHandler::Base::Node.new(@website.tree.dummy_root, '/', '/')
     @index_en = RenderNode.new("--- name:content\nMyContent\n--- name:abstract\nRealContent", root,
                                'index.html', '/index.en.html', {'lang' => 'en', 'modified_at' => Time.now - 1, 'author' => 'test'})
     @file_en = RenderNode.new("--- name:content\nCContent\n--- name:abstract\nAContent", root,

data/test/webgen/path_handler/test_meta_info.rb

@@ -4,7 +4,7 @@ require 'webgen/test_helper'
 require 'webgen/path_handler/meta_info'
 require 'webgen/path'
 
-class TestPathHandlerMetaInfo < MiniTest::Unit::TestCase
+class TestPathHandlerMetaInfo < Minitest::Test
 
   include Webgen::TestHelper
 

data/test/webgen/path_handler/test_page.rb

@@ -4,7 +4,7 @@ require 'webgen/test_helper'
 require 'webgen/path_handler/page'
 require 'webgen/path'
 
-class TestPathHandlerPage < MiniTest::Unit::TestCase
+class TestPathHandlerPage < Minitest::Test
 
   include Webgen::TestHelper
 

data/test/webgen/path_handler/test_page_utils.rb

@@ -5,7 +5,7 @@ require 'webgen/path_handler/page_utils'
 require 'webgen/content_processor'
 require 'webgen/path'
 
-class TestPageUtils < MiniTest::Unit::TestCase
+class TestPageUtils < Minitest::Test
 
   include Webgen::TestHelper
 

data/test/webgen/path_handler/test_sitemap.rb

@@ -6,13 +6,12 @@ require 'webgen/content_processor'
 require 'webgen/node_finder'
 require 'webgen/path'
 
-class TestPathHandlerSitemap < MiniTest::Unit::TestCase
+class TestPathHandlerSitemap < Minitest::Test
 
   include Webgen::TestHelper
 
   SITEMAP_CONTENT = <<EOF
 ---
-site_url: http://example.com
 default_change_freq: daily
 default_priority: 0.5
 entries:
@@ -21,7 +20,6 @@ EOF
 
   SITEMAP_CONTENT_TEMPLATE = <<EOF
 ---
-site_url: http://example.com
 default_change_freq: daily
 default_priority: 0.5
 entries:
@@ -31,12 +29,12 @@ Yeah <%= context.node['title'] %>
 EOF
 
   def setup
-    setup_website('website.lang' => 'en')
+    setup_website('website.lang' => 'en', 'website.base_url' => 'http://example.com')
     @website.ext.node_finder = Webgen::NodeFinder.new(@website)
 
     @sitemap = Webgen::PathHandler::Sitemap.new(@website)
 
-    setup_default_nodes(@website.tree)
+    setup_default_nodes(@website.tree, Webgen::PathHandler::Base::Node)
     @website.tree.node_access[:alcn].each_value {|n| n.meta_info['modified_at'] = Time.now}
     @website.tree['/file.en.html'].meta_info['priority'] = 0.9
     @website.tree['/file.en.html'].meta_info['change_freq'] = 'hourly'

data/test/webgen/path_handler/test_template.rb

@@ -5,7 +5,7 @@ require 'webgen/path_handler/template'
 require 'webgen/path'
 require 'webgen/cache'
 
-class TestPathHandlerTemplate < MiniTest::Unit::TestCase
+class TestPathHandlerTemplate < Minitest::Test
 
   include Webgen::TestHelper
 

data/test/webgen/path_handler/test_virtual.rb

@@ -4,7 +4,7 @@ require 'webgen/test_helper'
 require 'webgen/path_handler/virtual'
 require 'webgen/path'
 
-class TestPathHandlerVirtual < MiniTest::Unit::TestCase
+class TestPathHandlerVirtual < Minitest::Test
 
   include Webgen::TestHelper
 
@@ -78,8 +78,6 @@ EOF
     path = Webgen::Path.new('/virtual', 'dest_path' => '<parent><basename>(.<lang>)<ext>', 'modified_at' => @time)
     nodes = @virtual.create_nodes(path, Webgen::Page.from_data(CONTENT).blocks)
 
-    nodes.each {|n| assert_equal(path, n.node_info[:path])}
-
     node_de = @root.tree['/path.de.html']
     node_en = @root.tree['/directory/path.en.html']
     dir = @root.tree['/dir/']

data/test/webgen/source/test_file_system.rb

@@ -6,7 +6,7 @@ require 'fileutils'
 require 'rbconfig'
 require 'webgen/source/file_system'
 
-class TestSourceFileSystem < MiniTest::Unit::TestCase
+class TestSourceFileSystem < Minitest::Test
 
   def setup
     @root = root = File.expand_path(File.dirname(__FILE__))
@@ -24,7 +24,7 @@ class TestSourceFileSystem < MiniTest::Unit::TestCase
       assert_equal('c:/tmp/hallo', source.root)
     else
       source = Webgen::Source::FileSystem.new(@website, '/tmp/hallo')
-      assert_equal('**/*', source.glob)
+      assert_equal('{*,**/*}', source.glob)
       assert_equal('/tmp/hallo', source.root)
     end
     source = Webgen::Source::FileSystem.new(@website, '../hallo')
@@ -32,8 +32,13 @@ class TestSourceFileSystem < MiniTest::Unit::TestCase
   end
 
   def test_paths
-    source = Webgen::Source::FileSystem.new(@website, '.', '/../source/**/*')
-    assert(source.paths.length > 1)
+    source = Webgen::Source::FileSystem.new(@website, '.')
+    assert_equal(4, source.paths.length)
+    assert(source.paths.include?(Webgen::Path.new('/')))
+    assert(source.paths.include?(Webgen::Path.new('/test_file_system.rb')))
+
+    source = Webgen::Source::FileSystem.new(@website, '.', '/../source/{*,**/*}')
+    assert_equal(4, source.paths.length)
     assert(source.paths.include?(Webgen::Path.new('/source/')))
     assert(source.paths.include?(Webgen::Path.new('/source/test_file_system.rb')))
   end

data/test/webgen/source/test_stacked.rb

@@ -3,7 +3,7 @@
 require 'minitest/autorun'
 require 'webgen/source/stacked'
 
-class TestSourceStacked < MiniTest::Unit::TestCase
+class TestSourceStacked < Minitest::Test
 
   class TestSource
     def initialize(paths); @paths = paths; end

data/test/webgen/source/test_tar_archive.rb

@@ -3,9 +3,8 @@
 require 'minitest/autorun'
 require 'fileutils'
 require 'rbconfig'
-require 'webgen/source/tar_archive'
 
-class TestSourceTarArchive < MiniTest::Unit::TestCase
+class TestSourceTarArchive < Minitest::Test
 
   class FakeStream
 
@@ -30,6 +29,7 @@ class TestSourceTarArchive < MiniTest::Unit::TestCase
   end
 
   def setup
+    require 'webgen/source/tar_archive' rescue skip('Library archive-tar-minitar not installed')
     @stream = FakeStream.new
   end
 

data/test/webgen/tag/test_breadcrumb_trail.rb

@@ -4,7 +4,7 @@ require 'webgen/test_helper'
 require 'webgen/content_processor'
 require 'webgen/tag/breadcrumb_trail'
 
-class TestTagBreadcrumbTrail < MiniTest::Unit::TestCase
+class TestTagBreadcrumbTrail < Minitest::Test
 
   include Webgen::TestHelper
 

data/test/webgen/tag/test_coderay.rb

@@ -1,13 +1,14 @@
 # -*- encoding: utf-8 -*-
 
 require 'webgen/test_helper'
-require 'webgen/tag/coderay'
 
-class TestTagCoderay < MiniTest::Unit::TestCase
+class TestTagCoderay < Minitest::Test
 
   include Webgen::TestHelper
 
   def test_call
+    require 'webgen/tag/coderay' rescue skip("Library coderay not installed")
+
     setup_context
     @website.ext.content_processor = Object.new
     @website.ext.content_processor.define_singleton_method(:call) {|_, context| context}

data/test/webgen/tag/test_date.rb

@@ -4,7 +4,7 @@ require 'webgen/test_helper'
 require 'webgen/tag/date'
 require 'time'
 
-class TestTagDate < MiniTest::Unit::TestCase
+class TestTagDate < Minitest::Test
 
   include Webgen::TestHelper
 

data/test/webgen/tag/test_execute_command.rb

@@ -4,7 +4,7 @@ require 'webgen/test_helper'
 require 'webgen/tag/execute_command'
 require 'time'
 
-class TestTagExecuteCommand < MiniTest::Unit::TestCase
+class TestTagExecuteCommand < Minitest::Test
 
   include Webgen::TestHelper
 

data/test/webgen/tag/test_include_file.rb

@@ -5,7 +5,7 @@ require 'webgen/tag/include_file'
 require 'fileutils'
 require 'tempfile'
 
-class TestTagIncludeFile < MiniTest::Unit::TestCase
+class TestTagIncludeFile < Minitest::Test
 
   include Webgen::TestHelper
 

data/test/webgen/tag/test_langbar.rb

@@ -4,7 +4,7 @@ require 'webgen/test_helper'
 require 'webgen/content_processor'
 require 'webgen/tag/langbar'
 
-class TestTagLangbar < MiniTest::Unit::TestCase
+class TestTagLangbar < Minitest::Test
 
   include Webgen::TestHelper
 

data/test/webgen/tag/test_link.rb

@@ -3,7 +3,7 @@
 require 'webgen/test_helper'
 require 'webgen/tag/link'
 
-class TestTagLink < MiniTest::Unit::TestCase
+class TestTagLink < Minitest::Test
 
   include Webgen::TestHelper
 

data/test/webgen/tag/test_menu.rb

@@ -5,7 +5,7 @@ require 'webgen/content_processor'
 require 'webgen/tag/menu'
 require 'webgen/node_finder'
 
-class TestTagMenu < MiniTest::Unit::TestCase
+class TestTagMenu < Minitest::Test
 
   include Webgen::TestHelper
 
@@ -21,41 +21,23 @@ class TestTagMenu < MiniTest::Unit::TestCase
 
     context = Webgen::Context.new(@website, :chain => [@website.tree['/dir/subfile.html']])
 
-    assert_tag_result("<ul><li class=\"webgen-menu-level1 webgen-menu-submenu webgen-menu-submenu-inhierarchy\"><a href=\"../\"></a><ul><li class=\"webgen-menu-level2 webgen-menu-submenu webgen-menu-submenu-inhierarchy\"><a href=\"./\">dir</a><ul><li class=\"webgen-menu-level3 webgen-menu-item-selected\"><a href=\"subfile.html\">subfile</a></li></ul></li></ul></li></ul>",
-                      context, {:ancestors => true}, 'nested')
+    assert_tag_result("<ul class=\"other\"><li class=\"webgen-menu-level1 webgen-menu-submenu webgen-menu-submenu-inhierarchy\"><a href=\"../\"></a><ul><li class=\"webgen-menu-level2 webgen-menu-submenu webgen-menu-submenu-inhierarchy\"><a href=\"./\">dir</a><ul><li class=\"webgen-menu-level3 webgen-menu-item-selected\"><a href=\"subfile.html\">subfile</a></li></ul></li></ul></li></ul>",
+                      context, {:ancestors => true}, 'nested', 'other', 'webgen-menu-level', 'webgen-menu-submenu', 'webgen-menu-submenu-inhierarchy', 'webgen-menu-item-selected')
 
-    assert_tag_result("<ul><li class=\"webgen-menu-level1 webgen-menu-submenu webgen-menu-submenu-inhierarchy\"><a href=\"../\"></a></li></ul><ul><li class=\"webgen-menu-level2 webgen-menu-submenu webgen-menu-submenu-inhierarchy\"><a href=\"./\">dir</a></li></ul><ul><li class=\"webgen-menu-level3 webgen-menu-item-selected\"><a href=\"subfile.html\">subfile</a></li></ul>",
-                      context, {:ancestors => true}, 'flat')
+    assert_tag_result("<ul class=\"menu\"><li class=\"level1 sub sub-hier\"><a href=\"../\"></a></li></ul><ul><li class=\"level2 sub sub-hier\"><a href=\"./\">dir</a></li></ul><ul><li class=\"level3 active\"><a href=\"subfile.html\">subfile</a></li></ul>",
+                      context, {:ancestors => true}, 'flat', 'menu', 'level', 'sub', 'sub-hier', 'active')
   end
 
-  def assert_tag_result(result, context, options, style)
+  def assert_tag_result(result, context, options, style, css_class, level, smenu, smenuh, selected)
     context[:config] = {'tag.menu.style' => style,
       'tag.menu.options' => options,
-      'tag.menu.template' => '/tag.template'}
+      'tag.menu.template' => '/tag.template',
+      'tag.menu.css_class' => css_class,
+      'tag.menu.item_level_class' => level,
+      'tag.menu.item_submenu_class' => smenu,
+      'tag.menu.item_submenu_inhierarchy_class' => smenuh,
+      'tag.menu.item_selected_class' => selected}
     assert_equal(result, Webgen::Tag::Menu.call('menu', '', context))
   end
 
-  def test_static_menu_item_details
-    setup_website
-    setup_default_nodes(@website.tree)
-    obj = Webgen::Tag::Menu
-
-    assert_equal(["class=\"webgen-menu-level1 webgen-menu-submenu\"",
-                  "<a href=\"file.de.html\" hreflang=\"de\">file de</a>"],
-                 obj.menu_item_details(@website.tree['/file.en.html'], @website.tree['/file.de.html'],
-                                       'en', 1, true))
-    assert_equal(["class=\"webgen-menu-level2 webgen-menu-submenu webgen-menu-submenu-inhierarchy\"",
-                  "<a href=\"./\"></a>"],
-                 obj.menu_item_details(@website.tree['/file.en.html'], @website.tree['/'],
-                                       'en', 2, true))
-    assert_equal(["class=\"webgen-menu-level2 webgen-menu-submenu webgen-menu-item-selected\"",
-                  "<a href=\"file.en.html\" hreflang=\"en\">file en</a>"],
-                 obj.menu_item_details(@website.tree['/file.en.html'], @website.tree['/file.en.html'],
-                                       'en', 2, true))
-    assert_equal(["class=\"webgen-menu-level3\"",
-                  "<a href=\"file.de.html\" hreflang=\"de\">file de</a>"],
-                 obj.menu_item_details(@website.tree['/file.en.html'], @website.tree['/file.de.html'],
-                                       'de', 3, false))
-  end
-
 end

data/test/webgen/tag/test_meta_info.rb

@@ -4,7 +4,7 @@ require 'webgen/test_helper'
 require 'webgen/tag/meta_info'
 require 'time'
 
-class TestTagMetaInfo < MiniTest::Unit::TestCase
+class TestTagMetaInfo < Minitest::Test
 
   include Webgen::TestHelper
 

data/test/webgen/tag/test_relocatable.rb

@@ -3,7 +3,7 @@
 require 'webgen/test_helper'
 require 'webgen/tag/relocatable'
 
-class TestTagRelocatable < MiniTest::Unit::TestCase
+class TestTagRelocatable < Minitest::Test
 
   include Webgen::TestHelper
 

data/test/webgen/tag/test_tikz.rb

@@ -1,13 +1,14 @@
 # -*- encoding: utf-8 -*-
 
 require 'webgen/test_helper'
-require 'webgen/tag/tikz'
 
-class TestTagTikz < MiniTest::Unit::TestCase
+class TestTagTikz < Minitest::Test
 
   include Webgen::TestHelper
 
   def test_call
+    require 'webgen/tag/tikz' rescue skip($!.message)
+
     setup_context
     @website.ext.path_handler = MiniTest::Mock.new
 

data/test/webgen/task/test_create_website.rb

@@ -5,7 +5,7 @@ require 'webgen/task/create_website'
 require 'fileutils'
 require 'ostruct'
 
-class TestTaskCreateWebsite < MiniTest::Unit::TestCase
+class TestTaskCreateWebsite < Minitest::Test
 
   include Webgen::TestHelper
 
@@ -16,7 +16,7 @@ class TestTaskCreateWebsite < MiniTest::Unit::TestCase
   end
 
   def teardown
-    FileUtils.remove_entry_secure(@website.directory)
+    FileUtils.remove_entry_secure(@website.directory) if Dir.exist?(@website.directory)
   end
 
   def test_static_call

data/test/webgen/test_blackboard.rb

@@ -3,7 +3,7 @@
 require 'minitest/autorun'
 require 'webgen/blackboard'
 
-class TestBlackboard < MiniTest::Unit::TestCase
+class TestBlackboard < Minitest::Test
 
   def setup
     @blackboard = Webgen::Blackboard.new
@@ -11,9 +11,17 @@ class TestBlackboard < MiniTest::Unit::TestCase
 
   def test_add_listener
     assert_raises(ArgumentError) { @blackboard.add_listener(:test) }
-    @blackboard.add_listener([:test, :other]) { throw :called }
+    @blackboard.add_listener(:test) { throw :called }
     assert_throws(:called) { @blackboard.dispatch_msg(:test) }
-    assert_throws(:called) { @blackboard.dispatch_msg(:other) }
+
+    msgs = []
+    @blackboard.add_listener(:other, 'test') { msgs << 'test' }
+    @blackboard.add_listener(:other, nil, :before => 'test') { msgs << 'before' }
+    @blackboard.add_listener(:other, nil, :before => 'non-existing') { msgs << 'after 2' }
+    @blackboard.add_listener(:other, nil, :after => 'non-existing') { msgs << 'last' }
+    @blackboard.add_listener(:other, nil, :after => 'test') { msgs << 'after 1' }
+    @blackboard.dispatch_msg(:other)
+    assert_equal(['before', 'test', 'after 1', 'after 2', 'last'], msgs)
   end
 
   def test_remove_listener