webgen 0.5.8 → 0.5.9

data/test/test_sourcehandler_metainfo.rb

@@ -15,6 +15,9 @@ class TestSourceHandlerMetainfo < Test::Unit::TestCase
 /default.*:
   title: new title
   before: valbef
+
+/*/:
+  title: test
 ---
 /default.css:
   after: valaft
@@ -28,35 +31,37 @@ EOF
     @website.blackboard.add_service(:source_paths) do
       {'/default.css' => path_with_meta_info('/default.css') {StringIO.new('# header')},
         '/other.page' => path_with_meta_info('/other.page') {StringIO.new('other page')},
+        '/hallo/' => path_with_meta_info('/hallo/')
       }
     end
 
     @obj = Webgen::SourceHandler::Metainfo.new
-    @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)})
+    @root = Webgen::Node.new(@website.tree.dummy_root, '/', '/')
+    @node = @obj.create_node(path_with_meta_info('/metainfo', {}, @obj.class.name) {StringIO.new(CONTENT)})
   end
 
   def test_create_node
-    assert_equal({'/default.*' => {'title' => 'new title', 'before' => 'valbef'}}, @node.node_info[:mi_paths])
+    assert_equal({'/default.*' => {'title' => 'new title', 'before' => 'valbef'},
+                 '/*' => {'title' => 'test'}}, @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('')})
+    node = @obj.create_node(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
-    other = TestSH.new.create_node(@root, path_with_meta_info('/default.css'))
+    other = TestSH.new.create_node(path_with_meta_info('/default.css'))
     assert(!@obj.send(:meta_info_changed?, @node, other))
     assert(@obj.send(:meta_info_changed?, @node, other, :force))
     assert(!@obj.send(:meta_info_changed?, @node, other, :no_old_data))
   end
 
   def test_mark_all_matched_dirty
-    other = TestSH.new.create_node(@root, path_with_meta_info('/default.css'))
+    other = TestSH.new.create_node(path_with_meta_info('/default.css'))
 
     other.unflag(:dirty_meta_info)
     @obj.send(:mark_all_matched_dirty, @node)
@@ -73,18 +78,22 @@ EOF
 
   def test_before_node_created
     path = path_with_meta_info('/default.css')
-    @website.blackboard.dispatch_msg(:before_node_created, @root, path)
+    @website.blackboard.dispatch_msg(:before_node_created, path)
     assert('valbef', path.meta_info['before'])
+
+    path = path_with_meta_info('/hallo/')
+    @website.blackboard.dispatch_msg(:before_node_created, path)
+    assert('test', path.meta_info['title'])
   end
 
   def test_after_node_created
-    other = TestSH.new.create_node(@root, path_with_meta_info('/default.css'))
+    other = TestSH.new.create_node(path_with_meta_info('/default.css'))
     @website.blackboard.dispatch_msg(:after_node_created, @node)
     assert('valaft', other['after'])
   end
 
   def test_before_node_deleted
-    other = TestSH.new.create_node(@root, path_with_meta_info('/default.css'))
+    other = TestSH.new.create_node(path_with_meta_info('/default.css'))
     @website.blackboard.dispatch_msg(:before_node_deleted, @node)
     assert(other.flagged?(:dirty_meta_info))
     assert(@obj.nodes.empty?)
@@ -106,12 +115,12 @@ EOF
   end
 
   def test_deletion_of_metainfo
-    other = TestSH.new.create_node(@root, path_with_meta_info('/other.page'))
+    other = TestSH.new.create_node(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("")})
+    @node = @obj.create_node(path_with_meta_info('/metainfo', {}, @obj.class.name) {StringIO.new("")})
     assert(other.flagged?(:dirty_meta_info))
   end
 

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') }
+    assert_raise(Webgen::RenderError) { @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

@@ -13,10 +13,21 @@ class TestSourceHandlerSitemap < Test::Unit::TestCase
 ---
 site_url: http://example.com
 default_change_freq: daily
+EOF
+
+  SITEMAP_CONTENT_TEMPLATE = <<EOF
+---
+site_url: http://example.com
+default_change_freq: daily
+--- name:template
+Yeah <%= context.node['title'] %>
 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 = create_sitemap_nodes
     @nodes.each {|k,v| v['modified_at'] = Time.now}
     @nodes[:file11_en]['priority'] = 0.9
@@ -26,19 +37,27 @@ 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('')})
+    assert_raise(Webgen::NodeCreationError) do
+      @obj.create_node(path_with_meta_info('/test.sitemap', {}, @obj.class.name) {StringIO.new('')})
     end
   end
 
+  def test_create_node_with_own_template
+    @path = path_with_meta_info('/test.sitemap', {}, @obj.class.name) {StringIO.new(SITEMAP_CONTENT_TEMPLATE)}
+    sitemap = @obj.create_node(@path)
+    sitemap['title'] = 'test'
+    assert_not_nil(sitemap)
+    assert_equal("Yeah test\n", sitemap.content)
+  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,25 +18,27 @@ 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'})
-    dir = Webgen::Node.new(root, '/dir/', 'dir')
+    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')
+    dir_dir = Webgen::Node.new(dir, '/dir/dir/', 'dir/')
+    dir_dir_file = Webgen::Node.new(dir_dir, '/dir/dir/file.html', 'file.page', {'lang' => 'en'})
 
     assert_equal([], @obj.templates_for_node(default_template))
     assert_equal([], @obj.templates_for_node(stopped_template))
@@ -45,6 +47,7 @@ class TestSourceHandlerTemplate < Test::Unit::TestCase
     assert_equal([default_template, other_template], @obj.templates_for_node(chained_template))
     assert_equal([default_de_template, other_template], @obj.templates_for_node(german_file))
     assert_equal([default_template], @obj.templates_for_node(dir_default_template))
+    assert_equal([default_template, dir_default_template], @obj.templates_for_node(dir_dir_file))
 
     @website.cache.reset_volatile_cache
     root.tree.delete_node(default_template)
@@ -52,9 +55,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

@@ -1,7 +1,5 @@
 # -*- encoding: utf-8 -*-
 
-# -*- encoding: utf-8 -*-
-
 require 'test/unit'
 require 'helper'
 require 'stringio'
@@ -35,43 +33,22 @@ class TestTagBase < Test::Unit::TestCase
     @website.logger = ::Logger.new(output)
     @website.logger.level = Logger::WARN
 
-    output.string = ''
-    assert_equal({}, @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 = ''
-    set_params(5)
-    assert_equal('param1', @obj.param('testtagbase.testtag.param1'))
-    output.rewind; assert_match(/Not all mandatory parameters/, output.read)
-    output.rewind; assert_match(/Invalid parameter type/, output.read)
+    assert_raise(Webgen::RenderError) { @obj.create_tag_params("--\nhal:param1\ntest:[;", Webgen::Tree.new.dummy_root) }
 
-    output.string = ''
-    set_params(nil)
-    assert_equal('param1', @obj.param('testtagbase.testtag.param1'))
-    output.rewind; assert_match(/Not all mandatory parameters/, output.read)
-
-    output.string = ''
-    set_params({})
-    assert_equal('param1', @obj.param('testtagbase.testtag.param1'))
-    output.rewind; assert_match(/Not all mandatory parameters/, output.read)
-
-    output.string = ''
-    set_params('test_value')
-    assert_equal('test_value', @obj.param('testtagbase.testtag.param3'))
-    output.rewind; assert_match(/Not all mandatory parameters/, output.read)
+    assert_raise(Webgen::RenderError) { set_params(5) }
+    assert_raise(Webgen::RenderError) { set_params(nil) }
+    assert_raise(Webgen::RenderError) { set_params({}) }
+    assert_raise(Webgen::RenderError) { set_params('test_value') }
 
     output.string = ''
     set_params({'param2' => 'test2', 'testtagbase.testtag.param3' => 'test3', 'invalid' => 5})
     assert_equal('test2', @obj.param('testtagbase.testtag.param2'))
     assert_equal('test3', @obj.param('testtagbase.testtag.param3'))
-    output.rewind; assert_no_match(/Not all mandatory parameters/, output.read)
     output.rewind; assert_match(/Invalid parameter 'invalid'/, output.read)
 
     @website.config.data.delete('testtagbase.testtag.param3')
     @website.config.meta_info.delete('testtagbase.testtag.param3')
-    output.string = ''
-    set_params('default_value')
-    output.rewind; assert_match(/No default mandatory parameter specified for tag/, output.read)
+    assert_raise(Webgen::RenderError) { set_params('default_value') }
   end
 
   def test_call

data/test/test_tag_coderay.rb

@@ -13,20 +13,33 @@ class TestTagCoderay < Test::Unit::TestCase
     @obj = Webgen::Tag::Coderay.new
   end
 
-  def call(context, body, lang, process)
+  def call(context, body, lang, process, css = 'style')
     @obj.set_params({'tag.coderay.lang' => lang,
-                      'tag.coderay.process' => process})
+                      'tag.coderay.process' => process,
+                      'tag.coderay.css' => css})
     result = @obj.call('coderay', body, context)
     @obj.set_params({})
     result
   end
 
   def test_call
-    root = Webgen::Node.new(Webgen::Tree.new.dummy_root, '/', '/', {'title' => 'Hallo'})
+    root = Webgen::Node.new(@website.tree.dummy_root, '/', '/', {'title' => 'Hallo'})
     context = Webgen::Context.new(:chain => [root])
 
     assert(call(context, 'TestData', 'html', false).include?('TestData'))
     assert(call(context, '{title:}', :ruby, true).include?('Hallo'))
+
+    assert(call(context, 'TestData', 'ruby', false, 'other').include?('class="co"'))
+    assert(!@website.tree['/stylesheets/coderay-default.css'])
+
+    @website.blackboard.del_listener(:node_meta_info_changed?, Webgen::SourceHandler::Main.new.method(:meta_info_changed?))
+    @website.config['passive_sources'] << ['/', "Webgen::Source::Resource", "webgen-passive-sources"]
+    assert(call(context, 'TestData', 'ruby', false, 'class').include?('class="co"'))
+    assert(@website.tree['/stylesheets/coderay-default.css'])
+    assert_equal('stylesheets/coderay-default.css', context.persistent[:cp_head][:css_file].first)
+
+    def @obj.require(lib); raise LoadError; end
+    assert_raise(Webgen::LoadError) { @obj.call('coderay', '', context) }
   end
 
 end

data/test/test_tag_executecommand.rb

@@ -31,11 +31,11 @@ class TestTagExecuteCommand < Test::Unit::TestCase
     assert_equal([test_text, true], call(context, echo_cmd(test_text), true, false))
     assert_equal(['a&quot;b&quot;', true], call(context, echo_cmd(test_text), true, true))
     assert_equal(['a&quot;b&quot;', true], call(context, echo_cmd(test_text), true, true))
-    assert_raise(RuntimeError) { call(context, 'invalid_echo_command', true, true) }
+    assert_raise(Webgen::RenderError) { call(context, 'invalid_echo_command', true, true) }
   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,12 @@ 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_raise(Webgen::RenderError) { call(context) }
 
     # basic node resolving
     @obj.set_params('tag.link.path' => 'dir/file.html')
@@ -48,6 +48,7 @@ class TestTagLink < Test::Unit::TestCase
     assert_equal('<a href="dir/file.html" title="other">Dir/File</a>', call(context))
     @obj.set_params('tag.link.path' => 'dir/other.html')
     assert_equal('', call(context))
+    assert(node.flagged?(:dirty))
 
     # non-existing fragments
     @obj.set_params('tag.link.path' => 'file.html#hallo')
@@ -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