gettalong-webgen 0.5.7.20090227 → 0.5.8.20090507

data/test/test_sourcehandler_memory.rb

@@ -19,17 +19,17 @@ class TestSourceHandlerMemory < Test::Unit::TestCase
     node = obj.create_node(root, path_with_meta_info('/test.png'), '/', 'data')
     assert_equal('/', node.node_info[:memory_source_alcn])
     assert_equal('data', obj.content(node))
-    assert(!node.flagged(:reinit))
+    assert(!node.flagged?(:reinit))
     root.tree.delete_node(node)
 
     node = obj.create_node(root, path_with_meta_info('/test.png'), '/') {|n| assert_equal(node, n); 'data'}
     assert_equal('/', node.node_info[:memory_source_alcn])
     assert_equal('data', obj.content(node))
-    assert(!node.flagged(:reinit))
+    assert(!node.flagged?(:reinit))
 
-    assert(!root.flagged(:dirty))
+    assert(!root.flagged?(:dirty))
     node.flag(:reinit)
-    assert(root.flagged(:dirty))
+    assert(root.flagged?(:dirty))
     root.unflag(:dirty)
     root.tree.delete_node(node)
 
@@ -37,8 +37,8 @@ class TestSourceHandlerMemory < Test::Unit::TestCase
     assert_equal('/', node.node_info[:memory_source_alcn])
     obj.instance_eval { @data = nil }
     assert_nil(obj.content(node))
-    assert(node.flagged(:reinit))
-    assert(root.flagged(:dirty))
+    assert(node.flagged?(:reinit))
+    assert(root.flagged?(:dirty))
   end
 
 end

data/test/test_sourcehandler_metainfo.rb

@@ -12,29 +12,40 @@ class TestSourceHandlerMetainfo < Test::Unit::TestCase
   class TestSH; include Webgen::SourceHandler::Base; end
 
   CONTENT=<<EOF
-**/*:
+/default.*:
   title: new title
   before: valbef
 ---
-**/*/:
+/default.css:
   after: valaft
+
+/other.page:
+  title: Not Other
 EOF
 
   def setup
     super
     @website.blackboard.add_service(:source_paths) do
-      {'/default.css' => path_with_meta_info('/default.css') {StringIO.new('# header')}}
+      {'/default.css' => path_with_meta_info('/default.css') {StringIO.new('# header')},
+        '/other.page' => path_with_meta_info('/other.page') {StringIO.new('other page')},
+      }
     end
 
     @obj = Webgen::SourceHandler::Metainfo.new
-    @root = Webgen::Node.new(Webgen::Tree.new.dummy_root, 'test/', '/')
+    @root = Webgen::Node.new(Webgen::Tree.new.dummy_root, '/', '/')
     @node = @obj.create_node(@root, path_with_meta_info('/metainfo', {}, @obj.class.name) {StringIO.new(CONTENT)})
   end
 
   def test_create_node
-    assert(@node.flagged(:dirty_meta_info))
-    assert_equal({'/**/*' => {'title' => 'new title', 'before' => 'valbef'}}, @node.node_info[:mi_paths])
-    assert_equal({'/**/*' => {'after' => 'valaft'}}, @node.node_info[:mi_alcn])
+    assert_equal({'/default.*' => {'title' => 'new title', 'before' => 'valbef'}}, @node.node_info[:mi_paths])
+    assert_equal({'/default.css' => {'after' => 'valaft'},
+                 '/other.page' => {'title' => 'Not Other'}}, @node.node_info[:mi_alcn])
+  end
+
+  def test_empty_metainfo_file
+    node = @obj.create_node(@root, path_with_meta_info('/test', {}, @obj.class.name) {StringIO.new('')})
+    assert_equal({}, node.node_info[:mi_paths])
+    assert_equal({}, node.node_info[:mi_alcn])
   end
 
   def test_meta_info_changed
@@ -49,15 +60,15 @@ EOF
 
     other.unflag(:dirty_meta_info)
     @obj.send(:mark_all_matched_dirty, @node)
