webgen 0.5.2 → 0.5.3

data/test/test_sourcehandler_page.rb

@@ -62,6 +62,7 @@ class TestSourceHandlerPage < Test::Unit::TestCase
 
     node.dirty_meta_info = false
     @website.cache.restore(@website.cache.dump)
+    @website.cache[[:sh_page_node_mi, node.absolute_lcn]]['modified_at'] = Time.now
     @website.blackboard.dispatch_msg(:node_meta_info_changed?, node)
     assert(!node.meta_info_changed?)
   end

data/test/test_sourcehandler_sitemap.rb

@@ -0,0 +1,47 @@
+require 'test/unit'
+require 'helper'
+require 'webgen/sourcehandler'
+require 'stringio'
+
+class TestSourceHandlerSitemap < Test::Unit::TestCase
+
+  include Test::WebsiteHelper
+
+  SITEMAP_CONTENT = <<EOF
+---
+site_url: http://example.com
+default_change_freq: daily
+EOF
+
+  def setup
+    super
+    @nodes = create_sitemap_nodes
+    @nodes.each {|k,v| v['modified_at'] = Time.now}
+    @nodes[:file11_en]['priority'] = 0.9
+    @nodes[:file11_en]['change_freq'] = 'hourly'
+    @obj = Webgen::SourceHandler::Sitemap.new
+    @path = path_with_meta_info('/test.sitemap', {}, @obj.class.name) {StringIO.new(SITEMAP_CONTENT)}
+  end
+
+  def test_create_node
+    sitemap = @obj.create_node(@nodes[:root], @path)
+
+    assert_not_nil(sitemap)
+    assert_equal('/test.xml', sitemap.path)
+    assert_equal('/test.xml', sitemap.absolute_lcn)
+
+    assert_raise(RuntimeError) do
+      @obj.create_node(@nodes[:root], path_with_meta_info('/test.sitemap', {}, @obj.class.name) {StringIO.new('')})
+    end
+  end
+
+  def test_content
+    sitemap = @obj.create_node(@nodes[:root], @path)
+    content = sitemap.content
+    assert_match(/<changefreq>daily<\/changefreq>/, content)
+    assert_match(/<changefreq>hourly<\/changefreq>/, content)
+    assert_match(/<priority>0.5<\/priority>/, content)
+    assert_match(/<priority>0.9<\/priority>/, content)
+  end
+
+end

data/test/test_sourcehandler_template.rb

@@ -33,6 +33,8 @@ class TestSourceHandlerTemplate < Test::Unit::TestCase
     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')
 
     assert_equal([], @obj.templates_for_node(default_template))
     assert_equal([], @obj.templates_for_node(stopped_template))
@@ -40,6 +42,7 @@ class TestSourceHandlerTemplate < Test::Unit::TestCase
     assert_equal([default_template], @obj.templates_for_node(invalid_template))
     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))
 
     @website.cache.reset_volatile_cache
     root.tree.delete_node(default_template)

data/test/test_sourcehandler_virtual.rb

@@ -25,7 +25,8 @@ EOF
     obj = Webgen::SourceHandler::Virtual.new
     root = Webgen::Node.new(Webgen::Tree.new.dummy_root, '/', '/')
     shm = Webgen::SourceHandler::Main.new # for using service :create_nodes
-    nodes = obj.create_node(root, path_with_meta_info('/virtuals', {}, obj.class.name) {StringIO.new(CONTENT)})
+    time = Time.now
+    nodes = obj.create_node(root, path_with_meta_info('/virtuals', {'modified_at' => time}, obj.class.name) {StringIO.new(CONTENT)})
 
     nodes.each {|n| assert_equal('/virtuals', n.node_info[:src])}
 
@@ -37,6 +38,8 @@ EOF
     assert_not_nil(path_en)
 
     assert_equal('new title', path_en['title'])
+    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))

data/test/test_tag_breadcrumbtrail.rb

@@ -26,10 +26,11 @@ class TestTagBreadcrumbTrail < Test::Unit::TestCase
     }
   end
 
