webgen 0.5.8 → 0.5.9

data/test/test_source_filesystem.rb

@@ -62,7 +62,7 @@ class TestSourceFileSystem < Test::Unit::TestCase
   end
 
   def test_handling_of_invalid_link
-    return if Config::CONFIG['arch'].include?('mswin32')
+    return if Config::CONFIG['host_os'] =~ /mswin|mingw/
     dir = File.join(Dir.tmpdir, 'webgen-link-test')
     FileUtils.mkdir_p(dir)
     FileUtils.touch(File.join(dir, 'test'))

data/test/test_source_stacked.rb

@@ -4,7 +4,7 @@ require 'test/unit'
 require 'helper'
 require 'webgen/source'
 
-class TestSourceFileSystemStacked < Test::Unit::TestCase
+class TestSourceStacked < Test::Unit::TestCase
 
   class TestSource
     def initialize(paths); @paths = paths; end
@@ -14,23 +14,36 @@ class TestSourceFileSystemStacked < Test::Unit::TestCase
   def test_initialize
     source = Webgen::Source::Stacked.new
     assert_equal([], source.stack)
-    source = Webgen::Source::Stacked.new('/dir' => 6)
+    assert_equal(false, source.cache_paths)
+    source = Webgen::Source::Stacked.new({'/dir' => 6}, true)
     assert_equal([['/dir', 6]], source.stack)
+    assert_equal(true, source.cache_paths)
   end
 
   def test_add
     source = Webgen::Source::Stacked.new
-    assert_raise(RuntimeError) { source.add(['dir', 6])}
-    source.add('/temp' => :source)
-    assert_equal([['/temp', :source]], source.stack)
+    assert_raise(RuntimeError) { source.add(['dir', 6]) }
+
+    test_source = TestSource.new([Webgen::Path.new('/temp')])
+    source.add('/temp/' => test_source)
+    assert_equal([['/temp/', test_source]], source.stack)
+
+    source.cache_paths = true
+    source.add('/dir/' => test_source)
+    source.paths
+    assert_raise(RuntimeError) { source.add('/dir1/' => test_source) }
   end
 
   def test_paths
     source = Webgen::Source::Stacked.new
     source.add('/' => TestSource.new([Webgen::Path.new('/hallo/dir'), Webgen::Path.new('/other')]))
-    source.add('/hallo' => TestSource.new([Webgen::Path.new('/dir'), Webgen::Path.new('/other')]))
+    source.add('/hallo/' => TestSource.new([Webgen::Path.new('/dir'), Webgen::Path.new('/other')]))
     assert_equal(Set.new([Webgen::Path.new('/hallo/dir'), Webgen::Path.new('/other'),
                           Webgen::Path.new('/hallo/other')]), source.paths)
+
+    source.cache_paths = true
+    set = source.paths
+    assert_equal(set.object_id, source.paths.object_id)
   end
 
 end

data/test/test_sourcehandler_base.rb

@@ -21,89 +21,95 @@ class TestSourceHandlerBase < Test::Unit::TestCase
   end
 
   def test_create_node
-    tree = Webgen::Tree.new
     path = path_with_meta_info('/path.html')
     count = 0
 
     path.instance_eval { @source_path = '/path'}
-    node = @obj.create_node(tree.dummy_root, path) {|n| count +=1 }
+    node = @obj.create_node(path, :parent => @website.tree.dummy_root) {|n| count +=1 }
     assert_equal('/path', node.node_info[:src])
     assert_equal('Object', node.node_info[:processor])
     assert_kind_of(Time, node['modified_at'])
     assert_equal(1, count)
 
-    other_node = @obj.create_node(tree.dummy_root, path) {|n| count +=1 }
+    other_node = @obj.create_node(path, :parent => @website.tree.dummy_root) {|n| count +=1 }
     assert_equal(node, other_node)
     assert_equal(1, count)
 
     node.flag(:reinit)
