gettalong-webgen 0.5.8.20090507 → 0.5.9.20090620

data/test/test_sourcehandler_page.rb

@@ -14,46 +14,46 @@ class TestSourceHandlerPage < Test::Unit::TestCase
     @website.blackboard.del_service(:templates_for_node)
     @website.blackboard.add_service(:templates_for_node) {|node| []}
     @obj = Webgen::SourceHandler::Page.new
-    @root = Webgen::Node.new(Webgen::Tree.new.dummy_root, 'test/', 'test')
+    @root = Webgen::Node.new(@website.tree.dummy_root, '/', '/')
     @path = path_with_meta_info('/index.page') {StringIO.new('content')}
     @path.meta_info.update({'lang'=>'eo', 'test'=>'yes', 'sort_info'=>6})
     @website.blackboard.add_service(:source_paths) {{@path.path => @path}}
   end
 
   def test_create_node
-    node = @obj.create_node(@root, @path.dup)
+    node = @obj.create_node(@path.dup)
 
     assert_not_nil(node)
-    assert_equal('test/index.eo.html', node.path)
+    assert_equal('/index.eo.html', node.path)
     assert_equal(@obj.class.name, node.node_info[:processor])
     assert_equal('Index', node['title'])
     assert_equal('yes', node['test'])
     assert_equal(6, node['sort_info'])
     assert_equal(Webgen::LanguageManager.language_for_code('epo'), node.lang)
 
-    assert_equal(node, @obj.create_node(@root, @path.dup))
+    assert_equal(node, @obj.create_node(@path.dup))
 
     @root.tree.delete_node(node)
     path = @path.dup
     def path.changed?
       false
     end
-    @obj.create_node(@root, path)
+    @obj.create_node(path)
   end
 
   def test_content
-    node = @obj.create_node(@root, @path)
+    node = @obj.create_node(@path)
     assert_equal("content", @obj.content(node))
   end
 
   def test_render_node
-    node = @obj.create_node(@root, @path)
+    node = @obj.create_node(@path)
     assert_equal("content", @obj.render_node(node))
     assert_raise(RuntimeError) { @obj.render_node(node, 'other') }
   end
 
   def test_meta_info_changed
-    node = @obj.create_node(@root, @path)
+    node = @obj.create_node(@path)
     @website.blackboard.dispatch_msg(:node_meta_info_changed?, node)
     assert(!node.meta_info_changed?)
 
@@ -63,7 +63,7 @@ class TestSourceHandlerPage < Test::Unit::TestCase
 
     # Remove path from which node is created, meta info should naturally change
     @root.tree.delete_node(node)
-    node = @obj.create_node(@root, @path)
+    node = @obj.create_node(@path)
     @website.blackboard.del_service(:source_paths)
     @website.blackboard.add_service(:source_paths) { {} }
     @website.blackboard.dispatch_msg(:node_meta_info_changed?, node)

data/test/test_sourcehandler_sitemap.rb

@@ -26,19 +26,19 @@ EOF
   end
 
   def test_create_node
-    sitemap = @obj.create_node(@nodes[:root], @path)
+    sitemap = @obj.create_node(@path)
 
     assert_not_nil(sitemap)
     assert_equal('/test.xml', sitemap.path)
-    assert_equal('/test.xml', sitemap.absolute_lcn)
+    assert_equal('/test.xml', sitemap.alcn)
 
     assert_raise(RuntimeError) do
-      @obj.create_node(@nodes[:root], path_with_meta_info('/test.sitemap', {}, @obj.class.name) {StringIO.new('')})
+      @obj.create_node(path_with_meta_info('/test.sitemap', {}, @obj.class.name) {StringIO.new('')})
     end
   end
 
   def test_content
-    sitemap = @obj.create_node(@nodes[:root], @path)
+    sitemap = @obj.create_node(@path)
     content = sitemap.content
     assert_match(/<changefreq>daily<\/changefreq>/, content)
     assert_match(/<changefreq>hourly<\/changefreq>/, content)

data/test/test_sourcehandler_template.rb

@@ -18,23 +18,23 @@ class TestSourceHandlerTemplate < Test::Unit::TestCase
   end
 
   def test_create_node