-    assert(!other.flagged(:dirty_meta_info))
+    assert(!other.flagged?(:dirty_meta_info))
 
     other.unflag(:dirty_meta_info)
     @obj.send(:mark_all_matched_dirty, @node, :force)
-    assert(other.flagged(:dirty_meta_info))
+    assert(other.flagged?(:dirty_meta_info))
 
     other.unflag(:dirty_meta_info)
     @obj.send(:mark_all_matched_dirty, @node, :no_old_data)
-    assert(!other.flagged(:dirty_meta_info))
+    assert(!other.flagged?(:dirty_meta_info))
   end
 
   def test_before_node_created
@@ -75,23 +86,33 @@ EOF
   def test_before_node_deleted
     other = TestSH.new.create_node(@root, path_with_meta_info('/default.css'))
     @website.blackboard.dispatch_msg(:before_node_deleted, @node)
-    assert(other.flagged(:dirty_meta_info))
+    assert(other.flagged?(:dirty_meta_info))
     assert(@obj.nodes.empty?)
   end
 
   def test_node_meta_info_changed
     @node.unflag(:dirty_meta_info)
     @website.blackboard.dispatch_msg(:node_meta_info_changed?, @node)
-    assert(!@node.flagged(:dirty_meta_info))
+    assert(!@node.flagged?(:dirty_meta_info))
 
     @node.node_info[:mi_alcn] = @node.node_info[:mi_alcn].dup
     @node.node_info[:mi_alcn]['/*metainfo'] = {'other' => 'doit'}
     @website.blackboard.dispatch_msg(:node_meta_info_changed?, @node)
-    assert(@node.flagged(:dirty_meta_info))
+    assert(@node.flagged?(:dirty_meta_info))
   end
 
   def test_content
     assert_nil(@obj.content(nil))
   end
 
+  def test_deletion_of_metainfo
+    other = TestSH.new.create_node(@root, path_with_meta_info('/other.page'))
+    @website.blackboard.dispatch_msg(:after_node_created, other)
+    assert_equal('Not Other', other['title'])
+
+    @node.flag(:reinit)
+    @node = @obj.create_node(@root, path_with_meta_info('/metainfo', {}, @obj.class.name) {StringIO.new("")})
+    assert(other.flagged?(:dirty_meta_info))
+  end
+
 end

data/test/test_sourcehandler_page.rb

@@ -60,6 +60,14 @@ class TestSourceHandlerPage < Test::Unit::TestCase
     @path.instance_eval { @io = Webgen::Path::SourceIO.new {StringIO.new("---\ntitle: test\n---\ncontent")} }
     @website.blackboard.dispatch_msg(:node_meta_info_changed?, node)
     assert(node.meta_info_changed?)
+
+    # Remove path from which node is created, meta info should naturally change
+    @root.tree.delete_node(node)
+    node = @obj.create_node(@root, @path)
+    @website.blackboard.del_service(:source_paths)
+    @website.blackboard.add_service(:source_paths) { {} }
+    @website.blackboard.dispatch_msg(:node_meta_info_changed?, node)
+    assert(node.meta_info_changed?)
   end
 
 end

data/test/test_sourcehandler_virtual.rb

@@ -27,32 +27,71 @@ class TestSourceHandlerVirtual < Test::Unit::TestCase
     title: Absolute
 EOF
 
-  def test_create_node
-    obj = Webgen::SourceHandler::Virtual.new
-    root = Webgen::Node.new(Webgen::Tree.new.dummy_root, '/', '/')
+  def setup
+    super
+    @obj = Webgen::SourceHandler::Virtual.new
+    @root = Webgen::Node.new(Webgen::Tree.new.dummy_root, '/', '/')
     shm = Webgen::SourceHandler::Main.new # for using service :create_nodes
-    time = Time.now
-    nodes = obj.create_node(root, path_with_meta_info('/virtuals', {'modified_at' => time}, obj.class.name) {StringIO.new(CONTENT)})
+    @time = Time.now
+    @path = path_with_meta_info('/virtuals', {'modified_at' => @time}, @obj.class.name) {StringIO.new(CONTENT)}
+    @nodes = @obj.create_node(@root, @path)
+    @website.blackboard.del_service(:source_paths)
+    @website.blackboard.add_service(:source_paths) {{@path.path => @path}}
+  end
 