-    other_node = @obj.create_node(tree.dummy_root, path) {|n| count +=1 }
+    other_node = @obj.create_node(path, :parent => @website.tree.dummy_root) {|n| count +=1 }
     assert_equal(node, other_node)
     assert_equal(2, count)
 
     path.instance_eval { @source_path = '/other' }
-    other_node = @obj.create_node(tree.dummy_root, path) {|n| count +=1 }
+    other_node = @obj.create_node(path, :parent => @website.tree.dummy_root) {|n| count +=1 }
     assert_equal(node, other_node)
     assert_equal(2, count)
   end
 
   def test_node_exists
-    @tree = Webgen::Tree.new
-    node = Webgen::Node.new(@tree.dummy_root, 'test/', 'test', {'lang' => 'de', :test => :value})
-    child_de = Webgen::Node.new(node, 'test/somename.html', 'somename.page', {'lang' => 'de'})
-    frag_de = Webgen::Node.new(child_de, '#data1', '#othertest')
-
-    assert_equal(child_de, @obj.node_exists?(node, path_with_meta_info('somename.de.page')))
-    assert_equal(child_de, @obj.node_exists?(node, path_with_meta_info('other.page'), @obj.output_path(node, path_with_meta_info('somename.html'))))
-    assert_equal(false, @obj.node_exists?(node, path_with_meta_info('somename.en.page', {'no_output' => true}),
-                                          @obj.output_path(node, path_with_meta_info('somename.html'))))
-    assert_equal(frag_de, @obj.node_exists?(child_de, path_with_meta_info('#othertest')))
-    assert_equal(nil, @obj.node_exists?(node, path_with_meta_info('unknown')))
+    node = Webgen::Node.new(@website.tree.dummy_root, '/', '/', {'lang' => 'de', :test => :value})
+    child_de = Webgen::Node.new(node, '/somename.html', 'somename.html', {'lang' => 'de'})
+    frag_de = Webgen::Node.new(child_de, '/somename.html#data1', '#othertest')
+
+    assert_equal(child_de, @obj.node_exists?(path_with_meta_info('/somename.de.html')))
+    assert_equal(child_de, @obj.node_exists?(path_with_meta_info('/other.page'), @obj.output_path(node, path_with_meta_info('/somename.html'))))
+    assert_equal(false, @obj.node_exists?(path_with_meta_info('/somename.en.html', {'no_output' => true}),
+                                          @obj.output_path(node, path_with_meta_info('/somename.html'))))
+    assert_equal(frag_de, @obj.node_exists?(path_with_meta_info('/somename.de.html#othertest')))
+    assert_equal(nil, @obj.node_exists?(path_with_meta_info('/unknown')))
   end
 
   def test_output_path
-    node = Webgen::Node.new(Webgen::Tree.new.dummy_root, 'test/', 'test')
-    assert_raise(RuntimeError) { @obj.output_path(node, path_with_meta_info('test.page', 'output_path' => 'non'))}
+    node = Webgen::Node.new(Webgen::Tree.new.dummy_root, '/', '/')
+    assert_raise(Webgen::NodeCreationError) { @obj.output_path(node, path_with_meta_info('/test.page', 'output_path' => 'non'))}
   end
 
   def test_standard_output_path
-    @tree = Webgen::Tree.new
-    node = Webgen::Node.new(@tree.dummy_root, 'test/', 'test', {'lang' => 'de', :test => :value})
-
-    path = path_with_meta_info('path.html')
-    assert_equal('test/path.html', @obj.output_path(node, path))
-    path = path_with_meta_info('path.en.html')
-    assert_equal('test/path.html', @obj.output_path(node, path))
-    path = path_with_meta_info('path.eo.html')
-    assert_equal('test/path.eo.html', @obj.output_path(node, path))
-    path = path_with_meta_info('dir/')
-    assert_equal('test/dir/', @obj.output_path(node, path))
-
-    other = Webgen::Node.new(node, 'test/path.html', 'other.page')
-    path = path_with_meta_info('path.html')
-    assert_equal('test/path.html', @obj.output_path(node, path))
-    path = path_with_meta_info('path.en.html')
-    assert_equal('test/path.en.html', @obj.output_path(node, path))
-
-    path = path_with_meta_info('#frag')
-    assert_equal('test/path.html#frag', @obj.output_path(other, path))
-    frag = Webgen::Node.new(other, 'test/path.html#frag', '#frag')
-    path = path_with_meta_info('#frag1')
-    assert_equal('test/path.html#frag1', @obj.output_path(frag, path))
+    node = Webgen::Node.new(@website.tree.dummy_root, '/', '/', {'lang' => 'de', :test => :value})
 
