webgen 0.5.5 → 0.5.6

data/test/test_sourcehandler_directory.rb

@@ -1,6 +1,6 @@
 require 'test/unit'
 require 'helper'
-require 'webgen/sourcehandler/directory'
+require 'webgen/sourcehandler'
 require 'stringio'
 
 class TestSourceHandlerDirectory < Test::Unit::TestCase
@@ -14,10 +14,25 @@ class TestSourceHandlerDirectory < Test::Unit::TestCase
     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(: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/'))
+
+    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')))
+
+    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

data/test/test_sourcehandler_feed.rb

@@ -1,6 +1,6 @@
 require 'test/unit'
 require 'helper'
-require 'webgen/sourcehandler/feed'
+require 'webgen/sourcehandler'
 require 'stringio'
 
 class TestSourceHandlerFeed < Test::Unit::TestCase
@@ -12,6 +12,7 @@ class TestSourceHandlerFeed < Test::Unit::TestCase
 site_url: http://example.com
 entries: *.html
 author: Thomas Leitner
+content_block_name: abstract
 --- name:rss_template
 hallo
 EOF
@@ -22,7 +23,7 @@ EOF
       :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'}),
     }
-    @nodes[:index_en].node_info[:page] = Webgen::Page.from_data("hallo")
+    @nodes[:index_en].node_info[:page] = Webgen::Page.from_data("--- name:content\nMyContent\n--- name:abstract\nRealContent")
     @obj = Webgen::SourceHandler::Feed.new
     @path = path_with_meta_info('/test.feed', {}, @obj.class.name) {StringIO.new(FEED_CONTENT)}
   end
@@ -36,13 +37,14 @@ EOF
     assert_equal('atom', atom_node.node_info[:feed_type])
     assert_equal('rss', rss_node.node_info[:feed_type])
 
-    assert_equal([nil, nil], @obj.create_node(@nodes[:root], @path))
+    assert_equal([atom_node, rss_node], @obj.create_node(@nodes[:root], @path))
   end
 
   def test_content
     atom_node, rss_node = @obj.create_node(@nodes[:root], @path)
     assert_equal('hallo', rss_node.content)
     assert(atom_node.content =~ /Thomas Leitner/)
+    assert(atom_node.content =~ /RealContent/)
   end
 
   def test_feed_entries
@@ -58,15 +60,14 @@ EOF
     atom_node.content # populate cache
     @website.cache.old_data.update(@website.cache.new_data)
 
-    atom_node.dirty = false
+    atom_node.unflag(:dirty)
     assert(atom_node.changed?)
 
-    atom_node.dirty = false
-    @nodes[:file1_en].dirty = false
-    @nodes[:index_en].dirty = false
+    atom_node.unflag(:dirty)
+    @nodes[:file1_en].unflag(:dirty)
+    @nodes[:index_en].unflag(:dirty)
     assert(!atom_node.changed?)
 
-    atom_node.dirty = false
     atom_node['entries'] = 'file.*.html'
     assert(atom_node.changed?)
   end

data/test/test_sourcehandler_fragment.rb

@@ -1,6 +1,6 @@
 require 'test/unit'
 require 'helper'
-require 'webgen/sourcehandler/fragment'
+require 'webgen/sourcehandler'
 require 'stringio'
 
 class TestSourceHandlerFragment < Test::Unit::TestCase

data/test/test_sourcehandler_memory.rb

@@ -0,0 +1,42 @@
+require 'test/unit'
+require 'helper'
+require 'webgen/sourcehandler'
+require 'stringio'
+
+class TestSourceHandlerMemory < Test::Unit::TestCase
+
+  include Test::WebsiteHelper
+
+  def test_all
+    obj = Webgen::SourceHandler::Memory.new
+    root = Webgen::Node.new(Webgen::Tree.new.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')
+    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'}
+    assert_equal('/', node.node_info[:memory_source_alcn])
+    assert_equal('data', obj.content(node))
+    assert(!node.flagged(:reinit))
+
+    assert(!root.flagged(:dirty))
+    node.flag(:reinit)
+    assert(root.flagged(:dirty))
+    root.unflag(:dirty)
+    root.tree.delete_node(node)
+
+    node = obj.create_node(root, 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))
+    assert(node.flagged(:reinit))
+    assert(root.flagged(:dirty))
+  end
+
+end