-    nodes.each {|n| assert_equal('/virtuals', n.node_info[:src])}
+  def test_create_node
+    @nodes.each {|n| assert_equal('/virtuals', n.node_info[:src])}
 
-    path_de = root.tree['/path.de.html']
-    path_en = root.tree['/directory/path.en.html']
-    dir = root.tree['/dir']
+    path_de = @root.tree['/path.de.html']
+    path_en = @root.tree['/directory/path.en.html']
+    dir = @root.tree['/dir']
     assert_not_nil(path_de)
     assert_not_nil(dir)
     assert_not_nil(path_en)
 
     assert_equal('new title', path_en['title'])
-    assert_equal(time, path_en['modified_at'])
+    assert_equal(@time, path_en['modified_at'])
     assert(path_en['no_output'])
     assert_equal('My Dir', dir['title'])
     assert_equal('directory/other.html', path_de.route_to(path_en))
     assert_equal('../path.de.html', dir.route_to(path_de))
     assert_equal('../directory/other.html', dir.route_to(path_en))
 
-    assert_equal('http://www.example.com', root.tree['/api.html'].path)
-    assert_equal('http://www.example.com', root.tree['/path.de.html'].route_to(root.tree['/api.html']))
+    assert_equal('http://www.example.com', @root.tree['/api.html'].path)
+    assert_equal('http://www.example.com', @root.tree['/path.de.html'].route_to(@root.tree['/api.html']))
+  end
+
+  def test_meta_info_changed
+    # Nothing done, nothing should have changed
+    path_de = @root.tree['/path.de.html']
+    @obj.send(:node_meta_info_changed?, path_de)
+    assert(!path_de.flagged?(:dirty_meta_info))
+
+    # Change data, meta info should have changed
+    @path.instance_eval { @io = Webgen::Path::SourceIO.new {StringIO.new("path.de.html:\n  title: hallo")} }
+    @obj.send(:node_meta_info_changed?, path_de)
+    assert(path_de.flagged?(:dirty_meta_info))
+
+    # Reinit node, meta info of path_de should not change, #create_node should only return one node
+    path_de.flag(:reinit)
+    assert(1, @obj.create_node(@root, @path).length)
+    @obj.send(:node_meta_info_changed?, path_de)
+    assert(!path_de.flagged?(:dirty_meta_info))
+
+    # Remove data, meta info should have changed
+    @path.instance_eval { @io = Webgen::Path::SourceIO.new {StringIO.new("patha.de.html:\n  title: hallo")} }
+    @obj.send(:node_meta_info_changed?, path_de)
+    assert(path_de.flagged?(:dirty_meta_info))
+
+    # Remove path from which virtual node is created, meta info should naturally change
+    @root.tree.delete_node(path_de)
+    @path.instance_eval { @io = Webgen::Path::SourceIO.new {StringIO.new("path.de.html:\n  title: hallo")} }
+    @obj.create_node(@root, @path)
+    path_de = @root.tree['/path.de.html']
+    @website.blackboard.del_service(:source_paths)
+    @website.blackboard.add_service(:source_paths) { {} }
+    @obj.send(:node_meta_info_changed?, path_de)
+    assert(path_de.meta_info_changed?)
   end
 
 end

data/test/test_tag_breadcrumbtrail.rb

@@ -40,7 +40,7 @@ class TestTagBreadcrumbTrail < Test::Unit::TestCase
 
   def test_call
     nodes = create_default_nodes
-    context = Webgen::ContentProcessor::Context.new(:chain => [nodes[:file11_en]])
+    context = Webgen::Context.new(:chain => [nodes[:file11_en]])
 
     assert_equal('<a href="../../index.html"></a> / <a href="../">Dir1</a> / <a href="index.html">Dir11</a> / <span>File111</span>',
                  call(context, ' / ', false, 0, -1))
@@ -76,16 +76,16 @@ class TestTagBreadcrumbTrail < Test::Unit::TestCase
 
   def test_node_changed
     nodes = create_default_nodes