-  def call(context, separator, omit_last, omit_index_path)
+  def call(context, separator, omit_index_path, start_level, end_level)
     @obj.set_params({'tag.breadcrumbtrail.separator' => separator,
-                      'tag.breadcrumbtrail.omit_last' => omit_last,
-                      'tag.breadcrumbtrail.omit_index_path' => omit_index_path})
+                      'tag.breadcrumbtrail.omit_index_path' => omit_index_path,
+                      'tag.breadcrumbtrail.start_level' => start_level,
+                      'tag.breadcrumbtrail.end_level' => end_level})
     result = @obj.call('breadcrumbTrail', '', context)
     @obj.set_params({})
     result
@@ -40,40 +41,49 @@ class TestTagBreadcrumbTrail < Test::Unit::TestCase
     context = Webgen::ContentProcessor::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, false))
-    assert_equal(Set.new([nodes[:file11_en], nodes[:index_en], nodes[:index11_en],
-                          nodes[:dir1], nodes[:dir11], nodes[:root]].map {|n| n.absolute_lcn}),
-                 nodes[:file11_en].node_info[:used_meta_info_nodes])
-
-
+                 call(context, ' / ', false, 0, -1))
     assert_equal('<a href="../../index.html"></a> / <a href="../">Dir1</a> / <a href="index.html">Dir11</a> / <span>File111</span>',
-                 call(context, ' / ', false, true))
-    assert_equal('<a href="../../index.html"></a> / <a href="../">Dir1</a> / <a href="index.html">Dir11</a> / ',
-                 call(context, ' / ', true, true))
-    assert_equal('<a href="../../index.html"></a> / <a href="../">Dir1</a> / <a href="index.html">Dir11</a> / ',
-                 call(context, ' / ', true, false))
+                 call(context, ' / ', true, 0, -1))
+    assert_equal('<a href="../">Dir1</a> / <a href="index.html">Dir11</a>',
+                 call(context, ' / ', true, 1, -2))
+    assert_equal('<a href="../">Dir1</a> / <a href="index.html">Dir11</a>',
+                 call(context, ' / ', false, 1, -2))
 
 
     context[:chain] = [nodes[:index11_en]]
     assert_equal('<a href="../../index.html"></a> / <a href="../">Dir1</a> / <span>Dir11</span> / <span>Index</span>',
-                 call(context, ' / ', false, false))
+                 call(context, ' / ', false, 0, -1))
     assert_equal('<a href="../../index.html"></a> / <a href="../">Dir1</a> / <span>Dir11</span>',
-                 call(context, ' / ', false, true))
+                 call(context, ' / ', true, 0, -1))
     assert_equal('<a href="../../index.html"></a> / <a href="../">Dir1</a> / <span>Dir11</span>',
-                 call(context, ' / ', true, true))
-    assert_equal('<a href="../../index.html"></a> / <a href="../">Dir1</a> / <span>Dir11</span> / ',
-                 call(context, ' / ', true, false))
+                 call(context, ' / ', false, 0, -2))
+    assert_equal('<a href="../../index.html"></a> / <a href="../">Dir1</a>',
+                 call(context, ' / ', true, 0, -2))
 
-    assert_equal('<a href="../../index.html"></a> | <a href="../">Dir1</a> | <span>Dir11</span> | ',
-                 call(context, ' | ', true, false))
+    assert_equal('<a href="../../index.html"></a> | <a href="../">Dir1</a> | <span>Dir11</span> | <span>Index</span>',
+                 call(context, ' | ', false, 0, -1))
 
 
     nodes[:index11_en]['omit_index_path'] = false
     assert_equal('<a href="../../index.html"></a> / <a href="../">Dir1</a> / <span>Dir11</span> / <span>Index</span>',
-                 call(context, ' / ', false, true))
+                 call(context, ' / ', true, 0, -1))
     nodes[:index11_en]['omit_index_path'] = true
     assert_equal('<a href="../../index.html"></a> / <a href="../">Dir1</a> / <span>Dir11</span>',
-                 call(context, ' / ', false, false))
+                 call(context, ' / ', false, 0, -1))
+  end
+
+  def test_node_changed
+    nodes = create_default_nodes
+    context = Webgen::ContentProcessor::Context.new(:chain => [nodes[:file11_en]])
+    call(context, ' / ', false, 0, -1)
+
+    nodes[:file11_en].dirty = false
+    @website.blackboard.dispatch_msg(:node_changed?, nodes[:file11_en])
+    assert(!nodes[:file11_en].dirty)
+
+    nodes[:index11_en].dirty_meta_info = true
+    @website.blackboard.dispatch_msg(:node_changed?, nodes[:file11_en])
+    assert(nodes[:file11_en].dirty)
   end
 
 end

