webgen 1.0.0.beta3 → 1.0.0

data/test/webgen/test_bundle_loader.rb

@@ -4,7 +4,7 @@ require 'fileutils'
 require 'webgen/test_helper'
 require 'webgen/bundle_loader'
 
-class TestBundleLoader < MiniTest::Unit::TestCase
+class TestBundleLoader < Minitest::Test
 
   include Webgen::TestHelper
 
@@ -19,7 +19,18 @@ class TestBundleLoader < MiniTest::Unit::TestCase
     @ext_file = File.join(@extdir, 'my_ext', 'init.rb')
     FileUtils.touch(@ext_file)
     @ext_info_file = File.join(@extdir, 'my_ext', 'info.yaml')
-    FileUtils.touch(@ext_info_file)
+    File.write(@ext_info_file, <<EOF)
+author: authority
+summary: summaries
+
+extensions:
+  dummy:
+    summary: dummy
+
+options:
+  dummy:
+    summary: dummy
+EOF
 
     @loader = Webgen::BundleLoader.new(@website, @extdir)
   end
@@ -30,19 +41,25 @@ class TestBundleLoader < MiniTest::Unit::TestCase
 
   def test_load
     @loader.load('webgen')
+    assert_nil(@website.ext.bundle_infos.instance_variable_get(:@infos))
+    assert_equal({}, @website.ext.bundle_infos.bundles['webgen'])
+
     @loader.load('my_ext')
     @loader.load('my_ext')
     assert_equal([File.expand_path(@webgen_file), File.expand_path(@ext_file)], @loader.instance_variable_get(:@loaded))
-    assert_equal({'webgen' => nil, 'my_ext' => @ext_info_file}, @website.ext.bundles)
+    assert_equal({}, @website.ext.bundle_infos.bundles['webgen'])
+    assert_equal({'author' => 'authority', 'summary' => 'summaries'},
+                 @website.ext.bundle_infos.bundles['my_ext'])
+    assert_equal({'author' => 'authority', 'bundle' => 'my_ext', 'summary' => 'dummy'},
+                 @website.ext.bundle_infos.extensions['dummy'])
+    assert_equal({'author' => 'authority', 'bundle' => 'my_ext', 'summary' => 'dummy'},
+                 @website.ext.bundle_infos.options['dummy'])
   end
 
   def test_dsl
-    File.open(File.join(@extdir, 'init.rb'), 'w+') do |f|
-      f.puts("load('my_ext'); require_relative('webgen/init.rb')")
-    end
-    File.open(@ext_file, 'w+') do |f|
-      f.puts("mount_passive('data', '/test', '*.hallo')")
-    end
+    File.write(File.join(@extdir, 'init.rb'), "load('my_ext'); require_relative('webgen/init.rb')")
+    File.write(@ext_file, "mount_passive('data', '/test', '*.hallo')")
+
     @website.ext.source = OpenStruct.new
     @website.ext.source.passive_sources = [['/', :file, 'other']]
 

data/test/webgen/test_cache.rb

@@ -3,7 +3,7 @@
 require 'minitest/autorun'
 require 'webgen/cache'
 
-class TestCache < MiniTest::Unit::TestCase
+class TestCache < Minitest::Test
 
   def setup
     @cache = Webgen::Cache.new

data/test/webgen/test_cli.rb

@@ -3,7 +3,7 @@
 require 'minitest/autorun'
 require 'webgen/cli'
 
-class TestCLICommandParser < MiniTest::Unit::TestCase
+class TestCLICommandParser < Minitest::Test
 
   class SampleCommand < CmdParse::Command
     def initialize
@@ -35,7 +35,7 @@ class TestCLICommandParser < MiniTest::Unit::TestCase
       end
     end
     assert_match(/Global options:/, out)
-    assert_match(/bundle.*create.*install.*list.*generate.*help.*sample.*.*show.*config.*deps.*extensions.*version/m, out)
+    assert_match(/create.*generate.*help.*install.*sample.*.*show.*config.*deps.*extensions.*version/m, out)
   end
 
 end