-    root = Webgen::Node.new(Webgen::Tree.new.dummy_root, 'test/', 'test', {'lang' => 'de', :test => :value})
-    node = @obj.create_node(root, path_with_meta_info('/default.template') {StringIO.new('')})
+    root = Webgen::Node.new(@website.tree.dummy_root, '/', '/', {'lang' => 'de', :test => :value})
+    node = @obj.create_node(path_with_meta_info('/default.template') {StringIO.new('')})
 
     assert_not_nil(node)
     assert_not_nil(node.node_info[:page])
-    assert_equal('test/default.template', node.path)
+    assert_equal('/default.template', node.path)
   end
 
   def test_templates_for_node
-    root = Webgen::Node.new(Webgen::Tree.new.dummy_root, 'test/', 'test', {'lang' => 'de', :test => :value})
-    default_template = Webgen::Node.new(root, 'default.template', 'default.template')
-    default_de_template = Webgen::Node.new(root, 'default.de.template', 'default.template', {'lang' => 'de'})
-    other_template = Webgen::Node.new(root, 'other.template', 'other.template')
-    stopped_template = Webgen::Node.new(root, 'stopped.html', 'stopped.page', { 'template' => nil})
-    invalid_template = Webgen::Node.new(root, 'invalid.template', 'invalid.template', {'template' => 'invalidity'})
-    chained_template = Webgen::Node.new(root, 'chained.template', 'chained.template', {'template' => 'other.template'})
-    german_file = Webgen::Node.new(root, 'german.html', 'german.page', {'lang' => 'de', 'template' => 'other.template'})
+    root = Webgen::Node.new(@website.tree.dummy_root, '/', '/', {:test => :value})
+    default_template = Webgen::Node.new(root, '/default.template', 'default.template')
+    default_de_template = Webgen::Node.new(root, '/default.de.template', 'default.template', {'lang' => 'de'})
+    other_template = Webgen::Node.new(root, '/other.template', 'other.template')
+    stopped_template = Webgen::Node.new(root, '/stopped.html', 'stopped.page', { 'template' => nil})
+    invalid_template = Webgen::Node.new(root, '/invalid.template', 'invalid.template', {'template' => 'invalidity'})
+    chained_template = Webgen::Node.new(root, '/chained.template', 'chained.template', {'template' => 'other.template'})
+    german_file = Webgen::Node.new(root, '/german.html', 'german.page', {'lang' => 'de', 'template' => 'other.template'})
     dir = Webgen::Node.new(root, '/dir/', 'dir')
     dir_default_template = Webgen::Node.new(dir, '/dir/default.template', 'default.template')
 
@@ -52,9 +52,9 @@ class TestSourceHandlerTemplate < Test::Unit::TestCase
   end
 
   def test_default_template
-    root = Webgen::Node.new(Webgen::Tree.new.dummy_root, 'test/', 'test', {'lang' => 'de', :test => :value})
-    dir = Webgen::Node.new(root, 'dir/', 'dir')
-    template = Webgen::Node.new(root, 'default.template', 'default.template')
+    root = Webgen::Node.new(@website.tree.dummy_root, '/', '/', {:test => :value})
+    dir = Webgen::Node.new(root, '/dir/', 'dir/')
+    template = Webgen::Node.new(root, '/default.template', 'default.template')
 
     assert_equal(template, @obj.default_template(root, nil))
     assert_equal(template, @obj.default_template(dir, nil))

data/test/test_sourcehandler_virtual.rb

@@ -25,16 +25,20 @@ class TestSourceHandlerVirtual < Test::Unit::TestCase
 - api.html:
     url: http://www.example.com
     title: Absolute
+
+- other.html:
+    url: directory/path.en.html
+    title: Nothing
 EOF
 
   def setup
     super
     @obj = Webgen::SourceHandler::Virtual.new
-    @root = Webgen::Node.new(Webgen::Tree.new.dummy_root, '/', '/')
+    @root = Webgen::Node.new(@website.tree.dummy_root, '/', '/')
     shm = Webgen::SourceHandler::Main.new # for using service :create_nodes
     @time = Time.now
     @path = path_with_meta_info('/virtuals', {'modified_at' => @time}, @obj.class.name) {StringIO.new(CONTENT)}