data/test/test_tag_menu.rb

@@ -51,30 +51,27 @@ class TestTagMenu < Test::Unit::TestCase
     nodes = create_default_nodes
 
     output = @obj.call('menu', '', Webgen::ContentProcessor::Context.new(:chain => [nodes[:file11_en]]))
-    assert_equal("<div class=\"webgen-menu\">" +
-                 "<ul><li class=\"webgen-menu-submenu webgen-menu-submenu-inhierarchy\"><a href=\"./\"></a>" +
-                 "<ul><li class=\"webgen-menu-submenu\"><a href=\"dir11/index.en.html\"></a></li>" +
-                 "<li class=\"webgen-menu-item-selected\"><span></span></li></ul></li>" +
-                 "<li class=\"webgen-menu-submenu\"><a href=\"../dir2/\"></a></li>" +
-                 "<li class=\"webgen-menu-submenu\"><a href=\"../dir3/\"></a></li></ul></div>", output)
+    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]]))
-    assert_equal("<div class=\"webgen-menu\">" +
-                 "<ul><li class=\"webgen-menu-submenu webgen-menu-submenu-inhierarchy\"><a href=\"../\"></a>" +
-                 "<ul><li class=\"webgen-menu-submenu webgen-menu-submenu-inhierarchy\"><span></span>" +
-                 "<ul><li ><a href=\"file111.en.html\"></a></li>" +
-                 "<li class=\"webgen-menu-item-selected\"><span></span></li></ul></li>" +
-                 "<li ><a href=\"../file11.en.html\"></a></li></ul></li>" +
-                 "<li class=\"webgen-menu-submenu\"><a href=\"../../dir2/\"></a></li>" +
-                 "<li class=\"webgen-menu-submenu\"><a href=\"../../dir3/\"></a></li></ul></div>", output)
+    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>" +
+                 "<li class=\"webgen-menu-level3 webgen-menu-item-selected\"><span></span></li></ul></li>" +
+                 "<li class=\"webgen-menu-level2\"><a href=\"../file11.en.html\"></a></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)
 
 
     @obj.set_params('tag.menu.used_nodes' => 'fragments')
     output = @obj.call('menu', '', Webgen::ContentProcessor::Context.new(:chain => [nodes[:file11_en]]))
     @obj.set_params({})
-    assert_equal("<div class=\"webgen-menu\">" +
-                 "<ul><li class=\"webgen-menu-submenu\"><a href=\"#f1\"></a></li>" +
-                 "<li ><a href=\"#f2\"></a></li></ul></div>", output)
+    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]]))
@@ -183,14 +180,16 @@ class TestTagMenu < Test::Unit::TestCase
     nodes = create_default_nodes
     tree = build_menu(nodes[:file111_en], [1, 2, 3, true])
     context = Webgen::ContentProcessor::Context.new(:chain => [nodes[:file111_en]])