data/test/webgen/test_configuration.rb

@@ -6,7 +6,7 @@ require 'stringio'
 require 'minitest/autorun'
 require 'webgen/configuration'
 
-class TestConfiguration < MiniTest::Unit::TestCase
+class TestConfiguration < Minitest::Test
 
   def setup
     @config = Webgen::Configuration.new
@@ -14,13 +14,12 @@ class TestConfiguration < MiniTest::Unit::TestCase
   end
 
   def add_default_option
-    @config.define_option('namespace.option', 'default', 'desc') {|v| raise "Error with option" unless v.kind_of?(String); v}
+    @config.define_option('namespace.option', 'default') {|v| raise "Error with option" unless v.kind_of?(String); v}
   end
 
   def test_defining_options
     assert(@config.options['namespace.option'])
     assert_equal('default', @config.options['namespace.option'].default)
-    assert_equal('desc', @config.options['namespace.option'].description)
     assert_kind_of(Proc, @config.options['namespace.option'].validator)
 
     assert_raises(ArgumentError) { add_default_option }
@@ -35,7 +34,7 @@ class TestConfiguration < MiniTest::Unit::TestCase
     assert_equal('default', @config['namespace.option'])
     assert_raises(Webgen::Configuration::Error) { @config['unknown'] }
 
-    @config.define_option('other', :sym, 'desc')
+    @config.define_option('other', :sym)
     assert_equal(:sym, @config['other'])
   end
 
@@ -66,7 +65,7 @@ class TestConfiguration < MiniTest::Unit::TestCase
     @config.freeze
     assert_equal('default', @config['namespace.option'])
     assert_raises(Webgen::Configuration::Error) { @config['namespace.option'] = 'other' }
-    assert_raises(RuntimeError) { @config.define_option('nonsense', 'val', 'desc') }
+    assert_raises(RuntimeError) { @config.define_option('nonsense', 'val') }
   end
 
   def test_load_from_file_exceptions
@@ -97,12 +96,12 @@ class TestConfiguration < MiniTest::Unit::TestCase
     cloned = @config.clone
     assert(@config.frozen?)
     assert_raises(Webgen::Configuration::Error) { cloned['namespace.option'] = 'other' }
-    assert_raises(RuntimeError) { cloned.define_option('nonsense', 'val', 'desc') }
+    assert_raises(RuntimeError) { cloned.define_option('nonsense', 'val') }
 
     dupped = @config.dup
     refute(dupped.frozen?)
 
-    dupped.define_option('test', '', '')
+    dupped.define_option('test', '')
     assert(dupped.option?('test'))
     refute(@config.option?('test'))
 
@@ -113,7 +112,7 @@ class TestConfiguration < MiniTest::Unit::TestCase
 
   def test_equality
     other = Webgen::Configuration.new
-    other.define_option('namespace.option', 'default', 'desc') {|v| raise "Error with option" unless v.kind_of?(String); v}
+    other.define_option('namespace.option', 'default') {|v| raise "Error with option" unless v.kind_of?(String); v}
     assert_equal(@config, other)
 
     other['namespace.option'] = 'val'
@@ -124,7 +123,7 @@ class TestConfiguration < MiniTest::Unit::TestCase
     refute_equal(@config, other)
 
     other = Webgen::Configuration.new
-    other.define_option('namespace.option', 'default1', 'desc')
+    other.define_option('namespace.option', 'default1')
     refute_equal(@config, other)
   end
 

data/test/webgen/test_content_processor.rb

@@ -13,7 +13,7 @@ class Webgen::ContentProcessor::MyProcessor
 
 end
 
-class TestContentProcessor < MiniTest::Unit::TestCase
+class TestContentProcessor < Minitest::Test
 
   def setup
     @cp = Webgen::ContentProcessor.new

data/test/webgen/test_context.rb

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

data/test/webgen/test_core_ext.rb