-    @nodes = @obj.create_node(@root, @path)
+    @nodes = @obj.create_node(@path)
     @website.blackboard.del_service(:source_paths)
     @website.blackboard.add_service(:source_paths) {{@path.path => @path}}
   end
@@ -44,7 +48,7 @@ EOF
 
     path_de = @root.tree['/path.de.html']
     path_en = @root.tree['/directory/path.en.html']
-    dir = @root.tree['/dir']
+    dir = @root.tree['/dir/']
     assert_not_nil(path_de)
     assert_not_nil(dir)
     assert_not_nil(path_en)
@@ -74,7 +78,7 @@ EOF
 
     # 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)
+    assert(1, @obj.create_node(@path).length)
     @obj.send(:node_meta_info_changed?, path_de)
     assert(!path_de.flagged?(:dirty_meta_info))
 
@@ -86,7 +90,7 @@ EOF
     # 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)
+    @obj.create_node(@path)
     path_de = @root.tree['/path.de.html']
     @website.blackboard.del_service(:source_paths)
     @website.blackboard.add_service(:source_paths) { {} }

data/test/test_tag_base.rb

@@ -36,7 +36,7 @@ class TestTagBase < Test::Unit::TestCase
     @website.logger.level = Logger::WARN
 
     output.string = ''
-    assert_equal({}, @obj.create_tag_params("--\nhal:param1\ntest:[;", Webgen::Tree.new.dummy_root))
+    assert_equal([{}, true], @obj.create_tag_params("--\nhal:param1\ntest:[;", Webgen::Tree.new.dummy_root))
     output.rewind; assert_match(/Could not parse the tag params/, output.read)
 
     output.string = ''
@@ -79,7 +79,7 @@ class TestTagBase < Test::Unit::TestCase
   end
 
   def set_params(params)
-    @obj.set_params(@obj.send(:create_params_hash, params, Webgen::Tree.new.dummy_root))
+    @obj.set_params(@obj.send(:create_params_hash, params, Webgen::Tree.new.dummy_root).first)
   end
 
 end

data/test/test_tag_executecommand.rb

@@ -35,7 +35,7 @@ class TestTagExecuteCommand < Test::Unit::TestCase
   end
 
   def echo_cmd(data)
-    (Config::CONFIG['arch'].include?('mswin32') ?  "echo #{data}" : "echo '#{data}'")
+    (Config::CONFIG['host_os'] =~ /mswin|mingw/ ?  "echo #{data}" : "echo '#{data}'")
   end
 
 end

data/test/test_tag_link.rb

@@ -34,12 +34,13 @@ class TestTagLink < Test::Unit::TestCase
     # no path set
     node.unflag(:dirty)
     @obj.set_params('tag.link.path' => nil)
-    assert_equal('', call(context))
-    assert(node.flagged?(:dirty))
+    assert_equal('<span></span>', call(context))
+    assert(!node.flagged?(:dirty))
 
     # invalid paths
     @obj.set_params('tag.link.path' => ':/asdf=-)')
     assert_equal('', call(context))
+    assert(node.flagged?(:dirty))
 
     # basic node resolving
     @obj.set_params('tag.link.path' => 'dir/file.html')
@@ -63,7 +64,7 @@ class TestTagLink < Test::Unit::TestCase
     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])
+    assert(Set.new([file.alcn]), node.node_info[:used_meta_info_nodes])
   end
 
 end

data/test/test_tag_menu.rb

@@ -111,12 +111,12 @@ class TestTagMenu < Test::Unit::TestCase
     expected = [nodes[:dir1], nodes[:dir11], nodes[:file111_en], nodes[:index11_en],
                 nodes[:file11_en], nodes[:file11_en_f1], nodes[:file11_en_f11], nodes[:file11_en_f2],
                 nodes[:dir2], nodes[:file21_en],
-                nodes[:dir3], nodes[:file31_en], nodes[:file31_en_f1]].collect {|n| n.absolute_lcn}
+                nodes[:dir3], nodes[:file31_en], nodes[:file31_en_f1]].collect {|n| n.alcn}
 
     assert_equal(expected, tree_en.to_lcn_list.flatten)
 
     tree_de = @obj.send(:menu_tree_for_lang, 'de', nodes[:root])