-    context = Webgen::ContentProcessor::Context.new(:chain => [nodes[:file11_en]])
+    context = Webgen::Context.new(:chain => [nodes[:file11_en]])
     call(context, ' / ', false, 0, -1)
 
     nodes[:file11_en].unflag(:dirty)
     @website.blackboard.dispatch_msg(:node_changed?, nodes[:file11_en])
-    assert(!nodes[:file11_en].flagged(:dirty))
+    assert(!nodes[:file11_en].flagged?(:dirty))
 
     nodes[:index11_en].flag(:dirty_meta_info)
     @website.blackboard.dispatch_msg(:node_changed?, nodes[:file11_en])
-    assert(nodes[:file11_en].flagged(:dirty))
+    assert(nodes[:file11_en].flagged?(:dirty))
   end
 
 end

data/test/test_tag_coderay.rb

@@ -23,7 +23,7 @@ class TestTagCoderay < Test::Unit::TestCase
 
   def test_call
     root = Webgen::Node.new(Webgen::Tree.new.dummy_root, '/', '/', {'title' => 'Hallo'})
-    context = Webgen::ContentProcessor::Context.new(:chain => [root])
+    context = Webgen::Context.new(:chain => [root])
 
     assert(call(context, 'TestData', 'html', false).include?('TestData'))
     assert(call(context, '{title:}', :ruby, true).include?('Hallo'))

data/test/test_tag_date.rb

@@ -12,7 +12,7 @@ class TestTagDate < Test::Unit::TestCase
 
   def test_call
     @obj = Webgen::Tag::Date.new
-    assert_not_nil(Time.parse(@obj.call('date', '', Webgen::ContentProcessor::Context.new)))
+    assert_not_nil(Time.parse(@obj.call('date', '', Webgen::Context.new)))
   end
 
 end

data/test/test_tag_executecommand.rb

@@ -24,7 +24,7 @@ class TestTagExecuteCommand < Test::Unit::TestCase
 
   def test_call
     root = Webgen::Node.new(Webgen::Tree.new.dummy_root, '/', '/')
-    context = Webgen::ContentProcessor::Context.new(:chain => [root])
+    context = Webgen::Context.new(:chain => [root])
 
     test_text = "a\"b\""
     assert_equal([test_text, false], call(context, echo_cmd(test_text), false, false))

data/test/test_tag_includefile.rb

@@ -26,7 +26,7 @@ class TestTagIncludeFile < Test::Unit::TestCase
 
   def test_call
     root = Webgen::Node.new(Webgen::Tree.new.dummy_root, '/', '/')
-    context = Webgen::ContentProcessor::Context.new(:chain => [root])
+    context = Webgen::Context.new(:chain => [root])
 
     content = "<a>This is 'a' Test</a>"
     file = Tempfile.new('webgen-test-file')
@@ -40,11 +40,11 @@ class TestTagIncludeFile < Test::Unit::TestCase
 
     root.unflag(:dirty)
     @website.blackboard.dispatch_msg(:node_changed?, root)
-    assert(!root.flagged(:dirty))
+    assert(!root.flagged?(:dirty))
 
     File.utime(Time.now + 1, Time.now + 1, file.path)
     @website.blackboard.dispatch_msg(:node_changed?, root)
-    assert(root.flagged(:dirty))
+    assert(root.flagged?(:dirty))
   end
 
 end

data/test/test_tag_langbar.rb