data/test/test_sourcehandler_metainfo.rb

@@ -1,6 +1,6 @@
 require 'test/unit'
 require 'helper'
-require 'webgen/sourcehandler/metainfo'
+require 'webgen/sourcehandler'
 require 'stringio'
 
 class TestSourceHandlerMetainfo < Test::Unit::TestCase
@@ -30,22 +30,32 @@ EOF
   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])
   end
 
   def test_meta_info_changed
     other = TestSH.new.create_node(@root, path_with_meta_info('/default.css'))
-    assert(@obj.send(:meta_info_changed?, @node, other))
-    @website.cache.old_data.update(@website.cache.new_data)
     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.dirty_meta_info = false
+
+    other.unflag(:dirty_meta_info)
     @obj.send(:mark_all_matched_dirty, @node)
-    assert(other.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))
+
+    other.unflag(:dirty_meta_info)
+    @obj.send(:mark_all_matched_dirty, @node, :no_old_data)
+    assert(!other.flagged(:dirty_meta_info))
   end
 
   def test_before_node_created
@@ -62,28 +72,20 @@ EOF
 
   def test_before_node_deleted
     other = TestSH.new.create_node(@root, path_with_meta_info('/default.css'))
-    other.dirty_meta_info = false
-
-    @website.blackboard.del_service(:source_paths)
-    @website.blackboard.add_service(:source_paths) { {'/metainfo' => ''} }
     @website.blackboard.dispatch_msg(:before_node_deleted, @node)
-    assert(!other.dirty_meta_info)
-
-    @website.blackboard.del_service(:source_paths)
-    @website.blackboard.add_service(:source_paths) { {} }
-    @website.blackboard.dispatch_msg(:before_node_deleted, @node)
-    assert(other.dirty_meta_info)
+    assert(other.flagged(:dirty_meta_info))
+    assert(@obj.nodes.empty?)
   end
 
   def test_node_meta_info_changed
-    @node.dirty_meta_info = false
+    @node.unflag(:dirty_meta_info)
     @website.blackboard.dispatch_msg(:node_meta_info_changed?, @node)
-    assert(!@node.dirty_meta_info)
+    assert(!@node.flagged(:dirty_meta_info))
 
-    other = TestSH.new.create_node(@root, path_with_meta_info('/default.css'))
-    other.dirty_meta_info = false
-    @website.blackboard.dispatch_msg(:node_meta_info_changed?, other)
-    assert(other.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))
   end
 
   def test_content

data/test/test_sourcehandler_page.rb

@@ -1,6 +1,6 @@
 require 'test/unit'
 require 'helper'
-require 'webgen/sourcehandler/page'
+require 'webgen/sourcehandler'
 require 'stringio'
 
 class TestSourceHandlerPage < Test::Unit::TestCase
@@ -10,11 +10,7 @@ class TestSourceHandlerPage < Test::Unit::TestCase
   def setup
     super
     @website.blackboard.del_service(:templates_for_node)
-    @website.blackboard.del_service(:parse_html_sections)
-    @website.blackboard.del_service(:create_fragment_nodes)
     @website.blackboard.add_service(:templates_for_node) {|node| []}
-    @website.blackboard.add_service(:parse_html_sections) {[]}
-    @website.blackboard.add_service(:create_fragment_nodes) {nil}
     @obj = Webgen::SourceHandler::Page.new
     @root = Webgen::Node.new(Webgen::Tree.new.dummy_root, 'test/', 'test')
     @path = path_with_meta_info('/index.page') {StringIO.new('content')}
@@ -32,9 +28,8 @@ class TestSourceHandlerPage < Test::Unit::TestCase
     assert_equal('yes', node['test'])
     assert_equal(6, node['sort_info'])
     assert_equal(Webgen::LanguageManager.language_for_code('epo'), node.lang)
-    assert_not_nil(@website.cache.permanent[:page_sections]['/test/index.eo.html'])
 
-    assert_nil(@obj.create_node(@root, @path.dup))
+    assert_equal(node, @obj.create_node(@root, @path.dup))
 
     @root.tree.delete_node(node)
     path = @path.dup
@@ -58,13 +53,11 @@ class TestSourceHandlerPage < Test::Unit::TestCase
   def test_meta_info_changed
     node = @obj.create_node(@root, @path)
     @website.blackboard.dispatch_msg(:node_meta_info_changed?, node)