-    expected = [nodes[:dir1], nodes[:dir11], nodes[:file111_de], nodes[:file1_de]].collect {|n| n.absolute_lcn}
+    expected = [nodes[:dir1], nodes[:dir11], nodes[:file111_de], nodes[:file1_de]].collect {|n| n.alcn}
 
     assert_equal(expected, tree_de.to_lcn_list.flatten)
   end
@@ -126,26 +126,26 @@ class TestTagMenu < Test::Unit::TestCase
 
     # testing min_levels and max_levels
     output = build_menu(nodes[:index_en], [1, 1, 1, true])
-    expected = [nodes[:dir1], nodes[:dir2], nodes[:dir3]].collect {|n| n.absolute_lcn}
+    expected = [nodes[:dir1], nodes[:dir2], nodes[:dir3]].collect {|n| n.alcn}
     assert_equal(expected, output.to_lcn_list.flatten)
 
     output = build_menu(nodes[:index_en], [1, 2, 1, true])
-    expected = [nodes[:dir1], nodes[:dir2], nodes[:dir3]].collect {|n| n.absolute_lcn}
+    expected = [nodes[:dir1], nodes[:dir2], nodes[:dir3]].collect {|n| n.alcn}
     assert_equal(expected, output.to_lcn_list.flatten)
 
     output = build_menu(nodes[:index_en], [1, 2, 2, true])
     expected = [nodes[:dir1], nodes[:dir11], nodes[:file11_en], nodes[:dir2], nodes[:file21_en],
-                nodes[:dir3], nodes[:file31_en]].collect {|n| n.absolute_lcn}
+                nodes[:dir3], nodes[:file31_en]].collect {|n| n.alcn}
     assert_equal(expected, output.to_lcn_list.flatten)
 
     # testing show_current_subtree_only
     output = build_menu(nodes[:file11_en], [1, 1, 2, true])
-    expected = [nodes[:dir1], nodes[:dir11], nodes[:file11_en], nodes[:dir2], nodes[:dir3]].collect {|n| n.absolute_lcn}
+    expected = [nodes[:dir1], nodes[:dir11], nodes[:file11_en], nodes[:dir2], nodes[:dir3]].collect {|n| n.alcn}
     assert_equal(expected, output.to_lcn_list.flatten)
 
     output = build_menu(nodes[:file11_en], [1, 1, 2, false])
     expected = [nodes[:dir1], nodes[:dir11], nodes[:file11_en], nodes[:dir2], nodes[:file21_en],
-                nodes[:dir3], nodes[:file31_en]].collect {|n| n.absolute_lcn}
+                nodes[:dir3], nodes[:file31_en]].collect {|n| n.alcn}
     assert_equal(expected, output.to_lcn_list.flatten)
 
     # testing start_level
@@ -153,38 +153,38 @@ class TestTagMenu < Test::Unit::TestCase
     assert_equal([], output.to_lcn_list.flatten)
 
     output = build_menu(nodes[:file11_en], [2, 1, 2, true])
-    expected = [nodes[:dir11], nodes[:file11_en]].collect {|n| n.absolute_lcn}
+    expected = [nodes[:dir11], nodes[:file11_en]].collect {|n| n.alcn}
     assert_equal(expected, output.to_lcn_list.flatten)
 
     output = build_menu(nodes[:file11_en], [2, 1, 2, false])
-    expected = [nodes[:dir11], nodes[:file11_en]].collect {|n| n.absolute_lcn}
+    expected = [nodes[:dir11], nodes[:file11_en]].collect {|n| n.alcn}
     assert_equal(expected, output.to_lcn_list.flatten)
 
     output = build_menu(nodes[:file11_en], [2, 2, 2, false])
     expected = [nodes[:dir11], nodes[:file111_en], nodes[:index11_en],
-                nodes[:file11_en], nodes[:file11_en_f1], nodes[:file11_en_f2]].collect {|n| n.absolute_lcn}
+                nodes[:file11_en], nodes[:file11_en_f1], nodes[:file11_en_f2]].collect {|n| n.alcn}
     assert_equal(expected, output.to_lcn_list.flatten)
 
     output = build_menu(nodes[:file111_en], [2, 1, 2, true])