-    path = path_with_meta_info('/')
-    assert_equal('/', @obj.output_path(@tree.dummy_root, path))
-    path = path_with_meta_info('/', 'output_path_style' => [:parent, 'hallo', 56])
-    assert_equal('hallo/', @obj.output_path(@tree.dummy_root, path))
+    path = path_with_meta_info('/path.html')
+    assert_equal('/path.html', @obj.output_path(node, path))
+    path = path_with_meta_info('/path.en.html')
+    assert_equal('/path.html', @obj.output_path(node, path))
+    path = path_with_meta_info('/path.eo.html')
+    assert_equal('/path.eo.html', @obj.output_path(node, path))
+    path = path_with_meta_info('/dir/')
+    assert_equal('/dir/', @obj.output_path(node, path))
+
+    other = Webgen::Node.new(node, '/path.html', 'other.page')
+    path = path_with_meta_info('/path.html')
+    assert_equal('/path.html', @obj.output_path(node, path))
+    path = path_with_meta_info('/path.en.html')
+    assert_equal('/path.en.html', @obj.output_path(node, path))
+
+    path = path_with_meta_info('/path.html#frag')
+    assert_equal('/path.html#frag', @obj.output_path(other, path))
+    frag = Webgen::Node.new(other, '/path.html#frag', '#frag')
+    path = path_with_meta_info('/path.html#frag1')
+    assert_equal('/path.html#frag1', @obj.output_path(frag, path))
 
-    assert_raise(RuntimeError) do
-      path = path_with_meta_info('path.html', 'output_path_style' => [:parent, :year, '/', :month, '/', :cnbase, :ext])
+    path = path_with_meta_info('/')
+    assert_equal('/', @obj.output_path(@website.tree.dummy_root, path))
+    path = path_with_meta_info('/test/', 'output_path_style' => [:parent, 'hallo', 56])
+    assert_equal('hallo/', @obj.output_path(@website.tree.dummy_root, path))
+
+    path = path_with_meta_info('/index.en.html')
+    assert_equal('/index.html', @obj.output_path(node, path))
+    index_en = Webgen::Node.new(node, '/index.html', 'index.page', {'lang' => 'en'})
+    assert_equal('/index.html', @obj.output_path(node, path))
+    path = path_with_meta_info('/index.en.html', 'output_path_style' => [:parent, 'hallo.html'])
+    assert_equal('/hallo.html', @obj.output_path(node, path))
+    path = path_with_meta_info('/other.de.html', 'output_path_style' => [:parent, 'index', ['.', :lang], :ext])
+    assert_equal('/index.de.html', @obj.output_path(node, path))
+
+    assert_raise(Webgen::NodeCreationError) do
+      path = path_with_meta_info('/path.html', 'output_path_style' => [:parent, :year, '/', :month, '/', :basename, :ext])
       @obj.output_path(node, path)
     end
     time = Time.parse('2008-09-04 08:15')