-    assert(node.meta_info_changed?)
+    assert(!node.meta_info_changed?)
 
-    node.dirty_meta_info = false
-    @website.cache.restore(@website.cache.dump)
-    @website.cache[[:sh_page_node_mi, node.absolute_lcn]]['modified_at'] = Time.now
+    @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?)
+    assert(node.meta_info_changed?)
   end
 
 end

data/test/test_sourcehandler_template.rb

@@ -3,7 +3,7 @@ require 'helper'
 require 'webgen/tree'
 require 'webgen/node'
 require 'webgen/path'
-require 'webgen/sourcehandler/template'
+require 'webgen/sourcehandler'
 require 'stringio'
 
 class TestSourceHandlerTemplate < Test::Unit::TestCase

data/test/test_sourcehandler_virtual.rb

@@ -11,11 +11,11 @@ class TestSourceHandlerVirtual < Test::Unit::TestCase
 \\--- !omap
 - path.de.html:
 
+- /dir/file.html:
+
 - /dir/:
     title: My Dir
 
-- /dir/file.html:
-
 - /directory/path.en.html:
     url: other.html
     title: new title

data/test/test_tag_base.rb

@@ -2,7 +2,6 @@ require 'test/unit'
 require 'helper'
 require 'stringio'
 require 'webgen/tag'
-require 'webgen/tag/base'
 
 class TestTagBase < Test::Unit::TestCase
 

data/test/test_tag_breadcrumbtrail.rb

@@ -77,13 +77,13 @@ class TestTagBreadcrumbTrail < Test::Unit::TestCase
     context = Webgen::ContentProcessor::Context.new(:chain => [nodes[:file11_en]])
     call(context, ' / ', false, 0, -1)
 
-    nodes[:file11_en].dirty = false
+    nodes[:file11_en].unflag(:dirty)
     @website.blackboard.dispatch_msg(:node_changed?, nodes[:file11_en])
-    assert(!nodes[:file11_en].dirty)
+    assert(!nodes[:file11_en].flagged(:dirty))
 
-    nodes[:index11_en].dirty_meta_info = true
+    nodes[:index11_en].flag(:dirty_meta_info)
     @website.blackboard.dispatch_msg(:node_changed?, nodes[:file11_en])
-    assert(nodes[:file11_en].dirty)
+    assert(nodes[:file11_en].flagged(:dirty))
   end
 
 end

data/test/test_tag_includefile.rb

@@ -36,13 +36,13 @@ class TestTagIncludeFile < Test::Unit::TestCase
     assert_equal([CGI::escapeHTML(content), true], call(context, file.path, true, true))
     assert_raise(Errno::ENOENT) { call(context, 'invalidfile', true, true) }
 
-    root.dirty = false
+    root.unflag(:dirty)
     @website.blackboard.dispatch_msg(:node_changed?, root)
-    assert(!root.dirty)
+    assert(!root.flagged(:dirty))
 
     File.utime(Time.now + 1, Time.now + 1, file.path)
     @website.blackboard.dispatch_msg(:node_changed?, root)
-    assert(root.dirty)
+    assert(root.flagged(:dirty))
   end
 
 end

data/test/test_tag_langbar.rb

@@ -14,8 +14,7 @@ class TestTagLangbar < Test::Unit::TestCase
   def create_default_nodes
     {
       :root => root = Webgen::Node.new(Webgen::Tree.new.dummy_root, '/', '/', {'index_path' => 'index.html'}),
-      :file_en => Webgen::Node.new(root, '/file1.html', 'file1.html',
-                                   {'lang' => 'en', 'title' => 'File1'}),
+      :file_en => Webgen::Node.new(root, '/file1.html', 'file1.html', {'lang' => 'en', 'title' => 'File1'}),
       :index_en => Webgen::Node.new(root, '/index.html', 'index.html', {'lang' => 'en'}),
       :index_de => Webgen::Node.new(root, '/index.de.html', 'index.html', {'lang' => 'de'}),
     }
@@ -31,15 +30,21 @@ class TestTagLangbar < Test::Unit::TestCase
     link = '<span>en</span>'
     check_results(nodes[:file_en], link, '', '', '')
 