@@ -3,7 +3,7 @@
 require 'minitest/autorun'
 require 'webgen/core_ext'
 
-class TestCoreExtensions < MiniTest::Unit::TestCase
+class TestCoreExtensions < Minitest::Test
 
   def test_webgen_require
     assert_raises(Webgen::LoadError) { webgen_require('unknown_library_here') }

data/test/webgen/test_destination.rb

@@ -9,7 +9,7 @@ class Webgen::Destination::MyDestination
 
 end
 
-class TestDestination < MiniTest::Unit::TestCase
+class TestDestination < Minitest::Test
 
   def setup
     @website = MiniTest::Mock.new

data/test/webgen/test_error.rb

@@ -3,7 +3,7 @@
 require 'minitest/autorun'
 require 'webgen/error'
 
-class TestError < MiniTest::Unit::TestCase
+class TestError < Minitest::Test
 
   def test_all
     e = Webgen::Error.new("test")
@@ -54,7 +54,7 @@ class TestError < MiniTest::Unit::TestCase
 
 end
 
-class TestNodeCreationError < MiniTest::Unit::TestCase
+class TestNodeCreationError < Minitest::Test
 
   def test_all
     e = Webgen::NodeCreationError.new("test")
@@ -65,7 +65,7 @@ class TestNodeCreationError < MiniTest::Unit::TestCase
 
 end
 
-class TestRenderError < MiniTest::Unit::TestCase
+class TestRenderError < Minitest::Test
 
   def test_all
     e = Webgen::RenderError.new("test", 'location', '/path', '/error')
@@ -89,7 +89,7 @@ class TestRenderError < MiniTest::Unit::TestCase
 
 end
 
-class TestLoadError < MiniTest::Unit::TestCase
+class TestLoadError < Minitest::Test
 
   def test_all
     e = Webgen::LoadError.new(Exception.new("something"), 'location', '/path')
@@ -110,7 +110,7 @@ class TestLoadError < MiniTest::Unit::TestCase
 
 end
 
-class TestCommandNotFoundError < MiniTest::Unit::TestCase
+class TestCommandNotFoundError < Minitest::Test
 
   def test_all
     e = Webgen::CommandNotFoundError.new("test", 'location', '/path')

data/test/webgen/test_extension_manager.rb

@@ -13,7 +13,7 @@ class DummyExtensionManager
 
 end
 
-class TestExtensionManager < MiniTest::Unit::TestCase
+class TestExtensionManager < Minitest::Test
 
   def setup
     @dummy = DummyExtensionManager.new

data/test/webgen/test_item_tracker.rb

@@ -17,7 +17,11 @@ class Webgen::ItemTracker::Sample
   end
 
   def item_data(data) #:nodoc:
-    'alcn' + TestItemTracker::Data[data].to_s
+    if TestItemTracker::Data.has_key?(data)
+      'alcn' + TestItemTracker::Data[data].to_s
+    else
+      raise "Unkown key"
+    end
   end
 
   def item_changed?(iid, old_data) #:nodoc:
@@ -30,9 +34,9 @@ class Webgen::ItemTracker::Sample
 
 end
 
-class TestItemTracker < MiniTest::Unit::TestCase
+class TestItemTracker < Minitest::Test
 
-  DummyNode = Struct.new(:alcn)
+  DummyNode = Struct.new(:alcn, :node_info)
 
   Data = {'/alcn' => 'mydata'}
 
@@ -42,8 +46,8 @@ class TestItemTracker < MiniTest::Unit::TestCase
     website.blackboard = blackboard = Webgen::Blackboard.new
     website.cache = cache = Webgen::Cache.new
 
-    node = DummyNode.new('/alcn')
-    other = DummyNode.new('/other')
+    node = DummyNode.new('/alcn', {})
+    other = DummyNode.new('/other', {})
     website.tree = {'/alcn' => node, '/other' => other}
 
     tracker = Webgen::ItemTracker.new(website)