-    path = path_with_meta_info('path.html', 'output_path_style' => [:parent, :year, '/', :month, '/', :day, '-', :cnbase, :ext],
+    path = path_with_meta_info('/path.html', 'output_path_style' => [:parent, :year, '/', :month, '/', :day, '-', :basename, :ext],
                                'created_at' => time)
-    assert_equal('test/2008/09/04-path.html', @obj.output_path(node, path))
+    assert_equal('/2008/09/04-path.html', @obj.output_path(node, path))
   end
 
   def test_content
@@ -117,7 +123,14 @@ class TestSourceHandlerBase < Test::Unit::TestCase
     assert_equal('value1', path.meta_info['key'])
 
     path = path_with_meta_info('/other.page') { StringIO.new("---\:dfk")}
-    assert_raise(RuntimeError) { @obj.page_from_path(path) }
+    assert_raise(Webgen::NodeCreationError) { @obj.page_from_path(path) }
+  end
+
+  def test_parent_node
+    assert_equal(@website.tree.dummy_root, @obj.parent_node(path_with_meta_info('/')))
+    root = Webgen::Node.new(@website.tree.dummy_root, '/', '/')
+    assert_equal(root, @obj.parent_node(path_with_meta_info('/test/')))
+    assert_raise(Webgen::NodeCreationError) { @obj.parent_node(path_with_meta_info('/hallo/other.page')) }
   end
 
 end

data/test/test_sourcehandler_copy.rb

@@ -17,21 +17,21 @@ class TestSourceHandlerCopy < Test::Unit::TestCase
     super
     @website.config['contentprocessor.map']['test'] = 'TestSourceHandlerCopy::TestCP'
     @obj = Webgen::SourceHandler::Copy.new
-    @root = Webgen::Node.new(Webgen::Tree.new.dummy_root, 'test/', 'test')
-    @without = @obj.create_node(@root, path_with_meta_info('/default.css') {StringIO.new('# header')})
-    @with = @obj.create_node(@root, path_with_meta_info('/other.test.css') {StringIO.new('# header')})
+    @root = Webgen::Node.new(@website.tree.dummy_root, '/', '/')
+    @without = @obj.create_node(path_with_meta_info('/default.css') {StringIO.new('# header')})
+    @with = @obj.create_node(path_with_meta_info('/other.test.css') {StringIO.new('# header')})
   end
 
   def test_create_node
     assert_not_nil(@without)
     assert_equal(nil, @without.node_info[:preprocessor])
-    assert_equal('test/default.css', @without.path)
+    assert_equal('/default.css', @without.path)
 
     assert_not_nil(@with)
     assert_equal('test', @with.node_info[:preprocessor])
-    assert_equal('test/other.css', @with.path)
+    assert_equal('/other.css', @with.path)
 
-    node = @obj.create_node(@root, path_with_meta_info('/other.unknown.css') {StringIO.new('# header')})
+    node = @obj.create_node(path_with_meta_info('/other.unknown.css') {StringIO.new('# header')})
     assert_equal(nil, node.node_info[:preprocessor])
   end
 

data/test/test_sourcehandler_directory.rb

@@ -11,32 +11,28 @@ class TestSourceHandlerDirectory < Test::Unit::TestCase
 
   def test_create_node
     @obj = Webgen::SourceHandler::Directory.new
-    root = Webgen::Node.new(Webgen::Tree.new.dummy_root, 'test/', 'test')
-    node = @obj.create_node(root, path_with_meta_info('/dir/', {:key => :value}) {StringIO.new('')})
+    root = Webgen::Node.new(@website.tree.dummy_root, '/', '/')
+    node = @obj.create_node(path_with_meta_info('/dir/', {:key => :value}) {StringIO.new('')})
     assert_not_nil(node)
     assert_equal(:value, node[:key])
 
     node.flag(:reinit)
-    assert_equal(node, @obj.create_node(root, path_with_meta_info('/dir/', {:key => :other}) {StringIO.new('')}))
+    assert_equal(node, @obj.create_node(path_with_meta_info('/dir/', {:key => :other}) {StringIO.new('')}))
     assert_equal(:other, node[:key])
   end
 
   def test_create_directories
     @obj = Webgen::SourceHandler::Directory.new
     shm = Webgen::SourceHandler::Main.new # for using service :create_nodes
-    root = Webgen::Node.new(Webgen::Tree.new.dummy_root, 'test/', 'test')
-    dir = @obj.create_node(root, path_with_meta_info('/dir/'))
+    root = Webgen::Node.new(@website.tree.dummy_root, '/', '/')
+    dir = @obj.create_node(path_with_meta_info('/dir/'))
 
-    assert_equal(dir, @obj.create_directories(root, '/dir/', path_with_meta_info('/test')))
-    assert_equal(dir, @obj.create_directories(root, 'dir/', path_with_meta_info('/test')))
-    assert_equal(dir, @obj.create_directories(root, 'dir', path_with_meta_info('/test')))
+    assert_equal(dir, @obj.create_directories(root, '/dir/', path_with_meta_info('/')))
+    assert_equal(dir, @obj.create_directories(root, 'dir/', path_with_meta_info('/')))
+    assert_equal(dir, @obj.create_directories(root, 'dir', path_with_meta_info('/')))
 
     which = @obj.create_directories(root, 'dir/under/which', path_with_meta_info('/test'))
     assert_equal(which, @obj.create_directories(root, 'dir/under/which', path_with_meta_info('/test')))
   end
 
-  def test_content
-    assert_equal('', Webgen::SourceHandler::Directory.new.content(nil))
-  end
-
 end

data/test/test_sourcehandler_feed.rb

@@ -20,8 +20,11 @@ hallo
 EOF
   def setup
     super
+    shm = Webgen::SourceHandler::Main.new
+    @website.blackboard.del_listener(:node_meta_info_changed?, shm.method(:meta_info_changed?))
+    @website.config['passive_sources'] << ['/', "Webgen::Source::Resource", "webgen-passive-sources"]
     @nodes = {
-      :root => root = Webgen::Node.new(Webgen::Tree.new.dummy_root, '/', '/', {'index_path' => 'index.html'}),
+      :root => root = Webgen::Node.new(@website.tree.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'}),
     }
@@ -31,7 +34,7 @@ EOF
   end
 
   def test_create_node
-    atom_node, rss_node = @obj.create_node(@nodes[:root], @path)
+    atom_node, rss_node = @obj.create_node(@path)
 
     assert_not_nil(atom_node)
     assert_not_nil(rss_node)
@@ -39,24 +42,28 @@ EOF
     assert_equal('atom', atom_node.node_info[:feed_type])
     assert_equal('rss', rss_node.node_info[:feed_type])
 
-    assert_equal([atom_node, rss_node], @obj.create_node(@nodes[:root], @path))
+    assert_equal([atom_node, rss_node], @obj.create_node(@path))
+
+    assert_raise(Webgen::NodeCreationError) do
+      @obj.create_node(path_with_meta_info('/test.feed', {}, @obj.class.name) {StringIO.new("---\nsite_url: test\n---\n")})
+    end
   end
 
   def test_content
-    atom_node, rss_node = @obj.create_node(@nodes[:root], @path)
-    assert_equal('hallo', rss_node.content)
+    atom_node, rss_node = @obj.create_node(@path)
+    assert_equal("hallo\n", rss_node.content)
     assert(atom_node.content =~ /Thomas Leitner/)
     assert(atom_node.content =~ /RealContent/)
   end
 
   def test_feed_entries
-    atom_node, rss_node = @obj.create_node(@nodes[:root], @path)
+    atom_node, rss_node = @obj.create_node(@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)
+    atom_node, rss_node = @obj.create_node(@path)
     assert(atom_node.changed?)
 
     atom_node.content # populate cache
@@ -68,6 +75,7 @@ EOF
     atom_node.unflag(:dirty)
     @nodes[:file1_en].unflag(:dirty)
     @nodes[:index_en].unflag(:dirty)
+    @website.tree['/templates/atom_feed.template'].unflag(:dirty)
     assert(!atom_node.changed?)
 
     atom_node['entries'] = 'file.*.html'

data/test/test_sourcehandler_fragment.rb

@@ -44,19 +44,20 @@ EOF
 
   def test_create_fragment_nodes
     @obj = Webgen::SourceHandler::Fragment.new
-    root = Webgen::Node.new(Webgen::Tree.new.dummy_root, 'test/', 'test')
-    path = path_with_meta_info('hallo.html') {StringIO.new('')}
-    node = @obj.create_node(root, path)
+    root = Webgen::Node.new(@website.tree.dummy_root, '/', '/')
+    path = path_with_meta_info('/hallo.html') {StringIO.new('')}
+    node = @obj.create_node(path)
     @website.blackboard.add_service(:create_nodes, method(:create_nodes_service))
 
     sections = @obj.parse_html_headers(YAML::load(TEST_CONTENT).first['data'])
     @obj.create_fragment_nodes(sections, node, path, 'true')
+    assert_not_nil(root.tree['/hallo.html#test'])
     assert_equal(node, node.resolve('#test').parent)
     assert_equal(node.resolve('#test'), node.resolve('#other').parent)
   end
 
-  def create_nodes_service(tree, alcn, path, sh)
-    [yield(tree[alcn], path_with_meta_info(path.path))]
+  def create_nodes_service(path, sh)
+    [yield(path_with_meta_info(path.path))]
   end
 
   def check_sections(sections, valid)

data/test/test_sourcehandler_main.rb

@@ -0,0 +1,39 @@
+# -*- encoding: utf-8 -*-
+
+require 'test/unit'
+require 'webgen/website'
+require 'tmpdir'
+require 'fileutils'
+
+class TestSourceHandlerMain < Test::Unit::TestCase
+
+  def test_output_deletion
+    dir = nil
+    setup_task = lambda do
+      dir = File.join(Dir.tmpdir, 'webgen-' + Process.pid.to_s)
+      FileUtils.rm_rf(dir)
+      FileUtils.mkdir_p(dir)
+      FileUtils.mkdir_p(File.join(dir, 'src'))
+      FileUtils.touch(File.join(dir, 'src', 'test.jpg'))
+    end
+
+    setup_task.call
+    ws = Webgen::Website.new(dir, nil) {|c| c['output.do_deletion'] = false }
+    assert_equal(:success, ws.render)
+    assert(File.exists?(File.join(dir, 'out', 'test.jpg')))
+    FileUtils.rm_rf(File.join(dir, 'src', 'test.jpg'))
+    assert_equal(:success, ws.render)
+    assert(File.exists?(File.join(dir, 'out', 'test.jpg')))
+
+    setup_task.call
+    ws = Webgen::Website.new(dir, nil) {|c| c['output.do_deletion'] = true }
+    assert_equal(:success, ws.render)
+    assert(File.exists?(File.join(dir, 'out', 'test.jpg')))
+    FileUtils.rm_rf(File.join(dir, 'src', 'test.jpg'))
+    assert_equal(:success, ws.render)
+    assert(!File.exists?(File.join(dir, 'out', 'test.jpg')))
+  ensure
+    FileUtils.rm_rf(dir)
+  end
+
+end

data/test/test_sourcehandler_memory.rb

@@ -11,18 +11,18 @@ class TestSourceHandlerMemory < Test::Unit::TestCase
 
   def test_all
     obj = Webgen::SourceHandler::Memory.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
     root.unflag(:dirty)
     root.unflag(:created)
 
-    node = obj.create_node(root, path_with_meta_info('/test.png'), '/', 'data')
+    node = obj.create_node(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))
     root.tree.delete_node(node)
 
-    node = obj.create_node(root, path_with_meta_info('/test.png'), '/') {|n| assert_equal(node, n); 'data'}
+    node = obj.create_node(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))
@@ -33,7 +33,7 @@ class TestSourceHandlerMemory < Test::Unit::TestCase
     root.unflag(:dirty)
     root.tree.delete_node(node)
 
-    node = obj.create_node(root, path_with_meta_info('/test.png'), '/', 'data')
+    node = obj.create_node(path_with_meta_info('/test.png'), '/', 'data')
     assert_equal('/', node.node_info[:memory_source_alcn])
     obj.instance_eval { @data = nil }
     assert_nil(obj.content(node))