-    expected = [nodes[:dir11], nodes[:file111_en], nodes[:index11_en], nodes[:file11_en]].collect {|n| n.absolute_lcn}
+    expected = [nodes[:dir11], nodes[:file111_en], nodes[:index11_en], nodes[:file11_en]].collect {|n| n.alcn}
     assert_equal(expected, output.to_lcn_list.flatten)
 
     # testing used_nodes=files setting
     output = build_menu(nodes[:file11_en], [2, 2, 2, false, 'files'])
-    expected = [nodes[:dir11], nodes[:file111_en], nodes[:index11_en], nodes[:file11_en]].collect {|n| n.absolute_lcn}
+    expected = [nodes[:dir11], nodes[:file111_en], nodes[:index11_en], nodes[:file11_en]].collect {|n| n.alcn}
     assert_equal(expected, output.to_lcn_list.flatten)
 
     output = build_menu(nodes[:file11_en], [1, 1, 1, true, 'files'])
-    expected = [nodes[:dir1], nodes[:dir2]].collect {|n| n.absolute_lcn}
+    expected = [nodes[:dir1], nodes[:dir2]].collect {|n| n.alcn}
     assert_equal(expected, output.to_lcn_list.flatten)
 
     # testing used_nodes=fragments setting
     output = build_menu(nodes[:file11_en], [1, 1, 2, false, 'fragments'])
-    expected = [nodes[:file11_en_f1], nodes[:file11_en_f2]].collect {|n| n.absolute_lcn}
+    expected = [nodes[:file11_en_f1], nodes[:file11_en_f2]].collect {|n| n.alcn}
     assert_equal(expected, output.to_lcn_list.flatten)
 
     output = build_menu(nodes[:file11_en], [1, 2, 2, false, 'fragments'])
-    expected = [nodes[:file11_en_f1], nodes[:file11_en_f11], nodes[:file11_en_f2]].collect {|n| n.absolute_lcn}
+    expected = [nodes[:file11_en_f1], nodes[:file11_en_f11], nodes[:file11_en_f2]].collect {|n| n.alcn}
     assert_equal(expected, output.to_lcn_list.flatten)
   end
 

data/test/test_tag_metainfo.rb

@@ -1,6 +1,7 @@
 # -*- encoding: utf-8 -*-
 
 require 'test/unit'
+require 'helper'
 require 'webgen/tree'
 require 'webgen/contentprocessor'
 require 'webgen/tag'

data/test/test_tag_relocatable.rb

@@ -20,7 +20,7 @@ class TestTagRelocatable < Test::Unit::TestCase
   end
 
   def test_call
-    root = Webgen::Node.new(Webgen::Tree.new.dummy_root, '/', '/')
+    root = Webgen::Node.new(@website.tree.dummy_root, '/', '/')
     node = Webgen::Node.new(root, '/file.html', 'file.html', {'lang' => 'en'})
     dir = Webgen::Node.new(root, '/dir/', 'dir/', 'index_path' => "index.html")
     file = Webgen::Node.new(dir, '/dir/file.html', 'file.html', {'lang' => 'en'})
@@ -34,6 +34,7 @@ class TestTagRelocatable < Test::Unit::TestCase
     # basic node resolving
     @obj.set_params('tag.relocatable.path' => 'dir/file.html')
     assert_equal('dir/file.html', call(context))
+    assert(context.dest_node.node_info[:used_meta_info_nodes].include?(file.alcn))
     @obj.set_params('tag.relocatable.path' => 'dir/other.html')
     assert_equal('', call(context))
 

data/test/test_tag_tikz.rb

@@ -25,7 +25,7 @@ class TestTagTikZ < Test::Unit::TestCase
   end
 
   def test_call