@@ -34,28 +34,28 @@ class TestTagLangbar < Test::Unit::TestCase
 
     @obj.set_params('tag.langbar.show_single_lang' => true, 'tag.langbar.show_own_lang' => true, 'tag.langbar.separator' => ' --- ')
     assert_equal(["#{de_link} --- #{en_link}", false],
-                 @obj.call('langbar', '', Webgen::ContentProcessor::Context.new(:chain => [nodes[:index_en]])))
+                 @obj.call('langbar', '', Webgen::Context.new(:chain => [nodes[:index_en]])))
 
     @obj.set_params('tag.langbar.show_single_lang' => true, 'tag.langbar.show_own_lang' => true,
                     'tag.langbar.lang_names' => {'de' => 'Deutsch'})
     assert_equal(["<a href=\"index.de.html\">Deutsch</a> | #{en_link}", false],
-                 @obj.call('langbar', '', Webgen::ContentProcessor::Context.new(:chain => [nodes[:index_en]])))
+                 @obj.call('langbar', '', Webgen::Context.new(:chain => [nodes[:index_en]])))
 
     @obj.set_params('tag.langbar.show_single_lang' => true, 'tag.langbar.show_own_lang' => true,
                     'tag.langbar.process_output' => true)
     assert_equal(["#{de_link} | #{en_link}", true],
-                 @obj.call('langbar', '', Webgen::ContentProcessor::Context.new(:chain => [nodes[:index_en]])))
+                 @obj.call('langbar', '', Webgen::Context.new(:chain => [nodes[:index_en]])))
 
     nodes[:index_en].unflag(:dirty)
     @website.blackboard.dispatch_msg(:node_changed?, nodes[:index_en])
-    assert(!nodes[:index_en].flagged(:dirty))
+    assert(!nodes[:index_en].flagged?(:dirty))
     nodes[:index_en].tree.delete_node(nodes[:index_de])
     @website.blackboard.dispatch_msg(:node_changed?, nodes[:index_en])
-    assert(nodes[:index_en].flagged(:dirty))
+    assert(nodes[:index_en].flagged?(:dirty))
   end
 
   def check_results(node, both_true, both_false, first_false, second_false)
-    context = Webgen::ContentProcessor::Context.new(:chain => [node])
+    context = Webgen::Context.new(:chain => [node])
     @obj.set_params('tag.langbar.show_single_lang'=>true, 'tag.langbar.show_own_lang'=>true)
     assert_equal(both_true, @obj.call('langbar', '', context).first)
 

data/test/test_tag_link.rb

@@ -29,13 +29,13 @@ class TestTagLink < Test::Unit::TestCase
     dir2 = Webgen::Node.new(root, '/dir2/', 'dir2/', 'index_path' => "index.html")
     Webgen::Node.new(dir2, '/dir2/index.html', 'index.html')
 
-    context = Webgen::ContentProcessor::Context.new(:chain => [node])
+    context = Webgen::Context.new(:chain => [node])
 
     # no path set
     node.unflag(:dirty)
     @obj.set_params('tag.link.path' => nil)
     assert_equal('', call(context))
-    assert(node.flagged(:dirty))
+    assert(node.flagged?(:dirty))
 
     # invalid paths
     @obj.set_params('tag.link.path' => ':/asdf=-)')
@@ -58,6 +58,12 @@ class TestTagLink < Test::Unit::TestCase
     assert_equal('<a href="dir/"></a>', call(context))
     @obj.set_params('tag.link.path' => 'dir2')
     assert_equal('<a href="dir2/index.html"></a>', call(context))
+
+    # used node information correctly set
+    node.node_info[:used_meta_info_nodes] = Set.new
+    @obj.set_params('tag.link.path' => 'dir/file.html')
+    call(context)
+    assert(Set.new([file.absolute_lcn]), node.node_info[:used_meta_info_nodes])
   end
 
 end

data/test/test_tag_menu.rb

@@ -52,14 +52,14 @@ class TestTagMenu < Test::Unit::TestCase
   def test_call
     nodes = create_default_nodes
 
-    output = @obj.call('menu', '', Webgen::ContentProcessor::Context.new(:chain => [nodes[:file11_en]]))
+    output = @obj.call('menu', '', Webgen::Context.new(:chain => [nodes[:file11_en]]))
     assert_equal("<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\"><a href=\"dir11/index.en.html\"></a></li>" +
                  "<li class=\"webgen-menu-level2 webgen-menu-item-selected\"><span></span></li></ul></li>" +
                  "<li class=\"webgen-menu-level1 webgen-menu-submenu\"><a href=\"../dir2/\"></a></li>" +
                  "<li class=\"webgen-menu-level1 webgen-menu-submenu\"><a href=\"../dir3/\"></a></li></ul>", output)
 