@@ -72,6 +76,23 @@ class TestItemTracker < MiniTest::Unit::TestCase
     blackboard.dispatch_msg(:before_all_nodes_written)
     refute(tracker.node_changed?(node))
 
+    # Node should be changed because item id got invalid
+    blackboard.dispatch_msg(:after_node_written, node)
+    blackboard.dispatch_msg(:after_all_nodes_written)
+    Data.delete('/alcn')
+    blackboard.dispatch_msg(:before_all_nodes_written)
+    assert(tracker.node_changed?(node))
+
+    # Node should not be changed anymore, again
+    blackboard.dispatch_msg(:after_node_written, node)
+    blackboard.dispatch_msg(:after_all_nodes_written)
+    blackboard.dispatch_msg(:before_all_nodes_written)
+    refute(tracker.node_changed?(node))
+
+    # Re-add needed item and data
+    Data['/alcn'] = 'other'
+    tracker.add(node, :sample, '/alcn')
+
     # Test the initial loading of the cache data
     cache[:item_tracker_data] = {
       :node_dependencies => {'/alcn' => [[:sample, '/alcn']], 'alcn' => ['data']},

data/test/webgen/test_languages.rb

@@ -3,7 +3,7 @@
 require 'minitest/autorun'
 require 'webgen/languages'
 
-class TestLanguages < MiniTest::Unit::TestCase
+class TestLanguages < Minitest::Test
 
   def test_get_language
     assert_nil(Webgen::LanguageManager.language_for_code(nil))

data/test/webgen/test_logger.rb

@@ -4,7 +4,7 @@ require 'minitest/autorun'
 require 'stringio'
 require 'webgen/logger'
 
-class TestLogger < MiniTest::Unit::TestCase
+class TestLogger < Minitest::Test
 
   def test_logging
     @logio = StringIO.new

data/test/webgen/test_node.rb

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

data/test/webgen/test_node_finder.rb

@@ -3,7 +3,7 @@
 require 'webgen/test_helper'
 require 'webgen/node_finder'
 
-class TestNodeFinder < MiniTest::Unit::TestCase
+class TestNodeFinder < Minitest::Test
 
   include Webgen::TestHelper
 
@@ -93,7 +93,7 @@ class TestNodeFinder < MiniTest::Unit::TestCase
     # test filter: alcn
     check.call(%w[/],
                @nf.find({:alcn => '/'}, tree['/']))
-    check.call(%w[/ /dir/subfile.html /dir/subfile.html#frag /dir/dir/],
+    check.call(%w[/ /dir/subfile.html /dir/dir/],
                @nf.find({:alcn => ['/', '*'], :flatten => true}, tree['/dir/']))
 
     # test filter: and/or/not

data/test/webgen/test_page.rb

@@ -3,7 +3,7 @@
 require 'minitest/autorun'
 require 'webgen/page'
 
-class TestPage < MiniTest::Unit::TestCase
+class TestPage < Minitest::Test
 
   VALID = <<EOF
 # with more blocks
@@ -90,9 +90,9 @@ class TestPage < MiniTest::Unit::TestCase
     content2
     --- block3
     content3
-    --- block4 -
+    --- block4  -
     content4
-    --- block5 -----------------------------------
+    ---   block5 -----------------------------------  
     content5
   meta_info: {}
   blocks:
@@ -109,11 +109,11 @@ class TestPage < MiniTest::Unit::TestCase
 
 # named block and block with other options
 - in: |
-    --- name:block -------------------------------
+    --- name:block  -------------------------------
     content doing -
     with?: with some things
 
-    --- other:options test1:true test2:false test3:542 pipeline: ----------------
+    ---   other:options test1:true test2:false 	test3:542 pipeline: ----------------  
   meta_info:
     blocks: {block2: {other: options, test1: true, test2: false, test3: 542, pipeline: ~}}
   blocks:

data/test/webgen/test_path.rb

@@ -5,7 +5,7 @@ require 'webgen/path'
 require 'stringio'
 require 'tmpdir'
 
-class TestPath < MiniTest::Unit::TestCase
+class TestPath < Minitest::Test
 
   def test_class_url
     assert_equal("webgen://webgen.localhost/hallo", Webgen::Path.url("hallo").to_s)
@@ -37,7 +37,7 @@ class TestPath < MiniTest::Unit::TestCase
     assert(Webgen::Path.matches_pattern?(path, '**/*'))
     assert(Webgen::Path.matches_pattern?(path, '**/file.de.PAGE'))
     assert(Webgen::Path.matches_pattern?(path, '/dir/*/file.*.page'))
-    assert(!Webgen::Path.matches_pattern?(path, '**/*.test'))
+    refute(Webgen::Path.matches_pattern?(path, '**/*.test'))
 
     path = '/dir/'
     assert(Webgen::Path.matches_pattern?(path, '/dir/'))
@@ -57,6 +57,12 @@ class TestPath < MiniTest::Unit::TestCase
 
     path = ''
     assert(!Webgen::Path.matches_pattern?(path, '/'))
+
+    path = '/dir/to/file.de.page#somefile.page'
+    refute(Webgen::Path.matches_pattern?(path, '**/*'))
+    refute(Webgen::Path.matches_pattern?(path, '/dir/*/file.*.page'))
+    assert(Webgen::Path.matches_pattern?(path, '**/*#*'))
+    assert(Webgen::Path.matches_pattern?(path, '**/*#*.page'))
   end
 
   def test_initialize_and_accessors
@@ -93,16 +99,12 @@ class TestPath < MiniTest::Unit::TestCase
                     '/', 'default', nil, 'tar.bz2', 'default.tar.bz2', 'default.tar.bz2', '/default.tar.bz2', '/default.tar.bz2', nil, 'Default')
     check_proc.call(Webgen::Path.new('/default.en.tar.bz2'),
                     '/', 'default', 'en', 'tar.bz2', 'default.tar.bz2', 'default.en.tar.bz2', '/default.tar.bz2', '/default.en.tar.bz2', nil, 'Default')
-    check_proc.call(Webgen::Path.new('/default.deu.'),
-                    '/',  'default', 'de', '', 'default', 'default.de', '/default', '/default.de', nil, 'Default')
     check_proc.call(Webgen::Path.new('/default'),
                     '/', 'default', nil, '', 'default', 'default', '/default', '/default', nil, 'Default')
     check_proc.call(Webgen::Path.new('/.htaccess'),
                     '/', '.htaccess', nil, '', '.htaccess', '.htaccess', '/.htaccess', '/.htaccess', nil, '.htaccess')
     check_proc.call(Webgen::Path.new('/.htaccess.page'),
                     '/', '.htaccess', nil, 'page', '.htaccess.page', '.htaccess.page', '/.htaccess.page', '/.htaccess.page', nil, '.htaccess')
-    check_proc.call(Webgen::Path.new('/.htaccess.en.'),
-                    '/', '.htaccess', 'en', '', '.htaccess', '.htaccess.en', '/.htaccess', '/.htaccess.en', nil, '.htaccess')
     check_proc.call(Webgen::Path.new('/.htaccess.en.page'),
                     '/', '.htaccess', 'en', 'page', '.htaccess.page', '.htaccess.en.page', '/.htaccess.page', '/.htaccess.en.page', nil, '.htaccess')
     check_proc.call(Webgen::Path.new('/5.png'),
@@ -221,8 +223,6 @@ class TestPath < MiniTest::Unit::TestCase
       path = Webgen::Path.new('/test') {|mode| File.open(File.join(dir, 'src'), mode) }
       assert_equal(1, path.data('r:UTF-8').length)
       assert_equal(2, path.data('rb').length)
-      assert_equal(1, path.data.length)
-      assert_equal(1, path.io {|f| f.read}.length)
     end
 
     path = Webgen::Path.new('/test.page')