-    assert_equal("<ul><li class=\"webgen-menu-submenu webgen-menu-submenu-inhierarchy\"><a href=\"../\"></a>" +
-                 "<ul><li class=\"webgen-menu-submenu webgen-menu-submenu-inhierarchy\"><a href=\"index.en.html\"></a>" +
-                 "<ul><li class=\"webgen-menu-item-selected\"><span></span></li><li ><a href=\"index.en.html\"></a></li></ul></li>" +
-                 "<li ><a href=\"../file11.en.html\"></a></li></ul></li>" +
-                 "<li class=\"webgen-menu-submenu\"><a href=\"../../dir2/\"></a>" +
-                 "<ul><li ><a href=\"../../dir2/file21.en.html\"></a></li></ul></li>" +
-                 "<li class=\"webgen-menu-submenu\"><a href=\"../../dir3/\"></a>" +
-                 "<ul><li ><a href=\"../../dir3/file31.en.html\"></a></li></ul></li></ul>", @obj.send(:create_output, context, tree))
+    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>" +
+                 "<li class=\"webgen-menu-level3\"><a href=\"index.en.html\"></a></li></ul></li>" +
+                 "<li class=\"webgen-menu-level2\"><a href=\"../file11.en.html\"></a></li></ul></li>" +
+                 "<li class=\"webgen-menu-level1 webgen-menu-submenu\"><a href=\"../../dir2/\"></a>" +
+                 "<ul><li class=\"webgen-menu-level2\"><a href=\"../../dir2/file21.en.html\"></a></li></ul></li>" +
+                 "<li class=\"webgen-menu-level1 webgen-menu-submenu\"><a href=\"../../dir3/\"></a>" +
+                 "<ul><li class=\"webgen-menu-level2\"><a href=\"../../dir3/file31.en.html\"></a></li></ul></li></ul>",
+                 @obj.send(:create_output, context, tree))
   end
 
 end

data/test/test_tag_sitemap.rb

@@ -0,0 +1,44 @@
+require 'test/unit'
+require 'helper'
+require 'webgen/tree'
+require 'webgen/contentprocessor'
+require 'webgen/tag'
+
+class TestTagSitemap < Test::Unit::TestCase
+
+  include Test::WebsiteHelper
+
+  def setup
+    super
+    @obj = Webgen::Tag::Sitemap.new
+  end
+
+  def call(context, honor_in_menu, any_lang, used_kinds)
+    @obj.set_params({'common.sitemap.honor_in_menu' => honor_in_menu,
+                      'common.sitemap.any_lang' => any_lang,
+                      'common.sitemap.used_kinds' => used_kinds})
+    result = @obj.call('sitemap', '', context)
+    @obj.set_params({})
+    result
+  end
+
+  def test_call
+    nodes = create_sitemap_nodes
+    context = Webgen::ContentProcessor::Context.new(:chain => [nodes[:file11_en]])
+
+    assert_equal("<ul><li><a href=\"./\"></a>" +
+                 "<ul><li><span></span>"+
+                 "<ul><li><a href=\"#f1\"></a></li></ul></li></ul></li>" +
+                 "<li><a href=\"../dir2/\"></a>" +
+                 "<ul><li><a href=\"../dir2/file21.en.html\"></a></li></ul></li>"+
+                 "<li><a href=\"../index.en.html\"></a></li></ul>",
+                 call(context, false, false, []))
+    assert_equal("",
+                 call(context, false, false, ['noone']))
+  end
+
+  def test_tag_config_base
+    assert_equal('common.sitemap', @obj.send(:tag_config_base))
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: webgen
 version: !ruby/object:Gem::Version 
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors: 
 - Thomas Leitner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-13 00:00:00 +02:00
+date: 2008-08-25 00:00:00 +02:00
 default_executable: webgen
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.4.1
+        version: 2.4.3
     version: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -152,6 +152,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.7.4.215
     version: 
+- !ruby/object:Gem::Dependency 
+  name: feedtools
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.2.29
+    version: 
 description: webgen is used to generate static websites from templates and content files (which can be written in a markup language). It can generate dynamic content like menus on the fly and comes with many powerful extensions.
 email: t_leitner@gmx.at
 executables: 
@@ -196,6 +206,7 @@ files:
 - data/webgen/website_skeleton
 - data/webgen/website_skeleton/config.yaml
 - data/webgen/website_skeleton/ext
+- data/webgen/website_skeleton/ext/init.rb
 - data/webgen/website_skeleton/Rakefile
 - data/webgen/website_skeleton/README
 - data/webgen/website_skeleton/src
@@ -348,8 +359,10 @@ files:
 - doc/sourcehandler
 - doc/sourcehandler/copy.page
 - doc/sourcehandler/directory.page
+- doc/sourcehandler/feed.page
 - doc/sourcehandler/metainfo.page
 - doc/sourcehandler/page.page