-    root = Webgen::Node.new(Webgen::Tree.new.dummy_root, '/', '/')
+    root = Webgen::Node.new(@website.tree.dummy_root, '/', '/')
     node = Webgen::Node.new(root, '/file.html', 'file.page')
     context = Webgen::Context.new(:chain => [node])
 
@@ -55,14 +55,14 @@ class TestTagTikZ < Test::Unit::TestCase
   end
 
   def test_run_command
-    root = Webgen::Node.new(Webgen::Tree.new.dummy_root, '/', '/')
+    root = Webgen::Node.new(@website.tree.dummy_root, '/', '/')
     context = Webgen::Context.new(:chain => [root])
     assert_equal("hallo\n", @obj.send(:run_command, echo_cmd('hallo'), context))
     assert_nil(@obj.send(:run_command, 'unknown_command 2>&1', context))
   end
 
   def echo_cmd(data)
-    (Config::CONFIG['arch'].include?('mswin32') ?  "echo #{data}" : "echo '#{data}'")
+    (Config::CONFIG['host_os'] =~ /mswin|mingw/ ?  "echo #{data}" : "echo '#{data}'")
   end
 
 

data/test/test_tree.rb

@@ -15,24 +15,24 @@ class TestTree < Test::Unit::TestCase
 
   def test_initialize
     assert_not_nil(@tree.dummy_root)
-    assert_equal('', @tree.dummy_root.absolute_lcn)
+    assert_equal('', @tree.dummy_root.alcn)
   end
 
   def test_root
     root = Webgen::Node.new(@tree.dummy_root, '/', '/')
     assert_equal(root, @tree.root)
-    assert_equal('/', root.absolute_lcn)
+    assert_equal('/', root.alcn)
   end
 
   def test_register_node_and_register_path
     # Tree#register_node/_path is called when creating a node
-    node = Webgen::Node.new(@tree.dummy_root, 'dummy/', 'dummy')
-    assert_equal(node, @tree['/dummy', :alcn])
-    assert_equal(node, @tree['/dummy', :acn])
-    assert_equal(node, @tree['dummy/', :path])
+    node = Webgen::Node.new(@tree.dummy_root, '/', '/')
+    assert_equal(node, @tree['/', :alcn])
+    assert_equal(node, @tree['/', :acn])
+    assert_equal(node, @tree['/', :path])
     assert_raise(RuntimeError) { Webgen::Node.new(@tree.dummy_root, '/', 'dummy') }
-    assert_raise(RuntimeError) { Webgen::Node.new(@tree.dummy_root, 'dummy/', 'other') }
-    assert_nothing_raised { Webgen::Node.new(@tree.dummy_root, 'dummy/', 'unknown', {'no_output' => true}) }
+    assert_raise(RuntimeError) { Webgen::Node.new(@tree.dummy_root, 'dummy', '/') }
+    assert_nothing_raised { Webgen::Node.new(@tree.dummy_root, '/', 'unknown', {'no_output' => true}) }
     Webgen::Node.new(@tree.dummy_root, 'new', 'new', {'no_output' => true})
     assert(!@tree['new', :path])
   end

data/test/test_website.rb

@@ -57,6 +57,19 @@ class TestWebsite < Test::Unit::TestCase
     assert(ws.config['website.cache'][1].length == 0)
   end
 
+  def test_render
+    dir = File.join(Dir.tmpdir, 'webgen-' + Process.pid.to_s)
+    FileUtils.mkdir_p(dir)
+    FileUtils.mkdir_p(File.join(dir, 'src'))
+    FileUtils.touch(File.join(dir, 'src', 'test.jpg'))
+
+    ws = Webgen::Website.new(dir, nil)
+    assert_equal(:success, ws.render)
+    assert_equal(:success, ws.render)
+  ensure
+    FileUtils.rm_rf(dir)
+  end
+
   def test_execute_in_env
     ws = Webgen::Website.new('hallo')
     assert_nil(Webgen::WebsiteAccess.website)
@@ -110,6 +123,8 @@ class TestWebsite < Test::Unit::TestCase
     assert(File.directory?(File.join(dir, 'out')))
     ws.clean(true)
     assert(!File.directory?(File.join(dir, 'out')))
+  ensure
+    FileUtils.rm_rf(dir)
   end
 
 end