-    output = @obj.call('menu', '', Webgen::ContentProcessor::Context.new(:chain => [nodes[:index11_en]]))
+    output = @obj.call('menu', '', Webgen::Context.new(:chain => [nodes[:index11_en]]))
     assert_equal("<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\"><span></span>" +
                  "<ul><li class=\"webgen-menu-level3\"><a href=\"file111.en.html\"></a></li>" +
@@ -69,7 +69,7 @@ class TestTagMenu < Test::Unit::TestCase
                  "<li class=\"webgen-menu-level1 webgen-menu-submenu\"><a href=\"../../dir3/\"></a></li></ul>", output)
 
     @obj.set_params('tag.menu.nested' => false)
-    output = @obj.call('menu', '', Webgen::ContentProcessor::Context.new(:chain => [nodes[:index11_en]]))
+    output = @obj.call('menu', '', Webgen::Context.new(:chain => [nodes[:index11_en]]))
     @obj.set_params({})
     assert_equal("<ul><li class=\"webgen-menu-level1 webgen-menu-submenu webgen-menu-submenu-inhierarchy\"><a href=\"../\"></a></li>" +
                  "<li class=\"webgen-menu-level1 webgen-menu-submenu\"><a href=\"../../dir2/\"></a></li>" +
@@ -80,28 +80,28 @@ class TestTagMenu < Test::Unit::TestCase
                  "<li class=\"webgen-menu-level3 webgen-menu-item-selected\"><span></span></li></ul>", output)
 
     @obj.set_params('tag.menu.used_nodes' => 'fragments')
-    output = @obj.call('menu', '', Webgen::ContentProcessor::Context.new(:chain => [nodes[:file11_en]]))
+    output = @obj.call('menu', '', Webgen::Context.new(:chain => [nodes[:file11_en]]))
     @obj.set_params({})
     assert_equal("<ul><li class=\"webgen-menu-level1 webgen-menu-submenu\"><a href=\"#f1\"></a></li>" +
                  "<li class=\"webgen-menu-level1\"><a href=\"#f2\"></a></li></ul>", output)
 
     @obj.set_params('tag.menu.start_level' => 5)
-    output = @obj.call('menu', '', Webgen::ContentProcessor::Context.new(:chain => [nodes[:file11_en]]))
+    output = @obj.call('menu', '', Webgen::Context.new(:chain => [nodes[:file11_en]]))
     @obj.set_params({})
     assert_equal("", output)
 
     nodes.each {|k,v| v.unflag(:dirty)}
     @website.blackboard.dispatch_msg(:node_changed?, nodes[:file11_en])
-    assert(!nodes[:file11_en].flagged(:dirty))
+    assert(!nodes[:file11_en].flagged?(:dirty))
 
     nodes[:index11_en].flag(:dirty_meta_info)
     @website.blackboard.dispatch_msg(:node_changed?, nodes[:file11_en])
-    assert(nodes[:file11_en].flagged(:dirty))
+    assert(nodes[:file11_en].flagged?(:dirty))
 
     nodes.each {|k,v| v.unflag(:dirty)}
     nodes[:file11_en_f2]['in_menu'] = false
     @website.blackboard.dispatch_msg(:node_changed?, nodes[:file11_en])
-    assert(nodes[:file11_en].flagged(:dirty))
+    assert(nodes[:file11_en].flagged?(:dirty))
   end
 
   def test_menu_tree_for_lang_and_create_menu_tree
@@ -191,7 +191,7 @@ class TestTagMenu < Test::Unit::TestCase
   def test_create_output_and_menu_item_details
     nodes = create_default_nodes
     tree = build_menu(nodes[:file111_en], [1, 2, 3, true])
-    context = Webgen::ContentProcessor::Context.new(:chain => [nodes[:file111_en]])
+    context = Webgen::Context.new(:chain => [nodes[:file111_en]])
     assert_equal("<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=\"index.en.html\"></a>" +
                  "<ul><li class=\"webgen-menu-level3 webgen-menu-item-selected\"><span></span></li>" +