+- doc/sourcehandler/sitemap.page
 - doc/sourcehandler/template.page
 - doc/sourcehandler/virtual.page
 - doc/sourcehandler.template
@@ -363,7 +376,9 @@ files:
 - doc/tag/menu.page
 - doc/tag/metainfo.page
 - doc/tag/relocatable.page
+- doc/tag/sitemap.page
 - doc/tag.template
+- doc/upgrading.page
 - doc/webgen_page_format.page
 - lib/webgen/blackboard.rb
 - lib/webgen/cache.rb
@@ -372,6 +387,8 @@ files:
 - lib/webgen/cli/utils.rb
 - lib/webgen/cli/webgui_command.rb
 - lib/webgen/cli.rb
+- lib/webgen/common/sitemap.rb
+- lib/webgen/common.rb
 - lib/webgen/configuration.rb
 - lib/webgen/contentprocessor/blocks.rb
 - lib/webgen/contentprocessor/builder.rb
@@ -384,6 +401,7 @@ files:
 - lib/webgen/contentprocessor/sass.rb
 - lib/webgen/contentprocessor/tags.rb
 - lib/webgen/contentprocessor.rb
+- lib/webgen/coreext.rb
 - lib/webgen/default_config.rb
 - lib/webgen/languages.rb
 - lib/webgen/loggable.rb
@@ -400,9 +418,11 @@ files:
 - lib/webgen/sourcehandler/base.rb
 - lib/webgen/sourcehandler/copy.rb
 - lib/webgen/sourcehandler/directory.rb
+- lib/webgen/sourcehandler/feed.rb
 - lib/webgen/sourcehandler/fragment.rb
 - lib/webgen/sourcehandler/metainfo.rb
 - lib/webgen/sourcehandler/page.rb
+- lib/webgen/sourcehandler/sitemap.rb
 - lib/webgen/sourcehandler/template.rb
 - lib/webgen/sourcehandler/virtual.rb
 - lib/webgen/sourcehandler.rb
@@ -416,6 +436,7 @@ files:
 - lib/webgen/tag/menu.rb
 - lib/webgen/tag/metainfo.rb
 - lib/webgen/tag/relocatable.rb
+- lib/webgen/tag/sitemap.rb
 - lib/webgen/tag.rb
 - lib/webgen/tree.rb
 - lib/webgen/version.rb
@@ -437,6 +458,7 @@ files:
 - misc/images/quote.gif
 - test/test_blackboard.rb
 - test/test_cache.rb
+- test/test_common_sitemap.rb
 - test/test_configuration.rb
 - test/test_contentprocessor.rb
 - test/test_contentprocessor_blocks.rb
@@ -462,9 +484,11 @@ files:
 - test/test_sourcehandler_base.rb
 - test/test_sourcehandler_copy.rb
 - test/test_sourcehandler_directory.rb
+- test/test_sourcehandler_feed.rb
 - test/test_sourcehandler_fragment.rb
 - test/test_sourcehandler_metainfo.rb
 - test/test_sourcehandler_page.rb
+- test/test_sourcehandler_sitemap.rb
 - test/test_sourcehandler_template.rb
 - test/test_sourcehandler_virtual.rb
 - test/test_tag_base.rb
@@ -477,6 +501,7 @@ files:
 - test/test_tag_menu.rb
 - test/test_tag_metainfo.rb
 - test/test_tag_relocatable.rb
+- test/test_tag_sitemap.rb
 - test/test_tree.rb
 - test/test_webgentask.rb
 - test/test_website.rb
@@ -485,7 +510,15 @@ files:
 - test/helper.rb
 has_rdoc: true
 homepage: http://webgen.rubyforge.org
-post_install_message: 
+post_install_message: |
+  Thanks for choosing webgen! Here are some places to get you started:
+  * The webgen User Documentation at <http://webgen.rubyforge.org/documentation/index.html>
+  * The mailing list archive at <http://rubyforge.org/pipermail/webgen-users/>
+  
+  Have a look at <http://webgen.rubyforge.org/news/index.html> for a list of changes!
+  
+  Have fun!
+
 rdoc_options: 
 - --line-numbers
 - --inline-source