-    @obj.set_params('tag.langbar.show_single_lang'=>true, 'tag.langbar.show_own_lang'=>true, 'tag.langbar.separator' => ' --- ')
-    assert_equal("#{de_link} --- #{en_link}", @obj.call('langbar', '', Webgen::ContentProcessor::Context.new(:chain => [nodes[:index_en]])))
+    @obj.set_params('tag.langbar.show_single_lang' => true, 'tag.langbar.show_own_lang' => true, 'tag.langbar.separator' => ' --- ')
+    assert_equal("#{de_link} --- #{en_link}",
+                 @obj.call('langbar', '', Webgen::ContentProcessor::Context.new(:chain => [nodes[:index_en]])))
 
-    nodes[:index_en].dirty = false
+    @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}",
+                 @obj.call('langbar', '', Webgen::ContentProcessor::Context.new(:chain => [nodes[:index_en]])))
+
+    nodes[:index_en].unflag(:dirty)
     @website.blackboard.dispatch_msg(:node_changed?, nodes[:index_en])
-    assert(!nodes[:index_en].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].dirty)
+    assert(nodes[:index_en].flagged(:dirty))
   end
 
   def check_results(node, both_true, both_false, first_false, second_false)

data/test/test_tag_link.rb

@@ -0,0 +1,61 @@
+require 'test/unit'
+require 'helper'
+require 'webgen/tree'
+require 'webgen/contentprocessor'
+require 'webgen/tag'
+
+class TestTagLink < Test::Unit::TestCase
+
+  include Test::WebsiteHelper
+
+  def setup
+    super
+    @obj = Webgen::Tag::Link.new
+  end
+
+  def call(context)
+    @obj.call('link', '', context)
+  end
+
+  def test_call
+    root = Webgen::Node.new(Webgen::Tree.new.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', 'title' => 'Dir/File'})
+    Webgen::Node.new(dir, '/dir/other.de.html', 'other.html', {'lang' => 'de'})
+    Webgen::Node.new(file, '/dir/file.html#fragment', '#fragment')
+    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])
+
+    # no path set
+    node.unflag(:dirty)
+    @obj.set_params('tag.link.path' => nil)
+    assert_equal('', call(context))
+    assert(node.flagged(:dirty))
+
+    # invalid paths
+    @obj.set_params('tag.link.path' => ':/asdf=-)')
+    assert_equal('', call(context))
+
+    # basic node resolving
+    @obj.set_params('tag.link.path' => 'dir/file.html')
+    assert_equal('<a href="dir/file.html">Dir/File</a>', call(context))
+    @obj.set_params('tag.link.path' => 'dir/file.html', 'tag.link.attr' => {'title' => 'other'})
+    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))
+
+    # non-existing fragments
+    @obj.set_params('tag.link.path' => 'file.html#hallo')
+    assert_equal('', call(context))
+
+    # directory paths
+    @obj.set_params('tag.link.path' => 'dir')
+    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))
+  end
+
+end

data/test/test_tag_menu.rb

@@ -2,7 +2,7 @@ require 'test/unit'
 require 'helper'
 require 'webgen/tree'
 require 'webgen/contentprocessor'
-require 'webgen/tag/menu'
+require 'webgen/tag'
 
 class TestTagMenu < Test::Unit::TestCase
 
@@ -88,18 +88,18 @@ class TestTagMenu < Test::Unit::TestCase
     @obj.set_params({})
     assert_equal("", output)
 
-    nodes.each {|k,v| v.dirty = false}
+    nodes.each {|k,v| v.unflag(:dirty)}
     @website.blackboard.dispatch_msg(:node_changed?, nodes[:file11_en])
-    assert(!nodes[:file11_en].dirty)
+    assert(!nodes[:file11_en].flagged(:dirty))
 
-    nodes[:index11_en].dirty_meta_info = true
+    nodes[:index11_en].flag(:dirty_meta_info)
     @website.blackboard.dispatch_msg(:node_changed?, nodes[:file11_en])
-    assert(nodes[:file11_en].dirty)
+    assert(nodes[:file11_en].flagged(:dirty))
 
-    nodes.each {|k,v| v.dirty = false}
+    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].dirty)
+    assert(nodes[:file11_en].flagged(:dirty))
   end
 
   def test_menu_tree_for_lang_and_create_menu_tree